diff options
1501 files changed, 30524 insertions, 25650 deletions
diff --git a/.editorconfig b/.editorconfig index 75c34374130..43970edebe5 100644 --- a/.editorconfig +++ b/.editorconfig @@ -57,10 +57,13 @@ indent_size = unset [deps.nix] insert_final_newline = unset +[eggs.nix] +trim_trailing_whitespace = unset + [gemset.nix] insert_final_newline = unset -[node-packages.nix] +[node-{composition,packages}.nix] insert_final_newline = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] @@ -102,5 +105,8 @@ insert_final_newline = unset indent_size = unset trim_trailing_whitespace = unset +[pkgs/top-level/emscripten-packages.nix] +trim_trailing_whitespace = unset + [pkgs/top-level/perl-packages.nix] indent_size = unset diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 29fbfa2a0bc..19b9ad57933 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -198,6 +198,7 @@ /nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq /nixos/modules/virtualisation/cri-o.nix @NixOS/podman @zowoq /nixos/modules/virtualisation/podman.nix @NixOS/podman @zowoq +/nixos/tests/cri-o.nix @NixOS/podman @zowoq /nixos/tests/podman.nix @NixOS/podman @zowoq # Blockchains diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml new file mode 100644 index 00000000000..98c7afbab78 --- /dev/null +++ b/.github/workflows/editorconfig.yml @@ -0,0 +1,27 @@ +name: "Checking EditorConfig" + +on: + pull_request: + +jobs: + tests: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - uses: technote-space/get-diff-action@v3.1.0 + - name: Fetch editorconfig-checker + if: env.GIT_DIFF + env: + ECC_VERSION: "2.1.0" + ECC_URL: "https://github.com/editorconfig-checker/editorconfig-checker/releases/download" + run: | + curl -sSf -O -L -C - "$ECC_URL/$ECC_VERSION/ec-linux-amd64.tar.gz" && \ + tar xzf ec-linux-amd64.tar.gz && \ + mv ./bin/ec-linux-amd64 ./bin/editorconfig-checker + - name: Checking EditorConfig + if: env.GIT_DIFF + run: | + ./bin/editorconfig-checker -disable-indentation \ + ${{ env.GIT_DIFF }} diff --git a/.github/workflows/pending-clear.yml b/.github/workflows/pending-clear.yml new file mode 100644 index 00000000000..d06b1e2143f --- /dev/null +++ b/.github/workflows/pending-clear.yml @@ -0,0 +1,21 @@ +name: "clear pending status" + +on: + check_suite: + types: [ completed ] + +jobs: + action: + runs-on: ubuntu-latest + steps: + - name: clear pending status + if: github.repository_owner == 'NixOS' && github.event.check_suite.app.name == 'OfBorg' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + curl \ + -X POST \ + -H "Accept: application/vnd.github.v3+json" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -d '{"state": "success", "target_url": " ", "description": " ", "context": "Wait for ofborg"}' \ + "https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.check_suite.head_sha }}" diff --git a/.github/workflows/pending-set.yml b/.github/workflows/pending-set.yml new file mode 100644 index 00000000000..f59ac9439ea --- /dev/null +++ b/.github/workflows/pending-set.yml @@ -0,0 +1,20 @@ +name: "set pending status" + +on: + pull_request_target: + +jobs: + action: + runs-on: ubuntu-latest + steps: + - name: set pending status + if: github.repository_owner == 'NixOS' + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + curl \ + -X POST \ + -H "Accept: application/vnd.github.v3+json" \ + -H "Authorization: token $GITHUB_TOKEN" \ + -d '{"state": "failure", "target_url": " ", "description": "This failed status will be cleared when ofborg finishes eval.", "context": "Wait for ofborg"}' \ + "https://api.github.com/repos/NixOS/nixpkgs/statuses/${{ github.event.pull_request.head.sha }}" diff --git a/lib/licenses.nix b/lib/licenses.nix index 5cdb43ded6d..ee11966b0d5 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -436,6 +436,12 @@ lib.mapAttrs (n: v: v // { shortName = n; }) { }; # Proprietary binaries; free to redistribute without modification. + databricks = { + fullName = "Databricks Proprietary License"; + url = "https://pypi.org/project/databricks-connect"; + free = false; + }; + issl = { fullName = "Intel Simplified Software License"; url = "https://software.intel.com/en-us/license/intel-simplified-software-license"; diff --git a/lib/systems/architectures.nix b/lib/systems/architectures.nix new file mode 100644 index 00000000000..9d1c29fd9f0 --- /dev/null +++ b/lib/systems/architectures.nix @@ -0,0 +1,77 @@ +{ lib }: + +rec { + # platform.gcc.arch to its features (as in /proc/cpuinfo) + features = { + default = [ ]; + # x86_64 Intel + westmere = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" ]; + sandybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; + ivybridge = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; + haswell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; + broadwell = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; + skylake = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "fma" ]; + skylake-avx512 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" "avx2" "avx512" "fma" ]; + # x86_64 AMD + btver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" ]; + btver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "aes" "avx" ]; + bdver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ]; + bdver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ]; + bdver3 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "fma" "fma4" ]; + bdver4 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" "fma4" ]; + znver1 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; + znver2 = [ "sse3" "ssse3" "sse4_1" "sse4_2" "sse4a" "aes" "avx" "avx2" "fma" ]; + # other + armv5te = [ ]; + armv6 = [ ]; + armv7-a = [ ]; + armv8-a = [ ]; + mips32 = [ ]; + loongson2f = [ ]; + }; + + # a superior CPU has all the features of an inferior and is able to build and test code for it + inferiors = { + # x86_64 Intel + default = [ ]; + westmere = [ ]; + sandybridge = [ "westmere" ] ++ inferiors.westmere; + ivybridge = [ "sandybridge" ] ++ inferiors.sandybridge; + haswell = [ "ivybridge" ] ++ inferiors.ivybridge; + broadwell = [ "haswell" ] ++ inferiors.haswell; + skylake = [ "broadwell" ] ++ inferiors.broadwell; + skylake-avx512 = [ "skylake" ] ++ inferiors.skylake; + # x86_64 AMD + btver1 = [ ]; + btver2 = [ ]; # TODO: fill this (need testing) + bdver1 = [ ]; # TODO: fill this (need testing) + bdver2 = [ ]; # TODO: fill this (need testing) + bdver3 = [ ]; # TODO: fill this (need testing) + bdver4 = [ ]; # TODO: fill this (need testing) + znver1 = [ ]; # TODO: fill this (need testing) + znver2 = [ ]; # TODO: fill this (need testing) + # other + armv5te = [ ]; + armv6 = [ ]; + armv7-a = [ ]; + armv8-a = [ ]; + mips32 = [ ]; + loongson2f = [ ]; + }; + + predicates = let + featureSupport = feature: x: builtins.elem feature features.${x}; + in { + sse3Support = featureSupport "sse3"; + ssse3Support = featureSupport "ssse3"; + sse4_1Support = featureSupport "sse4_1"; + sse4_2Support = featureSupport "sse4_2"; + sse4_aSupport = featureSupport "sse4a"; + avxSupport = featureSupport "avx"; + avx2Support = featureSupport "avx2"; + avx512Support = featureSupport "avx512"; + aesSupport = featureSupport "aes"; + fmaSupport = featureSupport "fma"; + fma4Support = featureSupport "fma4"; + }; +} diff --git a/lib/systems/default.nix b/lib/systems/default.nix index c929781dd8f..9939743157e 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -7,6 +7,7 @@ rec { inspect = import ./inspect.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; }; examples = import ./examples.nix { inherit lib; }; + architectures = import ./architectures.nix { inherit lib; }; # Elaborate a `localSystem` or `crossSystem` so that it contains everything # necessary. @@ -76,6 +77,7 @@ rec { # uname -r release = null; }; + isStatic = final.isWasm || final.isRedox; kernelArch = if final.isAarch32 then "arm" @@ -125,6 +127,7 @@ rec { else throw "Don't know how to run ${final.config} executables."; } // mapAttrs (n: v: v final.parsed) inspect.predicates + // mapAttrs (n: v: v final.platform.gcc.arch or "default") architectures.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; assert lib.foldl diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index ca562d2e456..40e2b8fcefb 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -46,7 +46,7 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; - sdkVer = "24"; + sdkVer = "29"; ndkVer = "18b"; platform = platforms.armv7a-android; useAndroidPrebuilt = true; @@ -54,7 +54,7 @@ rec { aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; - sdkVer = "24"; + sdkVer = "29"; ndkVer = "18b"; platform = platforms.aarch64-multiplatform; useAndroidPrebuilt = true; diff --git a/lib/tests/release.nix b/lib/tests/release.nix index eebee1b49bc..800d8a65c14 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -17,7 +17,6 @@ pkgs.runCommandNoCC "nixpkgs-lib-tests" { export TEST_ROOT=$(pwd)/test-tmp export NIX_BUILD_HOOK= export NIX_CONF_DIR=$TEST_ROOT/etc - export NIX_DB_DIR=$TEST_ROOT/db export NIX_LOCALSTATE_DIR=$TEST_ROOT/var export NIX_LOG_DIR=$TEST_ROOT/var/log/nix export NIX_STATE_DIR=$TEST_ROOT/var/nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e53e8e5f832..6ce51646edb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -472,6 +472,12 @@ githubId = 858965; name = "Andrew Morsillo"; }; + andehen = { + email = "git@andehen.net"; + github = "andehen"; + githubId = 754494; + name = "Anders Asheim Hennum"; + }; andersk = { email = "andersk@mit.edu"; github = "andersk"; @@ -2711,6 +2717,12 @@ githubId = 857308; name = "Joe Hermaszewski"; }; + extends = { + email = "sharosari@gmail.com"; + github = "ImExtends"; + githubId = 55919390; + name = "Vincent VILLIAUMEY"; + }; eyjhb = { email = "eyjhbb@gmail.com"; github = "eyJhb"; @@ -2867,6 +2879,12 @@ githubId = 5918766; name = "Franz Thoma"; }; + fooker = { + email = "fooker@lab.sh"; + github = "fooker"; + githubId = 405105; + name = "Dustin Frisch"; + }; forkk = { email = "forkk@forkk.net"; github = "forkk"; @@ -3349,6 +3367,12 @@ githubId = 131599; name = "Martin Weinelt"; }; + hh = { + email = "hh@m-labs.hk"; + github = "HarryMakes"; + githubId = 66358631; + name = "Harry Ho"; + }; hhm = { email = "heehooman+nixpkgs@gmail.com"; github = "hhm0"; @@ -3376,10 +3400,14 @@ name = "Hlodver Sigurdsson"; }; hugoreeves = { - email = "hugolreeves@gmail.com"; + email = "hugo@hugoreeves.com"; github = "hugoreeves"; githubId = 20039091; name = "Hugo Reeves"; + keys = [{ + longkeyid = "rsa4096/0x49FA39F8A7F735F9"; + fingerprint = "78C2 E81C 828A 420B 269A EBC1 49FA 39F8 A7F7 35F9"; + }]; }; hodapp = { email = "hodapp87@gmail.com"; @@ -3721,6 +3749,12 @@ }]; name = "Jiri Daněk"; }; + jdbaldry = { + email = "jack.baldry@grafana.com"; + github = "jdbaldry"; + githubId = 4599384; + name = "Jack Baldry"; + }; jdehaas = { email = "qqlq@nullptr.club"; github = "jeroendehaas"; @@ -4276,6 +4310,12 @@ githubId = 494012; name = "Kevin Cox"; }; + kfollesdal = { + email = "kfollesdal@gmail.com"; + github = "kfollesdal"; + githubId = 546087; + name = "Kristoffer K. Føllesdal"; + }; khumba = { email = "bog@khumba.net"; github = "khumba"; @@ -6731,6 +6771,12 @@ githubId = 37715; name = "Brian McKenna"; }; + purcell = { + email = "steve@sanityinc.com"; + github = "purcell"; + githubId = 5636; + name = "Steve Purcell"; + }; puzzlewolf = { email = "nixos@nora.pink"; github = "puzzlewolf"; @@ -7135,6 +7181,16 @@ githubId = 3621083; name = "Roosembert (Roosemberth) Palacios"; }; + rople380 = { + name = "rople380"; + email = "55679162+rople380@users.noreply.github.com"; + github = "rople380"; + githubId = 55679162; + keys = [{ + longkeyid = "rsa2048/0x8526B7574A536236"; + fingerprint = "1401 1B63 393D 16C1 AA9C C521 8526 B757 4A53 6236"; + }]; + }; royneary = { email = "christian@ulrich.earth"; github = "royneary"; @@ -7321,6 +7377,12 @@ githubId = 1153271; name = "Sander van der Burg"; }; + sarcasticadmin = { + email = "rob@sarcasticadmin.com"; + github = "sarcasticadmin"; + githubId = 30531572; + name = "Robert James Hernandez"; + }; sargon = { email = "danielehlers@mindeye.net"; github = "sargon"; @@ -7955,6 +8017,12 @@ githubId = 65870; name = "Сухарик"; }; + SuperSandro2000 = { + email = "sandro.jaeckel@gmail.com"; + github = "SuperSandro2000"; + githubId = 7258858; + name = "Sandro Jäckel"; + }; SuprDewd = { email = "suprdewd@gmail.com"; github = "SuprDewd"; @@ -8547,6 +8615,12 @@ githubId = 699403; name = "Tomas Vestelind"; }; + tviti = { + email = "tviti@hawaii.edu"; + github = "tviti"; + githubId = 2251912; + name = "Taylor Viti"; + }; tvorog = { email = "marszaripov@gmail.com"; github = "tvorog"; @@ -8762,6 +8836,16 @@ fingerprint = "B3C0 DA1A C18B 82E8 CA8B B1D1 4F62 CD07 CE64 796A"; }]; }; + vincentbernat = { + email = "vincent@bernat.ch"; + github = "vincentbernat"; + githubId = 631446; + name = "Vincent Bernat"; + keys = [{ + longkeyid = "rsa4096/0x95A42FE8353525F9"; + fingerprint = "AEF2 3487 66F3 71C6 89A7 3600 95A4 2FE8 3535 25F9"; + }]; + }; vinymeuh = { email = "vinymeuh@gmail.com"; github = "vinymeuh"; @@ -9438,4 +9522,26 @@ github = "fzakaria"; githubId = 605070; }; + nagisa = { + name = "Simonas Kazlauskas"; + email = "nixpkgs@kazlauskas.me"; + github = "nagisa"; + githubId = 679122; + }; + yevhenshymotiuk = { + name = "Yevhen Shymotiuk"; + email = "yevhenshymotiuk@gmail.com"; + github = "yevhenshymotiuk"; + githubId = 44244245; + }; + hmenke = { + name = "Henri Menke"; + email = "henri@henrimenke.de"; + github = "hmenke"; + githubId = 1903556; + keys = [{ + longkeyid = "rsa4096/0xD65C9AFB4C224DA3"; + fingerprint = "F1C5 760E 45B9 9A44 72E9 6BFB D65C 9AFB 4C22 4DA3"; + }]; + }; } diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 4ccb8483430..fb90e62769f 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -35,6 +35,10 @@ lua-cmsgpack,,,,, lua-iconv,,,,, lua-lsp,,http://luarocks.org/dev,,, lua-messagepack,,,,, +lua-resty-http,,,,, +lua-resty-jwt,,,,, +lua-resty-openidc,,,,, +lua-resty-session,,,,, lua-term,,,,, lua-toml,,,,, lua-zlib,,,,,koral diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 3d156e517c8..c936ae946ad 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -128,7 +128,7 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; </listitem> <listitem> <para> - Two new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link> + The new option <link linkend="opt-documentation.man.generateCaches">documentation.man.generateCaches</link> has been added to automatically generate the <literal>man-db</literal> caches, which are needed by utilities like <command>whatis</command> and <command>apropos</command>. The caches are generated during the build of the NixOS configuration: since this can be expensive when a large number of packages are installed, the @@ -195,6 +195,25 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; The NixOS module system now supports freeform modules as a mix between <literal>types.attrsOf</literal> and <literal>types.submodule</literal>. These allow you to explicitly declare a subset of options while still permitting definitions without an associated option. See <xref linkend='sec-freeform-modules'/> for how to use them. </para> </listitem> + <listitem> + <para> + The GRUB module gained support for basic password protection, which + allows to restrict non-default entries in the boot menu to one or more + users. The users and passwords are defined via the option + <option>boot.loader.grub.users</option>. + Note: Password support is only avaiable in GRUB version 2. + </para> + </listitem> + <listitem> + <para> + Following its deprecation in 20.03, the Perl NixOS test driver has been removed. + All remaining tests have been ported to the Python test framework. + Code outside nixpkgs using <filename>make-test.nix</filename> or + <filename>testing.nix</filename> needs to be ported to + <filename>make-test-python.nix</filename> and + <filename>testing-python.nix</filename> respectively. + </para> + </listitem> </itemizedlist> </section> @@ -214,6 +233,11 @@ GRANT ALL PRIVILEGES ON *.* TO 'mysql'@'localhost' WITH GRANT OPTION; <para> There is a new <xref linkend="opt-security.doas.enable"/> module that provides <command>doas</command>, a lighter alternative to <command>sudo</command> with many of the same features. </para> + </listitem> + <listitem> + <para> + <link xlink:href="https://hercules-ci.com">Hercules CI</link> Agent is a specialized build agent for projects built with Nix. See the <link xlink:href="https://nixos.org/nixos/options.html#services.hercules-ci-agent">options</link> and <link xlink:href="https://docs.hercules-ci.com/hercules-ci/getting-started/#deploy-agent">setup</link>. + </para> </listitem> </itemizedlist> @@ -971,6 +995,8 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; </listitem> <listitem> <para> + Nginx module <literal>nginxModules.fastcgi-cache-purge</literal> renamed to official name <literal>nginxModules.cache-purge</literal>. + Nginx module <literal>nginxModules.ngx_aws_auth</literal> renamed to official name <literal>nginxModules.aws-auth</literal>. The packages <package>perl</package>, <package>rsync</package> and <package>strace</package> were removed from <option>systemPackages</option>. If you need them, install them again with <code><xref linkend="opt-environment.systemPackages"/> = with pkgs; [ perl rsync strace ];</code> in your <filename>configuration.nix</filename>. </para> </listitem> @@ -981,6 +1007,53 @@ services.transmission.settings.rpc-bind-address = "0.0.0.0"; the previous behaviour using <literal>undervolt.useTimer</literal>. </para> </listitem> + <listitem> + <para> + Agda has been heavily reworked. + <itemizedlist> + <listitem> + <para> + <literal>agda.mkDerivation</literal> has been heavily changed and + is now located at <package>agdaPackages.mkDerivation</package>. + </para> + </listitem> + <listitem> + <para> + New top-level packages <package>agda</package> and + <literal>agda.withPackages</literal> have been added, the second + of which sets up agda with access to chosen libraries. + </para> + </listitem> + <listitem> + <para> + All agda libraries now live under + <literal>agdaPackages</literal>. + </para> + </listitem> + <listitem> + <para> + Many broken libraries have been removed. + </para> + </listitem> + </itemizedlist> + See the <link + xlink:href="https://nixos.org/nixpkgs/manual/#agda">new + documentation</link> for more information. + </para> + </listitem> + <listitem> + <para> + The <literal>deepin</literal> package set has been removed from + nixpkgs. It was a work in progress to package the + <link xlink:href="https://www.deepin.org/en/dde/">Deepin Desktop Environment (DDE)</link>, + including libraries, tools and applications, and it was still + missing a service to lauch the desktop environment. It has shown + to no longer be a feasible goal due to reasons discussed in + <link xlink:href="https://github.com/NixOS/nixpkgs/issues/94870">issue #94870</link>. + The package <literal>netease-cloud-music</literal> has also been + removed, as it depends on libraries from deepin. + </para> + </listitem> </itemizedlist> </section> </section> diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index c8824c2690d..15429a7160c 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -24,11 +24,11 @@ check ? true , prefix ? [] , lib ? import ../../lib +, extraModules ? let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; + in if e == "" then [] else [(import e)] }: let extraArgs_ = extraArgs; pkgs_ = pkgs; - extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; - in if e == "" then [] else [(import e)]; in let diff --git a/nixos/lib/qemu-flags.nix b/nixos/lib/qemu-flags.nix index 0cf6977af4b..0f066245893 100644 --- a/nixos/lib/qemu-flags.nix +++ b/nixos/lib/qemu-flags.nix @@ -22,9 +22,9 @@ rec { else throw "Unknown QEMU serial device for system '${pkgs.stdenv.hostPlatform.system}'"; qemuBinary = qemuPkg: { - x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu host"; + x86_64-linux = "${qemuPkg}/bin/qemu-kvm -cpu max"; armv7l-linux = "${qemuPkg}/bin/qemu-system-arm -enable-kvm -machine virt -cpu host"; aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -enable-kvm -machine virt,gic-version=host -cpu host"; - x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu host"; + x86_64-darwin = "${qemuPkg}/bin/qemu-kvm -cpu max"; }.${pkgs.stdenv.hostPlatform.system} or "${qemuPkg}/bin/qemu-kvm"; } diff --git a/nixos/lib/test-driver/Logger.pm b/nixos/lib/test-driver/Logger.pm deleted file mode 100644 index a3384084a0e..00000000000 --- a/nixos/lib/test-driver/Logger.pm +++ /dev/null @@ -1,75 +0,0 @@ -package Logger; - -use strict; -use Thread::Queue; -use XML::Writer; -use Encode qw(decode encode); -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); - -sub new { - my ($class) = @_; - - my $logFile = defined $ENV{LOGFILE} ? "$ENV{LOGFILE}" : "/dev/null"; - my $log = new XML::Writer(OUTPUT => new IO::File(">$logFile")); - - my $self = { - log => $log, - logQueue => Thread::Queue->new() - }; - - $self->{log}->startTag("logfile"); - - bless $self, $class; - return $self; -} - -sub close { - my ($self) = @_; - $self->{log}->endTag("logfile"); - $self->{log}->end; -} - -sub drainLogQueue { - my ($self) = @_; - while (defined (my $item = $self->{logQueue}->dequeue_nb())) { - $self->{log}->dataElement("line", sanitise($item->{msg}), 'machine' => $item->{machine}, 'type' => 'serial'); - } -} - -sub maybePrefix { - my ($msg, $attrs) = @_; - $msg = $attrs->{machine} . ": " . $msg if defined $attrs->{machine}; - return $msg; -} - -sub nest { - my ($self, $msg, $coderef, $attrs) = @_; - print STDERR maybePrefix("$msg\n", $attrs); - $self->{log}->startTag("nest"); - $self->{log}->dataElement("head", $msg, %{$attrs}); - my $now = clock_gettime(CLOCK_MONOTONIC); - $self->drainLogQueue(); - eval { &$coderef }; - my $res = $@; - $self->drainLogQueue(); - $self->log(sprintf("(%.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now)); - $self->{log}->endTag("nest"); - die $@ if $@; -} - -sub sanitise { - my ($s) = @_; - $s =~ s/[[:cntrl:]\xff]//g; - $s = decode('UTF-8', $s, Encode::FB_DEFAULT); - return encode('UTF-8', $s, Encode::FB_CROAK); -} - -sub log { - my ($self, $msg, $attrs) = @_; - chomp $msg; - print STDERR maybePrefix("$msg\n", $attrs); - $self->drainLogQueue(); - $self->{log}->dataElement("line", $msg, %{$attrs}); -} - -1; diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm deleted file mode 100644 index 4d3d63cd2db..00000000000 --- a/nixos/lib/test-driver/Machine.pm +++ /dev/null @@ -1,734 +0,0 @@ -package Machine; - -use strict; -use threads; -use Socket; -use IO::Handle; -use POSIX qw(dup2); -use FileHandle; -use Cwd; -use File::Basename; -use File::Path qw(make_path); -use File::Slurp; -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); - - -my $showGraphics = defined $ENV{'DISPLAY'}; - -my $sharedDir; - - -sub new { - my ($class, $args) = @_; - - my $startCommand = $args->{startCommand}; - - my $name = $args->{name}; - if (!$name) { - $startCommand =~ /run-(.*)-vm$/ if defined $startCommand; - $name = $1 || "machine"; - } - - if (!$startCommand) { - # !!! merge with qemu-vm.nix. - my $netBackend = "-netdev user,id=net0"; - my $netFrontend = "-device virtio-net-pci,netdev=net0"; - - $netBackend .= "," . $args->{netBackendArgs} - if defined $args->{netBackendArgs}; - - $netFrontend .= "," . $args->{netFrontendArgs} - if defined $args->{netFrontendArgs}; - - $startCommand = - "qemu-kvm -m 384 $netBackend $netFrontend \$QEMU_OPTS "; - - if (defined $args->{hda}) { - if ($args->{hdaInterface} eq "scsi") { - $startCommand .= "-drive id=hda,file=" - . Cwd::abs_path($args->{hda}) - . ",werror=report,if=none " - . "-device scsi-hd,drive=hda "; - } else { - $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) - . ",if=" . $args->{hdaInterface} - . ",werror=report "; - } - } - - $startCommand .= "-cdrom $args->{cdrom} " - if defined $args->{cdrom}; - $startCommand .= "-device piix3-usb-uhci -drive id=usbdisk,file=$args->{usb},if=none,readonly -device usb-storage,drive=usbdisk " - if defined $args->{usb}; - $startCommand .= "-bios $args->{bios} " - if defined $args->{bios}; - $startCommand .= $args->{qemuFlags} || ""; - } - - my $tmpDir = $ENV{'TMPDIR'} || "/tmp"; - unless (defined $sharedDir) { - $sharedDir = $tmpDir . "/xchg-shared"; - make_path($sharedDir, { mode => 0700, owner => $< }); - } - - my $allowReboot = 0; - $allowReboot = $args->{allowReboot} if defined $args->{allowReboot}; - - my $self = { - startCommand => $startCommand, - name => $name, - allowReboot => $allowReboot, - booted => 0, - pid => 0, - connected => 0, - socket => undef, - stateDir => "$tmpDir/vm-state-$name", - monitor => undef, - log => $args->{log}, - redirectSerial => $args->{redirectSerial} // 1, - }; - - mkdir $self->{stateDir}, 0700; - - bless $self, $class; - return $self; -} - - -sub log { - my ($self, $msg) = @_; - $self->{log}->log($msg, { machine => $self->{name} }); -} - - -sub nest { - my ($self, $msg, $coderef, $attrs) = @_; - $self->{log}->nest($msg, $coderef, { %{$attrs || {}}, machine => $self->{name} }); -} - - -sub name { - my ($self) = @_; - return $self->{name}; -} - - -sub stateDir { - my ($self) = @_; - return $self->{stateDir}; -} - - -sub start { - my ($self) = @_; - return if $self->{booted}; - - $self->log("starting vm"); - - # Create a socket pair for the serial line input/output of the VM. - my ($serialP, $serialC); - socketpair($serialP, $serialC, PF_UNIX, SOCK_STREAM, 0) or die; - - # Create a Unix domain socket to which QEMU's monitor will connect. - my $monitorPath = $self->{stateDir} . "/monitor"; - unlink $monitorPath; - my $monitorS; - socket($monitorS, PF_UNIX, SOCK_STREAM, 0) or die; - bind($monitorS, sockaddr_un($monitorPath)) or die "cannot bind monitor socket: $!"; - listen($monitorS, 1) or die; - - # Create a Unix domain socket to which the root shell in the guest will connect. - my $shellPath = $self->{stateDir} . "/shell"; - unlink $shellPath; - my $shellS; - socket($shellS, PF_UNIX, SOCK_STREAM, 0) or die; - bind($shellS, sockaddr_un($shellPath)) or die "cannot bind shell socket: $!"; - listen($shellS, 1) or die; - - # Start the VM. - my $pid = fork(); - die if $pid == -1; - - if ($pid == 0) { - close $serialP; - close $monitorS; - close $shellS; - if ($self->{redirectSerial}) { - open NUL, "</dev/null" or die; - dup2(fileno(NUL), fileno(STDIN)); - dup2(fileno($serialC), fileno(STDOUT)); - dup2(fileno($serialC), fileno(STDERR)); - } - $ENV{TMPDIR} = $self->{stateDir}; - $ENV{SHARED_DIR} = $sharedDir; - $ENV{USE_TMPDIR} = 1; - $ENV{QEMU_OPTS} = - ($self->{allowReboot} ? "" : "-no-reboot ") . - "-monitor unix:./monitor -chardev socket,id=shell,path=./shell " . - "-device virtio-serial -device virtconsole,chardev=shell " . - "-device virtio-rng-pci " . - ($showGraphics ? "-serial stdio" : "-nographic") . " " . ($ENV{QEMU_OPTS} || ""); - chdir $self->{stateDir} or die; - exec $self->{startCommand}; - die "running VM script: $!"; - } - - # Process serial line output. - close $serialC; - - threads->create(\&processSerialOutput, $self, $serialP)->detach; - - sub processSerialOutput { - my ($self, $serialP) = @_; - while (<$serialP>) { - chomp; - s/\r$//; - print STDERR $self->{name}, "# $_\n"; - $self->{log}->{logQueue}->enqueue({msg => $_, machine => $self->{name}}); # !!! - } - } - - eval { - local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; }; - - # Wait until QEMU connects to the monitor. - accept($self->{monitor}, $monitorS) or die; - - # Wait until QEMU connects to the root shell socket. QEMU - # does so immediately; this doesn't mean that the root shell - # has connected yet inside the guest. - accept($self->{socket}, $shellS) or die; - $self->{socket}->autoflush(1); - }; - die "$@" if $@; - - $self->waitForMonitorPrompt; - - $self->log("QEMU running (pid $pid)"); - - $self->{pid} = $pid; - $self->{booted} = 1; -} - - -# Send a command to the monitor and wait for it to finish. TODO: QEMU -# also has a JSON-based monitor interface now, but it doesn't support -# all commands yet. We should use it once it does. -sub sendMonitorCommand { - my ($self, $command) = @_; - $self->log("sending monitor command: $command"); - syswrite $self->{monitor}, "$command\n"; - return $self->waitForMonitorPrompt; -} - - -# Wait until the monitor sends "(qemu) ". -sub waitForMonitorPrompt { - my ($self) = @_; - my $res = ""; - my $s; - while (sysread($self->{monitor}, $s, 1024)) { - $res .= $s; - last if $res =~ s/\(qemu\) $//; - } - return $res; -} - - -# Call the given code reference repeatedly, with 1 second intervals, -# until it returns 1 or a timeout is reached. -sub retry { - my ($coderef) = @_; - my $n; - for ($n = 899; $n >=0; $n--) { - return if &$coderef($n); - sleep 1; - } - die "action timed out after $n seconds"; -} - - -sub connect { - my ($self) = @_; - return if $self->{connected}; - - $self->nest("waiting for the VM to finish booting", sub { - - $self->start; - - my $now = clock_gettime(CLOCK_MONOTONIC); - local $SIG{ALRM} = sub { die "timed out waiting for the VM to connect\n"; }; - alarm 600; - readline $self->{socket} or die "the VM quit before connecting\n"; - alarm 0; - - $self->log("connected to guest root shell"); - # We're interested in tracking how close we are to `alarm`. - $self->log(sprintf("(connecting took %.2f seconds)", clock_gettime(CLOCK_MONOTONIC) - $now)); - $self->{connected} = 1; - - }); -} - - -sub waitForShutdown { - my ($self) = @_; - return unless $self->{booted}; - - $self->nest("waiting for the VM to power off", sub { - waitpid $self->{pid}, 0; - $self->{pid} = 0; - $self->{booted} = 0; - $self->{connected} = 0; - }); -} - - -sub isUp { - my ($self) = @_; - return $self->{booted} && $self->{connected}; -} - - -sub execute_ { - my ($self, $command) = @_; - - $self->connect; - - print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n"); - - my $out = ""; - - while (1) { - my $line = readline($self->{socket}); - die "connection to VM lost unexpectedly" unless defined $line; - #$self->log("got line: $line"); - if ($line =~ /^(.*)\|\!\=EOF\s+(\d+)$/) { - $out .= $1; - $self->log("exit status $2"); - return ($2, $out); - } - $out .= $line; - } -} - - -sub execute { - my ($self, $command) = @_; - my @res; - $self->nest("running command: $command", sub { - @res = $self->execute_($command); - }); - return @res; -} - - -sub succeed { - my ($self, @commands) = @_; - - my $res; - foreach my $command (@commands) { - $self->nest("must succeed: $command", sub { - my ($status, $out) = $self->execute_($command); - if ($status != 0) { - $self->log("output: $out"); - die "command `$command' did not succeed (exit code $status)\n"; - } - $res .= $out; - }); - } - - return $res; -} - - -sub mustSucceed { - succeed @_; -} - - -sub waitUntilSucceeds { - my ($self, $command) = @_; - $self->nest("waiting for success: $command", sub { - retry sub { - my ($status, $out) = $self->execute($command); - return 1 if $status == 0; - }; - }); -} - - -sub waitUntilFails { - my ($self, $command) = @_; - $self->nest("waiting for failure: $command", sub { - retry sub { - my ($status, $out) = $self->execute($command); - return 1 if $status != 0; - }; - }); -} - - -sub fail { - my ($self, $command) = @_; - $self->nest("must fail: $command", sub { - my ($status, $out) = $self->execute_($command); - die "command `$command' unexpectedly succeeded" - if $status == 0; - }); -} - - -sub mustFail { - fail @_; -} - - -sub getUnitInfo { - my ($self, $unit, $user) = @_; - my ($status, $lines) = $self->systemctl("--no-pager show \"$unit\"", $user); - return undef if $status != 0; - my $info = {}; - foreach my $line (split '\n', $lines) { - $line =~ /^([^=]+)=(.*)$/ or next; - $info->{$1} = $2; - } - return $info; -} - -sub systemctl { - my ($self, $q, $user) = @_; - if ($user) { - $q =~ s/'/\\'/g; - return $self->execute("su -l $user -c \$'XDG_RUNTIME_DIR=/run/user/`id -u` systemctl --user $q'"); - } - - return $self->execute("systemctl $q"); -} - -# Fail if the given systemd unit is not in the "active" state. -sub requireActiveUnit { - my ($self, $unit) = @_; - $self->nest("checking if unit ‘$unit’ has reached state 'active'", sub { - my $info = $self->getUnitInfo($unit); - my $state = $info->{ActiveState}; - if ($state ne "active") { - die "Expected unit ‘$unit’ to to be in state 'active' but it is in state ‘$state’\n"; - }; - }); -} - -# Wait for a systemd unit to reach the "active" state. -sub waitForUnit { - my ($self, $unit, $user) = @_; - $self->nest("waiting for unit ‘$unit’", sub { - retry sub { - my $info = $self->getUnitInfo($unit, $user); - my $state = $info->{ActiveState}; - die "unit ‘$unit’ reached state ‘$state’\n" if $state eq "failed"; - if ($state eq "inactive") { - # If there are no pending jobs, then assume this unit - # will never reach active state. - my ($status, $jobs) = $self->systemctl("list-jobs --full 2>&1", $user); - if ($jobs =~ /No jobs/) { # FIXME: fragile - # Handle the case where the unit may have started - # between the previous getUnitInfo() and - # list-jobs. - my $info2 = $self->getUnitInfo($unit); - die "unit ‘$unit’ is inactive and there are no pending jobs\n" - if $info2->{ActiveState} eq $state; - } - } - return 1 if $state eq "active"; - }; - }); -} - - -sub waitForJob { - my ($self, $jobName) = @_; - return $self->waitForUnit($jobName); -} - - -# Wait until the specified file exists. -sub waitForFile { - my ($self, $fileName) = @_; - $self->nest("waiting for file ‘$fileName’", sub { - retry sub { - my ($status, $out) = $self->execute("test -e $fileName"); - return 1 if $status == 0; - } - }); -} - -sub startJob { - my ($self, $jobName, $user) = @_; - $self->systemctl("start $jobName", $user); - # FIXME: check result -} - -sub stopJob { - my ($self, $jobName, $user) = @_; - $self->systemctl("stop $jobName", $user); -} - - -# Wait until the machine is listening on the given TCP port. -sub waitForOpenPort { - my ($self, $port) = @_; - $self->nest("waiting for TCP port $port", sub { - retry sub { - my ($status, $out) = $self->execute("nc -z localhost $port"); - return 1 if $status == 0; - } - }); -} - - -# Wait until the machine is not listening on the given TCP port. -sub waitForClosedPort { - my ($self, $port) = @_; - retry sub { - my ($status, $out) = $self->execute("nc -z localhost $port"); - return 1 if $status != 0; - } -} - - -sub shutdown { - my ($self) = @_; - return unless $self->{booted}; - - print { $self->{socket} } ("poweroff\n"); - - $self->waitForShutdown; -} - - -sub crash { - my ($self) = @_; - return unless $self->{booted}; - - $self->log("forced crash"); - - $self->sendMonitorCommand("quit"); - - $self->waitForShutdown; -} - - -# Make the machine unreachable by shutting down eth1 (the multicast -# interface used to talk to the other VMs). We keep eth0 up so that -# the test driver can continue to talk to the machine. -sub block { - my ($self) = @_; - $self->sendMonitorCommand("set_link virtio-net-pci.1 off"); -} - - -# Make the machine reachable. -sub unblock { - my ($self) = @_; - $self->sendMonitorCommand("set_link virtio-net-pci.1 on"); -} - - -# Take a screenshot of the X server on :0.0. -sub screenshot { - my ($self, $filename) = @_; - my $dir = $ENV{'out'} || Cwd::abs_path("."); - $filename = "$dir/${filename}.png" if $filename =~ /^\w+$/; - my $tmp = "${filename}.ppm"; - my $name = basename($filename); - $self->nest("making screenshot ‘$name’", sub { - $self->sendMonitorCommand("screendump $tmp"); - system("pnmtopng $tmp > ${filename}") == 0 - or die "cannot convert screenshot"; - unlink $tmp; - }, { image => $name } ); -} - -# Get the text of TTY<n> -sub getTTYText { - my ($self, $tty) = @_; - - my ($status, $out) = $self->execute("fold -w\$(stty -F /dev/tty${tty} size | awk '{print \$2}') /dev/vcs${tty}"); - return $out; -} - -# Wait until TTY<n>'s text matches a particular regular expression -sub waitUntilTTYMatches { - my ($self, $tty, $regexp) = @_; - - $self->nest("waiting for $regexp to appear on tty $tty", sub { - retry sub { - my ($retries_remaining) = @_; - if ($retries_remaining == 0) { - $self->log("Last chance to match /$regexp/ on TTY$tty, which currently contains:"); - $self->log($self->getTTYText($tty)); - } - - return 1 if $self->getTTYText($tty) =~ /$regexp/; - } - }); -} - -# Debugging: Dump the contents of the TTY<n> -sub dumpTTYContents { - my ($self, $tty) = @_; - - $self->execute("fold -w 80 /dev/vcs${tty} | systemd-cat"); -} - -# Take a screenshot and return the result as text using optical character -# recognition. -sub getScreenText { - my ($self) = @_; - - system("command -v tesseract &> /dev/null") == 0 - or die "getScreenText used but enableOCR is false"; - - my $text; - $self->nest("performing optical character recognition", sub { - my $tmpbase = Cwd::abs_path(".")."/ocr"; - my $tmpin = $tmpbase."in.ppm"; - - $self->sendMonitorCommand("screendump $tmpin"); - - my $magickArgs = "-filter Catrom -density 72 -resample 300 " - . "-contrast -normalize -despeckle -type grayscale " - . "-sharpen 1 -posterize 3 -negate -gamma 100 " - . "-blur 1x65535"; - my $tessArgs = "-c debug_file=/dev/null --psm 11 --oem 2"; - - $text = `convert $magickArgs $tmpin tiff:- | tesseract - - $tessArgs`; - my $status = $? >> 8; - unlink $tmpin; - - die "OCR failed with exit code $status" if $status != 0; - }); - return $text; -} - - -# Wait until a specific regexp matches the textual contents of the screen. -sub waitForText { - my ($self, $regexp) = @_; - $self->nest("waiting for $regexp to appear on the screen", sub { - retry sub { - my ($retries_remaining) = @_; - if ($retries_remaining == 0) { - $self->log("Last chance to match /$regexp/ on the screen, which currently contains:"); - $self->log($self->getScreenText); - } - - return 1 if $self->getScreenText =~ /$regexp/; - } - }); -} - - -# Wait until it is possible to connect to the X server. Note that -# testing the existence of /tmp/.X11-unix/X0 is insufficient. -sub waitForX { - my ($self, $regexp) = @_; - $self->nest("waiting for the X11 server", sub { - retry sub { - my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'Reached target Current graphical'"); - return 0 if $status != 0; - ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]"); - return 1 if $status == 0; - } - }); -} - - -sub getWindowNames { - my ($self) = @_; - my $res = $self->mustSucceed( - q{xwininfo -root -tree | sed 's/.*0x[0-9a-f]* \"\([^\"]*\)\".*/\1/; t; d'}); - return split /\n/, $res; -} - - -sub waitForWindow { - my ($self, $regexp) = @_; - $self->nest("waiting for a window to appear", sub { - retry sub { - my @names = $self->getWindowNames; - - my ($retries_remaining) = @_; - if ($retries_remaining == 0) { - $self->log("Last chance to match /$regexp/ on the the window list, which currently contains:"); - $self->log(join(", ", @names)); - } - - foreach my $n (@names) { - return 1 if $n =~ /$regexp/; - } - } - }); -} - - -sub copyFileFromHost { - my ($self, $from, $to) = @_; - my $s = `cat $from` or die; - $s =~ s/'/'\\''/g; - $self->mustSucceed("echo '$s' > $to"); -} - - -my %charToKey = ( - 'A' => "shift-a", 'N' => "shift-n", '-' => "0x0C", '_' => "shift-0x0C", '!' => "shift-0x02", - 'B' => "shift-b", 'O' => "shift-o", '=' => "0x0D", '+' => "shift-0x0D", '@' => "shift-0x03", - 'C' => "shift-c", 'P' => "shift-p", '[' => "0x1A", '{' => "shift-0x1A", '#' => "shift-0x04", - 'D' => "shift-d", 'Q' => "shift-q", ']' => "0x1B", '}' => "shift-0x1B", '$' => "shift-0x05", - 'E' => "shift-e", 'R' => "shift-r", ';' => "0x27", ':' => "shift-0x27", '%' => "shift-0x06", - 'F' => "shift-f", 'S' => "shift-s", '\'' => "0x28", '"' => "shift-0x28", '^' => "shift-0x07", - 'G' => "shift-g", 'T' => "shift-t", '`' => "0x29", '~' => "shift-0x29", '&' => "shift-0x08", - 'H' => "shift-h", 'U' => "shift-u", '\\' => "0x2B", '|' => "shift-0x2B", '*' => "shift-0x09", - 'I' => "shift-i", 'V' => "shift-v", ',' => "0x33", '<' => "shift-0x33", '(' => "shift-0x0A", - 'J' => "shift-j", 'W' => "shift-w", '.' => "0x34", '>' => "shift-0x34", ')' => "shift-0x0B", - 'K' => "shift-k", 'X' => "shift-x", '/' => "0x35", '?' => "shift-0x35", - 'L' => "shift-l", 'Y' => "shift-y", ' ' => "spc", - 'M' => "shift-m", 'Z' => "shift-z", "\n" => "ret", -); - - -sub sendKeys { - my ($self, @keys) = @_; - foreach my $key (@keys) { - $key = $charToKey{$key} if exists $charToKey{$key}; - $self->sendMonitorCommand("sendkey $key"); - } -} - - -sub sendChars { - my ($self, $chars) = @_; - $self->nest("sending keys ‘$chars’", sub { - $self->sendKeys(split //, $chars); - }); -} - - -# Sleep N seconds (in virtual guest time, not real time). -sub sleep { - my ($self, $time) = @_; - $self->succeed("sleep $time"); -} - - -# Forward a TCP port on the host to a TCP port on the guest. Useful -# during interactive testing. -sub forwardPort { - my ($self, $hostPort, $guestPort) = @_; - $hostPort = 8080 unless defined $hostPort; - $guestPort = 80 unless defined $guestPort; - $self->sendMonitorCommand("hostfwd_add tcp::$hostPort-:$guestPort"); -} - - -1; diff --git a/nixos/lib/test-driver/test-driver.pl b/nixos/lib/test-driver/test-driver.pl deleted file mode 100644 index a3354fb0e1e..00000000000 --- a/nixos/lib/test-driver/test-driver.pl +++ /dev/null @@ -1,191 +0,0 @@ -#! /somewhere/perl -w - -use strict; -use Machine; -use Term::ReadLine; -use IO::File; -use IO::Pty; -use Logger; -use Cwd; -use POSIX qw(_exit dup2); -use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); - -$SIG{PIPE} = 'IGNORE'; # because Unix domain sockets may die unexpectedly - -STDERR->autoflush(1); - -my $log = new Logger; - - -# Start vde_switch for each network required by the test. -my %vlans; -foreach my $vlan (split / /, $ENV{VLANS} || "") { - next if defined $vlans{$vlan}; - # Start vde_switch as a child process. We don't run it in daemon - # mode because we want the child process to be cleaned up when we - # die. Since we have to make sure that the control socket is - # ready, we send a dummy command to vde_switch (via stdin) and - # wait for a reply. Note that vde_switch requires stdin to be a - # TTY, so we create one. - $log->log("starting VDE switch for network $vlan"); - my $socket = Cwd::abs_path "./vde$vlan.ctl"; - my $pty = new IO::Pty; - my ($stdoutR, $stdoutW); pipe $stdoutR, $stdoutW; - my $pid = fork(); die "cannot fork" unless defined $pid; - if ($pid == 0) { - dup2(fileno($pty->slave), 0); - dup2(fileno($stdoutW), 1); - exec "vde_switch -s $socket --dirmode 0700" or _exit(1); - } - close $stdoutW; - print $pty "version\n"; - readline $stdoutR or die "cannot start vde_switch"; - $ENV{"QEMU_VDE_SOCKET_$vlan"} = $socket; - $vlans{$vlan} = $pty; - die unless -e "$socket/ctl"; -} - - -my %vms; -my $context = ""; - -sub createMachine { - my ($args) = @_; - my $vm = Machine->new({%{$args}, log => $log, redirectSerial => ($ENV{USE_SERIAL} // "0") ne "1"}); - $vms{$vm->name} = $vm; - $context .= "my \$" . $vm->name . " = \$vms{'" . $vm->name . "'}; "; - return $vm; -} - -foreach my $vmScript (@ARGV) { - my $vm = createMachine({startCommand => $vmScript}); -} - - -sub startAll { - $log->nest("starting all VMs", sub { - $_->start foreach values %vms; - }); -} - - -# Wait until all VMs have terminated. -sub joinAll { - $log->nest("waiting for all VMs to finish", sub { - $_->waitForShutdown foreach values %vms; - }); -} - - -# In interactive tests, this allows the non-interactive test script to -# be executed conveniently. -sub testScript { - eval "$context $ENV{testScript};\n"; - warn $@ if $@; -} - - -my $nrTests = 0; -my $nrSucceeded = 0; - - -sub subtest { - my ($name, $coderef) = @_; - $log->nest("subtest: $name", sub { - $nrTests++; - eval { &$coderef }; - if ($@) { - $log->log("error: $@", { error => 1 }); - } else { - $nrSucceeded++; - } - }); -} - - -sub runTests { - if (defined $ENV{tests}) { - $log->nest("running the VM test script", sub { - eval "$context $ENV{tests}"; - if ($@) { - $log->log("error: $@", { error => 1 }); - die $@; - } - }, { expanded => 1 }); - } else { - my $term = Term::ReadLine->new('nixos-vm-test'); - $term->ReadHistory; - while (defined ($_ = $term->readline("> "))) { - eval "$context $_\n"; - warn $@ if $@; - } - $term->WriteHistory; - } - - # Copy the kernel coverage data for each machine, if the kernel - # has been compiled with coverage instrumentation. - $log->nest("collecting coverage data", sub { - foreach my $vm (values %vms) { - my $gcovDir = "/sys/kernel/debug/gcov"; - - next unless $vm->isUp(); - - my ($status, $out) = $vm->execute("test -e $gcovDir"); - next if $status != 0; - - # Figure out where to put the *.gcda files so that the - # report generator can find the corresponding kernel - # sources. - my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /run/current-system/kernel))/.build/linux-*"); - chomp $kernelDir; - my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir"; - - # Copy all the *.gcda files. - $vm->execute("for d in $gcovDir/nix/store/*/.build/linux-*; do for i in \$(cd \$d && find -name '*.gcda'); do echo \$i; mkdir -p $coverageDir/\$(dirname \$i); cp -v \$d/\$i $coverageDir/\$i; done; done"); - } - }); - - $log->nest("syncing", sub { - foreach my $vm (values %vms) { - next unless $vm->isUp(); - $vm->execute("sync"); - } - }); - - if ($nrTests != 0) { - $log->log("$nrSucceeded out of $nrTests tests succeeded", - ($nrSucceeded < $nrTests ? { error => 1 } : { })); - } -} - - -# Create an empty raw virtual disk with the given name and size (in -# MiB). -sub createDisk { - my ($name, $size) = @_; - system("qemu-img create -f raw $name ${size}M") == 0 - or die "cannot create image of size $size"; -} - - -END { - $log->nest("cleaning up", sub { - foreach my $vm (values %vms) { - if ($vm->{pid}) { - $log->log("killing " . $vm->{name} . " (pid " . $vm->{pid} . ")"); - kill 9, $vm->{pid}; - } - } - }); - $log->close(); -} - -my $now1 = clock_gettime(CLOCK_MONOTONIC); - -runTests; - -my $now2 = clock_gettime(CLOCK_MONOTONIC); - -printf STDERR "test script finished in %.2fs\n", $now2 - $now1; - -exit ($nrSucceeded < $nrTests ? 1 : 0); diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 7b8d5803aa5..93f94587c0a 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -424,15 +424,18 @@ class Machine: output += out return output - def fail(self, *commands: str) -> None: + def fail(self, *commands: str) -> str: """Execute each command and check that it fails.""" + output = "" for command in commands: with self.nested("must fail: {}".format(command)): - status, output = self.execute(command) + (status, out) = self.execute(command) if status == 0: raise Exception( "command `{}` unexpectedly succeeded".format(command) ) + output += out + return output def wait_until_succeeds(self, command: str) -> str: """Wait until a command returns success and return its output. @@ -837,7 +840,8 @@ class Machine: retry(window_is_visible) def sleep(self, secs: int) -> None: - time.sleep(secs) + # We want to sleep in *guest* time, not *host* time. + self.succeed(f"sleep {secs}") def forward_port(self, host_port: int = 8080, guest_port: int = 80) -> None: """Forward a TCP port on the host to a TCP port on the guest. diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix deleted file mode 100644 index 5c784c2f0ab..00000000000 --- a/nixos/lib/testing.nix +++ /dev/null @@ -1,258 +0,0 @@ -{ system -, pkgs ? import ../.. { inherit system config; } - # Use a minimal kernel? -, minimal ? false - # Ignored -, config ? {} - # Modules to add to each VM -, extraConfigurations ? [] }: - -with import ./build-vms.nix { inherit system pkgs minimal extraConfigurations; }; -with pkgs; - -rec { - - inherit pkgs; - - - testDriver = lib.warn '' - Perl VM tests are deprecated and will be removed for 20.09. - Please update your tests to use the python test driver. - See https://github.com/NixOS/nixpkgs/pull/71684 for details. - '' stdenv.mkDerivation { - name = "nixos-test-driver"; - - buildInputs = [ makeWrapper perl ]; - - dontUnpack = true; - - preferLocalBuild = true; - - installPhase = - '' - mkdir -p $out/bin - cp ${./test-driver/test-driver.pl} $out/bin/nixos-test-driver - chmod u+x $out/bin/nixos-test-driver - - libDir=$out/${perl.libPrefix} - mkdir -p $libDir - cp ${./test-driver/Machine.pm} $libDir/Machine.pm - cp ${./test-driver/Logger.pm} $libDir/Logger.pm - - wrapProgram $out/bin/nixos-test-driver \ - --prefix PATH : "${lib.makeBinPath [ qemu_test vde2 netpbm coreutils ]}" \ - --prefix PERL5LIB : "${with perlPackages; makePerlPath [ TermReadLineGnu XMLWriter IOTty FileSlurp ]}:$out/${perl.libPrefix}" - ''; - }; - - - # Run an automated test suite in the given virtual network. - # `driver' is the script that runs the network. - runTests = driver: - stdenv.mkDerivation { - name = "vm-test-run-${driver.testName}"; - - requiredSystemFeatures = [ "kvm" "nixos-test" ]; - - buildCommand = - '' - mkdir -p $out - - LOGFILE=/dev/null tests='eval $ENV{testScript}; die $@ if $@;' ${driver}/bin/nixos-test-driver - - for i in */xchg/coverage-data; do - mkdir -p $out/coverage-data - mv $i $out/coverage-data/$(dirname $(dirname $i)) - done - ''; - }; - - - makeTest = - { testScript - , makeCoverageReport ? false - , enableOCR ? false - , name ? "unnamed" - , ... - } @ t: - - let - # A standard store path to the vm monitor is built like this: - # /tmp/nix-build-vm-test-run-$name.drv-0/vm-state-machine/monitor - # The max filename length of a unix domain socket is 108 bytes. - # This means $name can at most be 50 bytes long. - maxTestNameLen = 50; - testNameLen = builtins.stringLength name; - - testDriverName = with builtins; - if testNameLen > maxTestNameLen then - abort ("The name of the test '${name}' must not be longer than ${toString maxTestNameLen} " + - "it's currently ${toString testNameLen} characters long.") - else - "nixos-test-driver-${name}"; - - nodes = buildVirtualNetwork ( - t.nodes or (if t ? machine then { machine = t.machine; } else { })); - - testScript' = - # Call the test script with the computed nodes. - if lib.isFunction testScript - then testScript { inherit nodes; } - else testScript; - - vlans = map (m: m.config.virtualisation.vlans) (lib.attrValues nodes); - - vms = map (m: m.config.system.build.vm) (lib.attrValues nodes); - - ocrProg = tesseract4.override { enableLanguages = [ "eng" ]; }; - - imagemagick_tiff = imagemagick_light.override { inherit libtiff; }; - - # Generate onvenience wrappers for running the test driver - # interactively with the specified network, and for starting the - # VMs from the command line. - driver = runCommand testDriverName - { buildInputs = [ makeWrapper]; - testScript = testScript'; - preferLocalBuild = true; - testName = name; - } - '' - mkdir -p $out/bin - echo "$testScript" > $out/test-script - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/ - vms=($(for i in ${toString vms}; do echo $i/bin/run-*-vm; done)) - wrapProgram $out/bin/nixos-test-driver \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR - "--prefix PATH : '${ocrProg}/bin:${imagemagick_tiff}/bin'"} \ - --run "export testScript=\"\$(cat $out/test-script)\"" \ - --set VLANS '${toString vlans}' - ln -s ${testDriver}/bin/nixos-test-driver $out/bin/nixos-run-vms - wrapProgram $out/bin/nixos-run-vms \ - --add-flags "''${vms[*]}" \ - ${lib.optionalString enableOCR "--prefix PATH : '${ocrProg}/bin'"} \ - --set tests 'startAll; joinAll;' \ - --set VLANS '${toString vlans}' \ - ${lib.optionalString (builtins.length vms == 1) "--set USE_SERIAL 1"} - ''; # " - - passMeta = drv: drv // lib.optionalAttrs (t ? meta) { - meta = (drv.meta or {}) // t.meta; - }; - - test = passMeta (runTests driver); - report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; }); - - nodeNames = builtins.attrNames nodes; - invalidNodeNames = lib.filter - (node: builtins.match "^[A-z_][A-z0-9_]+$" node == null) nodeNames; - - in - if lib.length invalidNodeNames > 0 then - throw '' - Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! - All machines are referenced as perl variables in the testing framework which will break the - script when special characters are used. - - Please stick to alphanumeric chars and underscores as separation. - '' - else - (if makeCoverageReport then report else test) // { - inherit nodes driver test; - }; - - runInMachine = - { drv - , machine - , preBuild ? "" - , postBuild ? "" - , ... # ??? - }: - let - vm = buildVM { } - [ machine - { key = "run-in-machine"; - networking.hostName = "client"; - nix.readOnlyStore = false; - virtualisation.writableStore = false; - } - ]; - - buildrunner = writeText "vm-build" '' - source $1 - - ${coreutils}/bin/mkdir -p $TMPDIR - cd $TMPDIR - - exec $origBuilder $origArgs - ''; - - testScript = '' - startAll; - $client->waitForUnit("multi-user.target"); - ${preBuild} - $client->succeed("env -i ${bash}/bin/bash ${buildrunner} /tmp/xchg/saved-env >&2"); - ${postBuild} - $client->succeed("sync"); # flush all data before pulling the plug - ''; - - vmRunCommand = writeText "vm-run" '' - xchg=vm-state-client/xchg - ${coreutils}/bin/mkdir $out - ${coreutils}/bin/mkdir -p $xchg - - for i in $passAsFile; do - i2=''${i}Path - _basename=$(${coreutils}/bin/basename ''${!i2}) - ${coreutils}/bin/cp ''${!i2} $xchg/$_basename - eval $i2=/tmp/xchg/$_basename - ${coreutils}/bin/ls -la $xchg - done - - unset i i2 _basename - export | ${gnugrep}/bin/grep -v '^xchg=' > $xchg/saved-env - unset xchg - - export tests='${testScript}' - ${testDriver}/bin/nixos-test-driver ${vm.config.system.build.vm}/bin/run-*-vm - ''; # */ - - in - lib.overrideDerivation drv (attrs: { - requiredSystemFeatures = [ "kvm" ]; - builder = "${bash}/bin/sh"; - args = ["-e" vmRunCommand]; - origArgs = attrs.args; - origBuilder = attrs.builder; - }); - - - runInMachineWithX = { require ? [], ... } @ args: - let - client = - { ... }: - { - inherit require; - imports = [ - ../tests/common/auto.nix - ]; - virtualisation.memorySize = 1024; - services.xserver.enable = true; - test-support.displayManager.auto.enable = true; - services.xserver.displayManager.defaultSession = "none+icewm"; - services.xserver.windowManager.icewm.enable = true; - }; - in - runInMachine ({ - machine = client; - preBuild = - '' - $client->waitForX; - ''; - } // args); - - - simpleTest = as: (makeTest as).test; - -} diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix index ddad1116c94..231c7bf0a6c 100644 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ b/nixos/modules/installer/cd-dvd/sd-image.nix @@ -108,6 +108,15 @@ in ''; }; + postBuildCommands = mkOption { + example = literalExample "'' dd if=\${pkgs.myBootLoader}/SPL of=$img bs=1024 seek=1 conv=notrunc ''"; + default = ""; + description = '' + Shell commands to run after the image is built. + Can be used for boards requiring to dd u-boot SPL before actual partitions. + ''; + }; + compressImage = mkOption { type = types.bool; default = true; @@ -197,6 +206,9 @@ in # Verify the FAT partition before copying it. fsck.vfat -vn firmware_part.img dd conv=notrunc if=firmware_part.img of=$img seek=$START count=$SECTORS + + ${config.sdImage.postBuildCommands} + if test -n "$compressImage"; then zstd -T$NIX_BUILD_CORES --rm $img fi diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 437199bae1d..ed9c2509b6b 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -288,7 +288,10 @@ fi if [ "$action" = edit ]; then if [[ -z $flake ]]; then NIXOS_CONFIG=${NIXOS_CONFIG:-$(nix-instantiate --find-file nixos-config)} - exec "${EDITOR:-nano}" "$NIXOS_CONFIG" + if [[ -d $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$NIXOS_CONFIG/default.nix + fi + exec ${EDITOR:-nano} "$NIXOS_CONFIG" else exec nix edit "${lockFlags[@]}" -- "$flake#$flakeAttr" fi diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index dc668796c78..92aa3be0a36 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -127,7 +127,7 @@ in { { LOCATE_PATH = cfg.output; }; - warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support searching as user other than root" + warnings = optional (isMLocate && cfg.localuser != null) "mlocate does not support the services.locate.localuser option; updatedb will run as root. (Silence with services.locate.localuser = null.)" ++ optional (isFindutils && cfg.pruneNames != []) "findutils locate does not support pruning by directory component" ++ optional (isFindutils && cfg.pruneBindMounts) "findutils locate does not support skipping bind mounts"; diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index 4f5a9250eaa..25ac94b8e0f 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -178,8 +178,6 @@ in type = types.nullOr types.attrs; # TODO utilize lib.systems.parsedPlatform default = null; example = { system = "aarch64-linux"; config = "aarch64-unknown-linux-gnu"; }; - defaultText = literalExample - ''(import "''${nixos}/../lib").lib.systems.examples.aarch64-multiplatform''; description = '' Specifies the platform for which NixOS should be built. Specify this only if it is different from diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index aee1fdb368d..03127cf9adf 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -262,6 +262,7 @@ ./services/continuous-integration/buildbot/worker.nix ./services/continuous-integration/buildkite-agents.nix ./services/continuous-integration/hail.nix + ./services/continuous-integration/hercules-ci-agent/default.nix ./services/continuous-integration/hydra/default.nix ./services/continuous-integration/gitlab-runner.nix ./services/continuous-integration/gocd-agent/default.nix @@ -296,10 +297,10 @@ ./services/desktops/accountsservice.nix ./services/desktops/bamf.nix ./services/desktops/blueman.nix - ./services/desktops/deepin/deepin.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix ./services/desktops/pantheon/files.nix + ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix ./services/desktops/gsignond.nix @@ -717,6 +718,7 @@ ./services/networking/rdnssd.nix ./services/networking/redsocks.nix ./services/networking/resilio.nix + ./services/networking/robustirc-bridge.nix ./services/networking/rpcbind.nix ./services/networking/rxe.nix ./services/networking/sabnzbd.nix diff --git a/nixos/modules/profiles/hardened.nix b/nixos/modules/profiles/hardened.nix index ef8c0d74f06..7bff79e8273 100644 --- a/nixos/modules/profiles/hardened.nix +++ b/nixos/modules/profiles/hardened.nix @@ -1,7 +1,7 @@ # A profile with most (vanilla) hardening options enabled by default, # potentially at the cost of features and performance. -{ lib, pkgs, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -27,6 +27,9 @@ with lib; security.forcePageTableIsolation = mkDefault true; + # This is required by podman to run containers in rootless mode. + security.unprivilegedUsernsClone = mkDefault config.virtualisation.containers.enable; + security.virtualisation.flushL1DataCache = mkDefault "always"; security.apparmor.enable = mkDefault true; diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 1fe00e9142b..fad0b40a9db 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -19,6 +19,7 @@ with lib; # Completely removed modules (mkRemovedOptionModule [ "fonts" "fontconfig" "penultimate" ] "The corresponding package has removed from nixpkgs.") (mkRemovedOptionModule [ "services" "chronos" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "deepin" ] "The corresponding packages were removed from nixpkgs.") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "user" ] "") (mkRemovedOptionModule [ "services" "firefox" "syncserver" "group" ] "") (mkRemovedOptionModule [ "services" "marathon" ] "The corresponding package was removed from nixpkgs.") diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index cfc65b347bc..2ee10454fd2 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -23,11 +23,17 @@ in default = []; description = "List of packages to be added to apparmor's include path"; }; + parserConfig = mkOption { + type = types.str; + default = ""; + description = "AppArmor parser configuration file content"; + }; }; }; config = mkIf cfg.enable { environment.systemPackages = [ pkgs.apparmor-utils ]; + environment.etc."apparmor/parser.conf".text = cfg.parserConfig; boot.kernelParams = [ "apparmor=1" "security=apparmor" ]; diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix index 71428b82f5d..c47be80b9dc 100644 --- a/nixos/modules/security/duosec.nix +++ b/nixos/modules/security/duosec.nix @@ -51,7 +51,7 @@ in }; secretKeyFile = mkOption { - type = types.path; + type = types.nullOr types.path; default = null; description = '' A file containing your secret key. The security of your Duo application is tied to the security of your secret key. diff --git a/nixos/modules/security/misc.nix b/nixos/modules/security/misc.nix index 16e3bfb1419..d51dbbb77f7 100644 --- a/nixos/modules/security/misc.nix +++ b/nixos/modules/security/misc.nix @@ -27,6 +27,16 @@ with lib; ''; }; + security.unprivilegedUsernsClone = mkOption { + type = types.bool; + default = false; + description = '' + When disabled, unprivileged users will not be able to create new namespaces. + By default unprivileged user namespaces are disabled. + This option only works in a hardened profile. + ''; + }; + security.protectKernelImage = mkOption { type = types.bool; default = false; @@ -115,6 +125,10 @@ with lib; ]; }) + (mkIf config.security.unprivilegedUsernsClone { + boot.kernel.sysctl."kernel.unprivileged_userns_clone" = mkDefault true; + }) + (mkIf config.security.protectKernelImage { # Disable hibernation (allows replacing the running kernel) boot.kernelParams = [ "nohibernate" ]; diff --git a/nixos/modules/services/audio/icecast.nix b/nixos/modules/services/audio/icecast.nix index f40ea6be29d..6ca20a7a108 100644 --- a/nixos/modules/services/audio/icecast.nix +++ b/nixos/modules/services/audio/icecast.nix @@ -47,7 +47,7 @@ in { enable = mkEnableOption "Icecast server"; hostname = mkOption { - type = types.str; + type = types.nullOr types.str; description = "DNS name or IP address that will be used for the stream directory lookups or possibily the playlist generation if a Host header is not provided."; default = config.networking.domain; }; diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix new file mode 100644 index 00000000000..4aed493c0fb --- /dev/null +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/common.nix @@ -0,0 +1,213 @@ +/* + +This file is for options that NixOS and nix-darwin have in common. + +Platform-specific code is in the respective default.nix files. + + */ + +{ config, lib, options, pkgs, ... }: + +let + inherit (lib) mkOption mkIf types filterAttrs literalExample mkRenamedOptionModule; + + cfg = + config.services.hercules-ci-agent; + + format = pkgs.formats.toml {}; + + settingsModule = { config, ... }: { + freeformType = format.type; + options = { + baseDirectory = mkOption { + type = types.path; + default = "/var/lib/hercules-ci-agent"; + description = '' + State directory (secrets, work directory, etc) for agent + ''; + }; + concurrentTasks = mkOption { + description = '' + Number of tasks to perform simultaneously, such as evaluations, derivations. + + You must have a total capacity across agents of at least 2 concurrent tasks on <literal>x86_64-linux</literal> + to allow for import from derivation. + ''; + type = types.int; + default = 4; + }; + workDirectory = mkOption { + description = '' + The directory in which temporary subdirectories are created for task state. This includes sources for Nix evaluation. + ''; + type = types.path; + default = config.baseDirectory + "/work"; + defaultText = literalExample ''baseDirectory + "/work"''; + }; + staticSecretsDirectory = mkOption { + description = '' + This is the default directory to look for statically configured secrets like <literal>cluster-join-token.key</literal>. + ''; + type = types.path; + default = config.baseDirectory + "/secrets"; + defaultText = literalExample ''baseDirectory + "/secrets"''; + }; + clusterJoinTokenPath = mkOption { + description = '' + Location of the cluster-join-token.key file. + ''; + type = types.path; + default = config.staticSecretsDirectory + "/cluster-join-token.key"; + defaultText = literalExample ''staticSecretsDirectory + "/cluster-join-token.key"''; + # internal: It's a bit too detailed to show by default in the docs, + # but useful to define explicitly to allow reuse by other modules. + internal = true; + }; + binaryCachesPath = mkOption { + description = '' + Location of the binary-caches.json file. + ''; + type = types.path; + default = config.staticSecretsDirectory + "/binary-caches.json"; + defaultText = literalExample ''staticSecretsDirectory + "/binary-caches.json"''; + # internal: It's a bit too detailed to show by default in the docs, + # but useful to define explicitly to allow reuse by other modules. + internal = true; + }; + }; + }; + + checkNix = + if !cfg.checkNix + then "" + else if lib.versionAtLeast config.nix.package.version "2.4.0" + then "" + else pkgs.stdenv.mkDerivation { + name = "hercules-ci-check-system-nix-src"; + inherit (config.nix.package) src patches; + configurePhase = ":"; + buildPhase = '' + echo "Checking in-memory pathInfoCache expiry" + if ! grep 'struct PathInfoCacheValue' src/libstore/store-api.hh >/dev/null; then + cat 1>&2 <<EOF + + You are deploying Hercules CI Agent on a system with an incompatible + nix-daemon. Please + - either upgrade Nix to version 2.4.0 (when released), + - or set option services.hercules-ci-agent.patchNix = true; + - or set option nix.package to a build of Nix 2.3 with this patch applied: + https://github.com/NixOS/nix/pull/3405 + + The patch is required for Nix-daemon clients that expect a change in binary + cache contents while running, like the agent's evaluator. Without it, import + from derivation will fail if your cluster has more than one machine. + We are conservative with changes to the overall system, which is why we + keep changes to a minimum and why we ask for confirmation in the form of + services.hercules-ci-agent.patchNix = true before applying. + + EOF + exit 1 + fi + ''; + installPhase = "touch $out"; + }; + + patchedNix = lib.mkIf (!lib.versionAtLeast pkgs.nix.version "2.4.0") ( + if lib.versionAtLeast pkgs.nix.version "2.4pre" + then lib.warn "Hercules CI Agent module will not patch 2.4 pre-release. Make sure it includes (equivalently) PR #3043, commit d048577909 or is no older than 2020-03-13." pkgs.nix + else pkgs.nix.overrideAttrs ( + o: { + patches = (o.patches or []) ++ [ backportNix3398 ]; + } + ) + ); + + backportNix3398 = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/hercules-ci/hercules-ci-agent/hercules-ci-agent-0.7.3/for-upstream/issue-3398-path-info-cache-ttls-backport-2.3.patch"; + sha256 = "0jfckqjir9il2il7904yc1qyadw366y7xqzg81sp9sl3f1pw70ib"; + }; +in +{ + imports = [ + (mkRenamedOptionModule ["services" "hercules-ci-agent" "extraOptions"] ["services" "hercules-ci-agent" "settings"]) + (mkRenamedOptionModule ["services" "hercules-ci-agent" "baseDirectory"] ["services" "hercules-ci-agent" "settings" "baseDirectory"]) + (mkRenamedOptionModule ["services" "hercules-ci-agent" "concurrentTasks"] ["services" "hercules-ci-agent" "settings" "concurrentTasks"]) + ]; + + options.services.hercules-ci-agent = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable to run Hercules CI Agent as a system service. + + <link xlink:href="https://hercules-ci.com">Hercules CI</link> is a + continuous integation service that is centered around Nix. + + Support is available at <link xlink:href="mailto:help@hercules-ci.com">help@hercules-ci.com</link>. + ''; + }; + patchNix = mkOption { + type = types.bool; + default = false; + description = '' + Fix Nix 2.3 cache path metadata caching behavior. Has the effect of <literal>nix.package = patch pkgs.nix;</literal> + + This option will be removed when Hercules CI Agent moves to Nix 2.4 (upcoming Nix release). + ''; + }; + checkNix = mkOption { + type = types.bool; + default = true; + description = '' + Whether to make sure that the system's Nix (nix-daemon) is compatible. + + If you set this to false, please keep up with the change log. + ''; + }; + package = mkOption { + description = '' + Package containing the bin/hercules-ci-agent executable. + ''; + type = types.package; + default = pkgs.hercules-ci-agent; + defaultText = literalExample "pkgs.hercules-ci-agent"; + }; + settings = mkOption { + description = '' + These settings are written to the <literal>agent.toml</literal> file. + + Not all settings are listed as options, can be set nonetheless. + + For the exhaustive list of settings, see <link xlink:href="https://docs.hercules-ci.com/hercules-ci/reference/agent-config/"/>. + ''; + type = types.submoduleWith { modules = [ settingsModule ]; }; + }; + + /* + Internal and/or computed values. + + These are written as options instead of let binding to allow sharing with + default.nix on both NixOS and nix-darwin. + */ + tomlFile = mkOption { + type = types.path; + internal = true; + defaultText = "generated hercules-ci-agent.toml"; + description = '' + The fully assembled config file. + ''; + }; + }; + + config = mkIf cfg.enable { + nix.extraOptions = lib.addContextFrom checkNix '' + # A store path that was missing at first may well have finished building, + # even shortly after the previous lookup. This *also* applies to the daemon. + narinfo-cache-negative-ttl = 0 + ''; + nix.package = mkIf cfg.patchNix patchedNix; + services.hercules-ci-agent.tomlFile = + format.generate "hercules-ci-agent.toml" cfg.settings; + }; +} diff --git a/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix new file mode 100644 index 00000000000..d2e7e8e18f9 --- /dev/null +++ b/nixos/modules/services/continuous-integration/hercules-ci-agent/default.nix @@ -0,0 +1,86 @@ +/* + +This file is for NixOS-specific options and configs. + +Code that is shared with nix-darwin goes in common.nix. + + */ + +{ pkgs, config, lib, ... }: + +let + + inherit (lib) mkIf mkDefault; + + cfg = config.services.hercules-ci-agent; + + command = "${cfg.package}/bin/hercules-ci-agent --config ${cfg.tomlFile}"; + testCommand = "${command} --test-configuration"; + +in +{ + imports = [ + ./common.nix + (lib.mkRenamedOptionModule ["services" "hercules-ci-agent" "user"] ["systemd" "services" "hercules-ci-agent" "serviceConfig" "User"]) + ]; + + config = mkIf cfg.enable { + + systemd.services.hercules-ci-agent = { + wantedBy = [ "multi-user.target" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + path = [ config.nix.package ]; + serviceConfig = { + User = "hercules-ci-agent"; + ExecStart = command; + ExecStartPre = testCommand; + Restart = "on-failure"; + RestartSec = 120; + StartLimitBurst = 30 * 1000000; # practically infinite + }; + }; + + # Changes in the secrets do not affect the unit in any way that would cause + # a restart, which is currently necessary to reload the secrets. + systemd.paths.hercules-ci-agent-restart-files = { + wantedBy = [ "hercules-ci-agent.service" ]; + pathConfig = { + Unit = "hercules-ci-agent-restarter.service"; + PathChanged = [ cfg.settings.clusterJoinTokenPath cfg.settings.binaryCachesPath ]; + }; + }; + systemd.services.hercules-ci-agent-restarter = { + serviceConfig.Type = "oneshot"; + script = '' + # Wait a bit, with the effect of bundling up file changes into a single + # run of this script and hopefully a single restart. + sleep 10 + if systemctl is-active --quiet hercules-ci-agent.service; then + if ${testCommand}; then + systemctl restart hercules-ci-agent.service + else + echo 1>&2 "WARNING: Not restarting agent because config is not valid at this time." + fi + else + echo 1>&2 "Not restarting hercules-ci-agent despite config file update, because it is not already active." + fi + ''; + }; + + # Trusted user allows simplified configuration and better performance + # when operating in a cluster. + nix.trustedUsers = [ config.systemd.services.hercules-ci-agent.serviceConfig.User ]; + services.hercules-ci-agent.settings.nixUserIsTrusted = true; + + users.users.hercules-ci-agent = { + home = cfg.settings.baseDirectory; + createHome = true; + group = "hercules-ci-agent"; + description = "Hercules CI Agent system user"; + isSystemUser = true; + }; + + users.groups.hercules-ci-agent = {}; + }; +} diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index c726a08e34f..5056d50153f 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -11,23 +11,23 @@ let then cfg.package else cfg.package.withPackages (_: cfg.extraPlugins); + toStr = value: + if true == value then "yes" + else if false == value then "no" + else if isString value then "'${lib.replaceStrings ["'"] ["''"] value}'" + else toString value; + # The main PostgreSQL configuration file. - configFile = pkgs.writeText "postgresql.conf" - '' - hba_file = '${pkgs.writeText "pg_hba.conf" cfg.authentication}' - ident_file = '${pkgs.writeText "pg_ident.conf" cfg.identMap}' - log_destination = 'stderr' - log_line_prefix = '${cfg.logLinePrefix}' - listen_addresses = '${if cfg.enableTCPIP then "*" else "localhost"}' - port = ${toString cfg.port} - ${cfg.extraConfig} - ''; + configFile = pkgs.writeText "postgresql.conf" (concatStringsSep "\n" (mapAttrsToList (n: v: "${n} = ${toStr v}") cfg.settings)); groupAccessAvailable = versionAtLeast postgresql.version "11.0"; in { + imports = [ + (mkRemovedOptionModule [ "services" "postgresql" "extraConfig" ] "Use services.postgresql.settings instead.") + ]; ###### interface @@ -212,10 +212,28 @@ in ''; }; - extraConfig = mkOption { - type = types.lines; - default = ""; - description = "Additional text to be appended to <filename>postgresql.conf</filename>."; + settings = mkOption { + type = with types; attrsOf (oneOf [ bool float int str ]); + default = {}; + description = '' + PostgreSQL configuration. Refer to + <link xlink:href="https://www.postgresql.org/docs/11/config-setting.html#CONFIG-SETTING-CONFIGURATION-FILE"/> + for an overview of <literal>postgresql.conf</literal>. + + <note><para> + String values will automatically be enclosed in single quotes. Single quotes will be + escaped with two single quotes as described by the upstream documentation linked above. + </para></note> + ''; + example = literalExample '' + { + log_connections = true; + log_statement = "all"; + logging_collector = true + log_disconnections = true + log_destination = lib.mkForce "syslog"; + } + ''; }; recoveryConfig = mkOption { @@ -245,6 +263,16 @@ in config = mkIf cfg.enable { + services.postgresql.settings = + { + hba_file = "${pkgs.writeText "pg_hba.conf" cfg.authentication}"; + ident_file = "${pkgs.writeText "pg_ident.conf" cfg.identMap}"; + log_destination = "stderr"; + log_line_prefix = cfg.logLinePrefix; + listen_addresses = if cfg.enableTCPIP then "*" else "localhost"; + port = cfg.port; + }; + services.postgresql.package = # Note: when changing the default, make it conditional on # ‘system.stateVersion’ to maintain compatibility with existing diff --git a/nixos/modules/services/desktops/deepin/deepin.nix b/nixos/modules/services/desktops/deepin/deepin.nix deleted file mode 100644 index f8fb73701af..00000000000 --- a/nixos/modules/services/desktops/deepin/deepin.nix +++ /dev/null @@ -1,123 +0,0 @@ -# deepin - -{ config, pkgs, lib, ... }: - -{ - - ###### interface - - options = { - - services.deepin.core.enable = lib.mkEnableOption " - Basic dbus and systemd services, groups and users needed by the - Deepin Desktop Environment. - "; - - services.deepin.deepin-menu.enable = lib.mkEnableOption " - DBus service for unified menus in Deepin Desktop Environment. - "; - - services.deepin.deepin-turbo.enable = lib.mkEnableOption " - Turbo service for the Deepin Desktop Environment. It is a daemon - that helps to launch applications faster. - "; - - }; - - - ###### implementation - - config = lib.mkMerge [ - - (lib.mkIf config.services.deepin.core.enable { - environment.systemPackages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-calendar - pkgs.deepin.dde-control-center - pkgs.deepin.dde-daemon - pkgs.deepin.dde-dock - pkgs.deepin.dde-launcher - pkgs.deepin.dde-file-manager - pkgs.deepin.dde-session-ui - pkgs.deepin.deepin-anything - pkgs.deepin.deepin-image-viewer - ]; - - services.dbus.packages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-calendar - pkgs.deepin.dde-control-center - pkgs.deepin.dde-daemon - pkgs.deepin.dde-dock - pkgs.deepin.dde-launcher - pkgs.deepin.dde-file-manager - pkgs.deepin.dde-session-ui - pkgs.deepin.deepin-anything - pkgs.deepin.deepin-image-viewer - ]; - - systemd.packages = [ - pkgs.deepin.dde-api - pkgs.deepin.dde-daemon - pkgs.deepin.dde-file-manager - pkgs.deepin.deepin-anything - ]; - - boot.extraModulePackages = [ config.boot.kernelPackages.deepin-anything ]; - - boot.kernelModules = [ "vfs_monitor" ]; - - users.groups.deepin-sound-player = { }; - - users.users.deepin-sound-player = { - description = "Deepin sound player"; - group = "deepin-sound-player"; - isSystemUser = true; - }; - - users.groups.deepin-daemon = { }; - - users.users.deepin-daemon = { - description = "Deepin daemon user"; - group = "deepin-daemon"; - isSystemUser = true; - }; - - users.groups.deepin_anything_server = { }; - - users.users.deepin_anything_server = { - description = "Deepin Anything Server"; - group = "deepin_anything_server"; - isSystemUser = true; - }; - - security.pam.services.deepin-auth-keyboard.text = '' - # original at ${pkgs.deepin.dde-daemon}/etc/pam.d/deepin-auth-keyboard - auth [success=2 default=ignore] pam_lsass.so - auth [success=1 default=ignore] pam_unix.so nullok_secure try_first_pass - auth requisite pam_deny.so - auth required pam_permit.so - ''; - - environment.etc = { - "polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla".source = "${pkgs.deepin.dde-api}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.api.device.pkla"; - "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Accounts.pkla"; - "polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla".source = "${pkgs.deepin.dde-daemon}/etc/polkit-1/localauthority/10-vendor.d/com.deepin.daemon.Grub2.pkla"; - }; - - services.deepin.deepin-menu.enable = true; - services.deepin.deepin-turbo.enable = true; - }) - - (lib.mkIf config.services.deepin.deepin-menu.enable { - services.dbus.packages = [ pkgs.deepin.deepin-menu ]; - }) - - (lib.mkIf config.services.deepin.deepin-turbo.enable { - environment.systemPackages = [ pkgs.deepin.deepin-turbo ]; - systemd.packages = [ pkgs.deepin.deepin-turbo ]; - }) - - ]; - -} diff --git a/nixos/modules/services/desktops/espanso.nix b/nixos/modules/services/desktops/espanso.nix new file mode 100644 index 00000000000..cd2eadf8816 --- /dev/null +++ b/nixos/modules/services/desktops/espanso.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; +let cfg = config.services.espanso; +in { + meta = { maintainers = with lib.maintainers; [ numkem ]; }; + + options = { + services.espanso = { enable = options.mkEnableOption "Espanso"; }; + }; + + config = mkIf cfg.enable { + systemd.user.services.espanso = { + description = "Espanso daemon"; + path = with pkgs; [ espanso libnotify xclip ]; + serviceConfig = { + ExecStart = "${pkgs.espanso}/bin/espanso daemon"; + Restart = "on-failure"; + }; + wantedBy = [ "default.target" ]; + }; + + environment.systemPackages = [ pkgs.espanso ]; + }; +} diff --git a/nixos/modules/services/development/jupyterhub/default.nix b/nixos/modules/services/development/jupyterhub/default.nix index be6aaed93ac..f1dcab68b00 100644 --- a/nixos/modules/services/development/jupyterhub/default.nix +++ b/nixos/modules/services/development/jupyterhub/default.nix @@ -15,7 +15,7 @@ let jupyterhubConfig = pkgs.writeText "jupyterhub_config.py" '' c.JupyterHub.bind_url = "http://${cfg.host}:${toString cfg.port}" - c.JupyterHub.authentication_class = "${cfg.authentication}" + c.JupyterHub.authenticator_class = "${cfg.authentication}" c.JupyterHub.spawner_class = "${cfg.spawner}" c.SystemdSpawner.default_url = '/lab' diff --git a/nixos/modules/services/editors/emacs.xml b/nixos/modules/services/editors/emacs.xml index 05f87df43bc..302aa1ed7c4 100644 --- a/nixos/modules/services/editors/emacs.xml +++ b/nixos/modules/services/editors/emacs.xml @@ -322,7 +322,7 @@ https://nixos.org/nixpkgs/manual/#sec-modify-via-packageOverrides If you want, you can tweak the Emacs package itself from your <filename>emacs.nix</filename>. For example, if you want to have a GTK 3-based Emacs instead of the default GTK 2-based binary and remove the - automatically generated <filename>emacs.desktop</filename> (useful is you + automatically generated <filename>emacs.desktop</filename> (useful if you only use <command>emacsclient</command>), you can change your file <filename>emacs.nix</filename> in this way: </para> diff --git a/nixos/modules/services/hardware/fancontrol.nix b/nixos/modules/services/hardware/fancontrol.nix index bb4541a784d..e1ce11a5aef 100644 --- a/nixos/modules/services/hardware/fancontrol.nix +++ b/nixos/modules/services/hardware/fancontrol.nix @@ -12,7 +12,7 @@ in{ config = mkOption { default = null; - type = types.lines; + type = types.nullOr types.lines; description = "Fancontrol configuration file content. See <citerefentry><refentrytitle>pwmconfig</refentrytitle><manvolnum>8</manvolnum></citerefentry> from the lm_sensors package."; example = '' # Configuration file generated by pwmconfig diff --git a/nixos/modules/services/misc/beanstalkd.nix b/nixos/modules/services/misc/beanstalkd.nix index bcd133c9741..1c674a5b23b 100644 --- a/nixos/modules/services/misc/beanstalkd.nix +++ b/nixos/modules/services/misc/beanstalkd.nix @@ -28,6 +28,12 @@ in example = "0.0.0.0"; }; }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Whether to open ports in the firewall for the server."; + }; }; }; @@ -35,6 +41,10 @@ in config = mkIf cfg.enable { + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.listen.port ]; + }; + environment.systemPackages = [ pkg ]; systemd.services.beanstalkd = { diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix index 3057d7fd1a0..552725f1384 100644 --- a/nixos/modules/services/misc/gammu-smsd.nix +++ b/nixos/modules/services/misc/gammu-smsd.nix @@ -172,7 +172,7 @@ in { }; database = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = "Database name to store sms data"; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 924a007efc6..2680b1cc0d3 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -500,13 +500,6 @@ in config = { - assertions = [ - { - assertion = config.nix.distributedBuilds || config.nix.buildMachines == []; - message = "You must set `nix.distributedBuilds = true` to use nix.buildMachines"; - } - ]; - nix.binaryCachePublicKeys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.binaryCaches = [ "https://cache.nixos.org/" ]; @@ -594,16 +587,10 @@ in nix.systemFeatures = mkDefault ( [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ - optionals (pkgs.stdenv.isx86_64 && pkgs.hostPlatform.platform ? gcc.arch) ( - # a x86_64 builder can run code for `platform.gcc.arch` and minor architectures: - [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ { - sandybridge = [ "gccarch-westmere" ]; - ivybridge = [ "gccarch-westmere" "gccarch-sandybridge" ]; - haswell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" ]; - broadwell = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" ]; - skylake = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" ]; - skylake-avx512 = [ "gccarch-westmere" "gccarch-sandybridge" "gccarch-ivybridge" "gccarch-haswell" "gccarch-broadwell" "gccarch-skylake" ]; - }.${pkgs.hostPlatform.platform.gcc.arch} or [] + optionals (pkgs.hostPlatform.platform ? gcc.arch) ( + # a builder can run code for `platform.gcc.arch` and inferior architectures + [ "gccarch-${pkgs.hostPlatform.platform.gcc.arch}" ] ++ + map (x: "gccarch-${x}") lib.systems.architectures.inferiors.${pkgs.hostPlatform.platform.gcc.arch} ) ); diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix index 7a71d2c8c6a..e2fbd3b401c 100644 --- a/nixos/modules/services/misc/octoprint.nix +++ b/nixos/modules/services/misc/octoprint.nix @@ -68,8 +68,8 @@ in plugins = mkOption { default = plugins: []; defaultText = "plugins: []"; - example = literalExample "plugins: [ m3d-fio ]"; - description = "Additional plugins."; + example = literalExample "plugins: with plugins; [ m33-fio stlviewer ]"; + description = "Additional plugins to be used. Available plugins are passed through the plugins input."; }; extraConfig = mkOption { diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index 0e71cf92569..1313bdaccc4 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -1,12 +1,12 @@ { config, lib, pkgs, ... }: let - inherit (lib) mkDefault mkEnableOption mkIf mkOption types; + inherit (lib) mkBefore mkDefault mkEnableOption mkIf mkOption mkRemovedOptionModule types; inherit (lib) concatStringsSep literalExample mapAttrsToList; - inherit (lib) optional optionalAttrs optionalString singleton versionAtLeast; + inherit (lib) optional optionalAttrs optionalString; cfg = config.services.redmine; - + format = pkgs.formats.yaml {}; bundle = "${cfg.package}/share/redmine/bin/bundle"; databaseYml = pkgs.writeText "database.yml" '' @@ -20,24 +20,8 @@ let ${optionalString (cfg.database.type == "mysql2" && cfg.database.socket != null) "socket: ${cfg.database.socket}"} ''; - configurationYml = pkgs.writeText "configuration.yml" '' - default: - scm_subversion_command: ${pkgs.subversion}/bin/svn - scm_mercurial_command: ${pkgs.mercurial}/bin/hg - scm_git_command: ${pkgs.gitAndTools.git}/bin/git - scm_cvs_command: ${pkgs.cvs}/bin/cvs - scm_bazaar_command: ${pkgs.breezy}/bin/bzr - scm_darcs_command: ${pkgs.darcs}/bin/darcs - - ${cfg.extraConfig} - ''; - - additionalEnvironment = pkgs.writeText "additional_environment.rb" '' - config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) - config.logger.level = Logger::INFO - - ${cfg.extraEnv} - ''; + configurationYml = format.generate "configuration.yml" cfg.settings; + additionalEnvironment = pkgs.writeText "additional_environment.rb" cfg.extraEnv; unpackTheme = unpack "theme"; unpackPlugin = unpack "plugin"; @@ -56,8 +40,13 @@ let pgsqlLocal = cfg.database.createLocally && cfg.database.type == "postgresql"; in - { + imports = [ + (mkRemovedOptionModule [ "services" "redmine" "extraConfig" ] "Use services.redmine.settings instead.") + (mkRemovedOptionModule [ "services" "redmine" "database" "password" ] "Use services.redmine.database.passwordFile instead.") + ]; + + # interface options = { services.redmine = { enable = mkEnableOption "Redmine"; @@ -93,21 +82,24 @@ in description = "The state directory, logs and plugins are stored here."; }; - extraConfig = mkOption { - type = types.lines; - default = ""; + settings = mkOption { + type = format.type; + default = {}; description = '' - Extra configuration in configuration.yml. - - See <link xlink:href="https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration"/> + Redmine configuration (<filename>configuration.yml</filename>). Refer to + <link xlink:href="https://guides.rubyonrails.org/action_mailer_basics.html#action-mailer-configuration"/> for details. ''; example = literalExample '' - email_delivery: - delivery_method: smtp - smtp_settings: - address: mail.example.com - port: 25 + { + email_delivery = { + delivery_method = "smtp"; + smtp_settings = { + address = "mail.example.com"; + port = 25; + }; + }; + } ''; }; @@ -186,16 +178,6 @@ in description = "Database user."; }; - password = mkOption { - type = types.str; - default = ""; - description = '' - The password corresponding to <option>database.user</option>. - Warning: this is stored in cleartext in the Nix store! - Use <option>database.passwordFile</option> instead. - ''; - }; - passwordFile = mkOption { type = types.nullOr types.path; default = null; @@ -226,11 +208,12 @@ in }; }; + # implementation config = mkIf cfg.enable { assertions = [ - { assertion = cfg.database.passwordFile != null || cfg.database.password != "" || cfg.database.socket != null; - message = "one of services.redmine.database.socket, services.redmine.database.passwordFile, or services.redmine.database.password must be set"; + { assertion = cfg.database.passwordFile != null || cfg.database.socket != null; + message = "one of services.redmine.database.socket or services.redmine.database.passwordFile must be set"; } { assertion = cfg.database.createLocally -> cfg.database.user == cfg.user; message = "services.redmine.database.user must be set to ${cfg.user} if services.redmine.database.createLocally is set true"; @@ -243,6 +226,22 @@ in } ]; + services.redmine.settings = { + production = { + scm_subversion_command = "${pkgs.subversion}/bin/svn"; + scm_mercurial_command = "${pkgs.mercurial}/bin/hg"; + scm_git_command = "${pkgs.gitAndTools.git}/bin/git"; + scm_cvs_command = "${pkgs.cvs}/bin/cvs"; + scm_bazaar_command = "${pkgs.breezy}/bin/bzr"; + scm_darcs_command = "${pkgs.darcs}/bin/darcs"; + }; + }; + + services.redmine.extraEnv = mkBefore '' + config.logger = Logger.new("${cfg.stateDir}/log/production.log", 14, 1048576) + config.logger.level = Logger::INFO + ''; + services.mysql = mkIf mysqlLocal { enable = true; package = mkDefault pkgs.mariadb; @@ -338,7 +337,7 @@ in # handle database.passwordFile & permissions - DBPASS=$(head -n1 ${cfg.database.passwordFile}) + DBPASS=${optionalString (cfg.database.passwordFile != null) "$(head -n1 ${cfg.database.passwordFile})"} cp -f ${databaseYml} "${cfg.stateDir}/config/database.yml" sed -e "s,#dbpass#,$DBPASS,g" -i "${cfg.stateDir}/config/database.yml" chmod 440 "${cfg.stateDir}/config/database.yml" @@ -379,17 +378,6 @@ in redmine.gid = config.ids.gids.redmine; }; - warnings = optional (cfg.database.password != "") - ''config.services.redmine.database.password will be stored as plaintext - in the Nix store. Use database.passwordFile instead.''; - - # Create database passwordFile default when password is configured. - services.redmine.database.passwordFile = - (mkDefault (toString (pkgs.writeTextFile { - name = "redmine-database-password"; - text = cfg.database.password; - }))); - }; } diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix index 3da99a3b38c..386281e2b7c 100644 --- a/nixos/modules/services/misc/sssd.nix +++ b/nixos/modules/services/misc/sssd.nix @@ -69,7 +69,7 @@ in { mode = "0400"; }; - system.nssModules = pkgs.sssd; + system.nssModules = [ pkgs.sssd ]; system.nssDatabases = { group = [ "sss" ]; passwd = [ "sss" ]; @@ -92,4 +92,6 @@ in { services.openssh.authorizedKeysCommand = "/etc/ssh/authorized_keys_command"; services.openssh.authorizedKeysCommandUser = "nobody"; })]; + + meta.maintainers = with maintainers; [ bbigras ]; } diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix index 74ebdc13402..8eb754fe611 100644 --- a/nixos/modules/services/network-filesystems/orangefs/server.nix +++ b/nixos/modules/services/network-filesystems/orangefs/server.nix @@ -83,14 +83,14 @@ in { }; dataStorageSpace = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; example = "/data/storage"; description = "Directory for data storage."; }; metadataStorageSpace = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; example = "/data/meta"; description = "Directory for meta data storage."; diff --git a/nixos/modules/services/networking/monero.nix b/nixos/modules/services/networking/monero.nix index 97af2997839..fde3293fc13 100644 --- a/nixos/modules/services/networking/monero.nix +++ b/nixos/modules/services/networking/monero.nix @@ -87,7 +87,7 @@ in }; rpc.password = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = '' Password for RPC connections. diff --git a/nixos/modules/services/networking/namecoind.nix b/nixos/modules/services/networking/namecoind.nix index 6ca99e1321b..16f85df2e77 100644 --- a/nixos/modules/services/networking/namecoind.nix +++ b/nixos/modules/services/networking/namecoind.nix @@ -89,7 +89,7 @@ in }; rpc.password = mkOption { - type = types.str; + type = types.nullOr types.str; default = null; description = '' Password for RPC connections. diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index cc789897b29..17c549d42c3 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -458,7 +458,7 @@ in { systemd.services.NetworkManager-dispatcher = { wantedBy = [ "network.target" ]; - restartTriggers = [ configFile ]; + restartTriggers = [ configFile overrideNameserversScript ]; # useful binaries for user-specified hooks path = [ pkgs.iproute pkgs.utillinux pkgs.coreutils ]; diff --git a/nixos/modules/services/networking/robustirc-bridge.nix b/nixos/modules/services/networking/robustirc-bridge.nix new file mode 100644 index 00000000000..255af79ec04 --- /dev/null +++ b/nixos/modules/services/networking/robustirc-bridge.nix @@ -0,0 +1,47 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.robustirc-bridge; +in +{ + options = { + services.robustirc-bridge = { + enable = mkEnableOption "RobustIRC bridge"; + + extraFlags = mkOption { + type = types.listOf types.str; + default = []; + description = ''Extra flags passed to the <command>robustirc-bridge</command> command. See <link xlink:href="https://robustirc.net/docs/adminguide.html#_bridge">RobustIRC Documentation</link> or robustirc-bridge(1) for details.''; + example = [ + "-network robustirc.net" + ]; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.robustirc-bridge = { + description = "RobustIRC bridge"; + documentation = [ + "man:robustirc-bridge(1)" + "https://robustirc.net/" + ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + serviceConfig = { + DynamicUser = true; + ExecStart = "${pkgs.robustirc-bridge}/bin/robustirc-bridge ${concatStringsSep " " cfg.extraFlags}"; + Restart = "on-failure"; + + # Hardening + PrivateDevices = true; + ProtectSystem = true; + ProtectHome = true; + PrivateTmp = true; + }; + }; + }; +} diff --git a/nixos/modules/services/networking/shadowsocks.nix b/nixos/modules/services/networking/shadowsocks.nix index af12db590f0..4fd988297f6 100644 --- a/nixos/modules/services/networking/shadowsocks.nix +++ b/nixos/modules/services/networking/shadowsocks.nix @@ -11,8 +11,13 @@ let method = cfg.encryptionMethod; mode = cfg.mode; user = "nobody"; - fast_open = true; - } // optionalAttrs (cfg.password != null) { password = cfg.password; }; + fast_open = cfg.fastOpen; + } // optionalAttrs (cfg.plugin != null) { + plugin = cfg.plugin; + plugin_opts = cfg.pluginOpts; + } // optionalAttrs (cfg.password != null) { + password = cfg.password; + }; configFile = pkgs.writeText "shadowsocks.json" (builtins.toJSON opts); @@ -74,6 +79,14 @@ in ''; }; + fastOpen = mkOption { + type = types.bool; + default = true; + description = '' + use TCP fast-open + ''; + }; + encryptionMethod = mkOption { type = types.str; default = "chacha20-ietf-poly1305"; @@ -82,6 +95,23 @@ in ''; }; + plugin = mkOption { + type = types.nullOr types.str; + default = null; + example = "\${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"; + description = '' + SIP003 plugin for shadowsocks + ''; + }; + + pluginOpts = mkOption { + type = types.str; + default = ""; + example = "server;host=example.com"; + description = '' + Options to pass to the plugin if one was specified + ''; + }; }; }; @@ -99,7 +129,7 @@ in description = "shadowsocks-libev Daemon"; after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; - path = [ pkgs.shadowsocks-libev ] ++ optional (cfg.passwordFile != null) pkgs.jq; + path = [ pkgs.shadowsocks-libev cfg.plugin ] ++ optional (cfg.passwordFile != null) pkgs.jq; serviceConfig.PrivateTmp = true; script = '' ${optionalString (cfg.passwordFile != null) '' diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix index 08a17d20ed7..39513987903 100644 --- a/nixos/modules/services/networking/wpa_supplicant.nix +++ b/nixos/modules/services/networking/wpa_supplicant.nix @@ -233,6 +233,9 @@ in { path = [ pkgs.wpa_supplicant ]; script = '' + if [ -f /etc/wpa_supplicant.conf -a "/etc/wpa_supplicant.conf" != "${configFile}" ] + then echo >&2 "<3>/etc/wpa_supplicant.conf present but ignored. Generated ${configFile} is used instead." + fi iface_args="-s -u -D${cfg.driver} -c ${configFile}" ${if ifaces == [] then '' for i in $(cd /sys/class/net && echo *); do diff --git a/nixos/modules/services/security/physlock.nix b/nixos/modules/services/security/physlock.nix index 690eb70079d..da5c22a90a0 100644 --- a/nixos/modules/services/security/physlock.nix +++ b/nixos/modules/services/security/physlock.nix @@ -52,6 +52,14 @@ in ''; }; + lockMessage = mkOption { + type = types.str; + default = ""; + description = '' + Message to show on physlock login terminal. + ''; + }; + lockOn = { suspend = mkOption { @@ -111,7 +119,7 @@ in ++ cfg.lockOn.extraTargets; serviceConfig = { Type = "forking"; - ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}"; + ExecStart = "${pkgs.physlock}/bin/physlock -d${optionalString cfg.disableSysRq "s"}${optionalString (cfg.lockMessage != "") " -p \"${cfg.lockMessage}\""}"; }; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 885b23ac694..38dc378887a 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -34,8 +34,8 @@ let User tor DataDirectory ${torDirectory} ${optionalString cfg.enableGeoIP '' - GeoIPFile ${pkgs.tor.geoip}/share/tor/geoip - GeoIPv6File ${pkgs.tor.geoip}/share/tor/geoip6 + GeoIPFile ${cfg.package.geoip}/share/tor/geoip + GeoIPv6File ${cfg.package.geoip}/share/tor/geoip6 ''} ${optint "ControlPort" cfg.controlPort} @@ -123,6 +123,16 @@ in ''; }; + package = mkOption { + type = types.package; + default = pkgs.tor; + defaultText = "pkgs.tor"; + example = literalExample "pkgs.tor"; + description = '' + Tor package to use + ''; + }; + enableGeoIP = mkOption { type = types.bool; default = true; @@ -749,8 +759,8 @@ in serviceConfig = { Type = "simple"; # Translated from the upstream contrib/dist/tor.service.in - ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config"; - ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile}"; + ExecStartPre = "${cfg.package}/bin/tor -f ${torRcFile} --verify-config"; + ExecStart = "${cfg.package}/bin/tor -f ${torRcFile}"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; KillSignal = "SIGINT"; TimeoutSec = 30; @@ -773,7 +783,7 @@ in }; }; - environment.systemPackages = [ pkgs.tor ]; + environment.systemPackages = [ cfg.package ]; services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) { enable = true; diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index 50e424fccbf..14d84c4ce0f 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -82,6 +82,7 @@ in { auth required pam_unix.so nullok account required pam_unix.so session required pam_unix.so + session required pam_env.so conffile=${config.system.build.pamEnvironment} readenv=0 session required ${pkgs.systemd}/lib/security/pam_systemd.so ''; diff --git a/nixos/modules/services/web-apps/sogo.nix b/nixos/modules/services/web-apps/sogo.nix index 5f30124dd68..4610bb96cb5 100644 --- a/nixos/modules/services/web-apps/sogo.nix +++ b/nixos/modules/services/web-apps/sogo.nix @@ -77,7 +77,6 @@ in { // Paths WOSendMail = "/run/wrappers/bin/sendmail"; SOGoMailSpoolPath = "/var/lib/sogo/spool"; - SOGoZipPath = "${pkgs.zip}/bin/zip"; // Enable CSRF protection SOGoXSRFValidationEnabled = YES; // Remove dates from log (jornald does that) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index a4cbb03a8e3..88190e8200b 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -641,7 +641,7 @@ in credential = mkOption { default = null; example = "f1d00200d8dc783f7fb1e10ace8da27f8312d72692abfca2f7e4960a73f48e82e1f7571f6ebfcee9fb434f9886ccc8fcc52a6614d8d2"; - type = types.str; + type = types.nullOr types.str; description = "The FIDO2 credential ID."; }; diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 97eb1d286a3..1b2f22a039c 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -36,7 +36,7 @@ let set -euo pipefail declare -A seen - declare -a left + left=() patchelf="${pkgs.buildPackages.patchelf}/bin/patchelf" @@ -48,7 +48,7 @@ let done } - add_needed $1 + add_needed "$1" while [ ''${#left[@]} -ne 0 ]; do next=''${left[0]} @@ -87,7 +87,9 @@ let # copy what we need. Instead of using statically linked binaries, # we just copy what we need from Glibc and use patchelf to make it # work. - extraUtils = pkgs.runCommandCC "extra-utils" + extraUtils = let + # Use lvm2 without udev support, which is the same lvm2 we already have in the closure anyways + lvm2 = pkgs.lvm2.override { udev = null; }; in pkgs.runCommandCC "extra-utils" { nativeBuildInputs = [pkgs.buildPackages.nukeReferences]; allowedReferences = [ "out" ]; # prevent accidents like glibc being included in the initrd } @@ -111,20 +113,21 @@ let copy_bin_and_libs ${pkgs.utillinux}/sbin/blkid # Copy dmsetup and lvm. - copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup - copy_bin_and_libs ${getBin pkgs.lvm2}/bin/lvm + copy_bin_and_libs ${getBin lvm2}/bin/dmsetup + copy_bin_and_libs ${getBin lvm2}/bin/lvm # Add RAID mdadm tool. copy_bin_and_libs ${pkgs.mdadm}/sbin/mdadm copy_bin_and_libs ${pkgs.mdadm}/sbin/mdmon # Copy udev. - copy_bin_and_libs ${udev}/lib/systemd/systemd-udevd - copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl copy_bin_and_libs ${udev}/bin/udevadm + copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl for BIN in ${udev}/lib/udev/*_id; do copy_bin_and_libs $BIN done + # systemd-udevd is only a symlink to udevadm these days + ln -sf udevadm $out/bin/systemd-udevd # Copy modprobe. copy_bin_and_libs ${pkgs.kmod}/bin/kmod diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 96304ff6cec..f6c23c9b900 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -25,7 +25,7 @@ let "nss-lookup.target" "nss-user-lookup.target" "time-sync.target" - #"cryptsetup.target" + "cryptsetup.target" "sigpwr.target" "timers.target" "paths.target" @@ -903,11 +903,9 @@ in ) ]); passwd = (mkMerge [ - [ "mymachines" ] (mkAfter [ "systemd" ]) ]); group = (mkMerge [ - [ "mymachines" ] (mkAfter [ "systemd" ]) ]); }; @@ -1008,7 +1006,7 @@ in "sysctl.d/50-coredump.conf".source = "${systemd}/example/sysctl.d/50-coredump.conf"; "sysctl.d/50-default.conf".source = "${systemd}/example/sysctl.d/50-default.conf"; - "tmpfiles.d".source = pkgs.symlinkJoin { + "tmpfiles.d".source = (pkgs.symlinkJoin { name = "tmpfiles.d"; paths = map (p: p + "/lib/tmpfiles.d") cfg.tmpfiles.packages; postBuild = '' @@ -1018,8 +1016,10 @@ in exit 1 ) done - ''; - }; + '' + concatMapStrings (name: optionalString (hasPrefix "tmpfiles.d/" name) '' + rm -f $out/${removePrefix "tmpfiles.d/" name} + '') config.system.build.etc.targets; + }) + "/*"; "systemd/system-generators" = { source = hooks "generators" cfg.generators; }; "systemd/system-shutdown" = { source = hooks "shutdown" cfg.shutdown; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 2e533fb604e..c0e4d3979fd 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1129,7 +1129,6 @@ in ++ optionals config.networking.wireless.enable [ pkgs.wirelesstools # FIXME: obsolete? pkgs.iw - pkgs.rfkill ] ++ bridgeStp; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 3a6767d84a9..de97ba3f7bb 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -43,6 +43,12 @@ in ''; }; + ociSeccompBpfHook.enable = mkOption { + type = types.bool; + default = false; + description = "Enable the OCI seccomp BPF hook"; + }; + containersConf = mkOption { default = {}; description = "containers.conf configuration"; @@ -116,6 +122,12 @@ in [network] cni_plugin_dirs = ["${pkgs.cni-plugins}/bin/"] + ${lib.optionalString (cfg.ociSeccompBpfHook.enable == true) '' + [engine] + hooks_dir = [ + "${config.boot.kernelPackages.oci-seccomp-bpf-hook}", + ] + ''} '' + cfg.containersConf.extraConfig; environment.etc."containers/registries.conf".source = toTOML "registries.conf" { diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix index 9c818eee73b..aa2fb73533a 100644 --- a/nixos/modules/virtualisation/cri-o.nix +++ b/nixos/modules/virtualisation/cri-o.nix @@ -101,6 +101,7 @@ in log_level = "${cfg.logLevel}" manage_ns_lifecycle = true pinns_path = "${cfg.package}/bin/pinns" + hooks_dir = [] ${optionalString (cfg.runtime != null) '' default_runtime = "${cfg.runtime}" diff --git a/nixos/modules/virtualisation/docker-preloader.nix b/nixos/modules/virtualisation/docker-preloader.nix deleted file mode 100644 index 6ab83058dee..00000000000 --- a/nixos/modules/virtualisation/docker-preloader.nix +++ /dev/null @@ -1,134 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; -with builtins; - -let - cfg = config.virtualisation; - - sanitizeImageName = image: replaceStrings ["/"] ["-"] image.imageName; - hash = drv: head (split "-" (baseNameOf drv.outPath)); - # The label of an ext4 FS is limited to 16 bytes - labelFromImage = image: substring 0 16 (hash image); - - # The Docker image is loaded and some files from /var/lib/docker/ - # are written into a qcow image. - preload = image: pkgs.vmTools.runInLinuxVM ( - pkgs.runCommand "docker-preload-image-${sanitizeImageName image}" { - buildInputs = with pkgs; [ docker e2fsprogs utillinux curl kmod ]; - preVM = pkgs.vmTools.createEmptyImage { - size = cfg.dockerPreloader.qcowSize; - fullName = "docker-deamon-image.qcow2"; - }; - } - '' - mkfs.ext4 /dev/vda - e2label /dev/vda ${labelFromImage image} - mkdir -p /var/lib/docker - mount -t ext4 /dev/vda /var/lib/docker - - modprobe overlay - - # from https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount - mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup - cd /sys/fs/cgroup - for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do - mkdir -p $sys - if ! mountpoint -q $sys; then - if ! mount -n -t cgroup -o $sys cgroup $sys; then - rmdir $sys || true - fi - fi - done - - dockerd -H tcp://127.0.0.1:5555 -H unix:///var/run/docker.sock & - - until $(curl --output /dev/null --silent --connect-timeout 2 http://127.0.0.1:5555); do - printf '.' - sleep 1 - done - - docker load -i ${image} - - kill %1 - find /var/lib/docker/ -maxdepth 1 -mindepth 1 -not -name "image" -not -name "overlay2" | xargs rm -rf - ''); - - preloadedImages = map preload cfg.dockerPreloader.images; - -in - -{ - options.virtualisation.dockerPreloader = { - images = mkOption { - default = [ ]; - type = types.listOf types.package; - description = - '' - A list of Docker images to preload (in the /var/lib/docker directory). - ''; - }; - qcowSize = mkOption { - default = 1024; - type = types.int; - description = - '' - The size (MB) of qcow files. - ''; - }; - }; - - config = mkIf (cfg.dockerPreloader.images != []) { - assertions = [{ - # If docker.storageDriver is null, Docker choose the storage - # driver. So, in this case, we cannot be sure overlay2 is used. - assertion = cfg.docker.storageDriver == "overlay2" - || cfg.docker.storageDriver == "overlay" - || cfg.docker.storageDriver == null; - message = "The Docker image Preloader only works with overlay2 storage driver!"; - }]; - - virtualisation.qemu.options = - map (path: "-drive if=virtio,file=${path}/disk-image.qcow2,readonly,media=cdrom,format=qcow2") - preloadedImages; - - - # All attached QCOW files are mounted and their contents are linked - # to /var/lib/docker/ in order to make image available. - systemd.services.docker-preloader = { - description = "Preloaded Docker images"; - wantedBy = ["docker.service"]; - after = ["network.target"]; - path = with pkgs; [ mount rsync jq ]; - script = '' - mkdir -p /var/lib/docker/overlay2/l /var/lib/docker/image/overlay2 - echo '{}' > /tmp/repositories.json - - for i in ${concatStringsSep " " (map labelFromImage cfg.dockerPreloader.images)}; do - mkdir -p /mnt/docker-images/$i - - # The ext4 label is limited to 16 bytes - mount /dev/disk/by-label/$(echo $i | cut -c1-16) -o ro,noload /mnt/docker-images/$i - - find /mnt/docker-images/$i/overlay2/ -maxdepth 1 -mindepth 1 -not -name l\ - -exec ln -s '{}' /var/lib/docker/overlay2/ \; - cp -P /mnt/docker-images/$i/overlay2/l/* /var/lib/docker/overlay2/l/ - - rsync -a /mnt/docker-images/$i/image/ /var/lib/docker/image/ - - # Accumulate image definitions - cp /tmp/repositories.json /tmp/repositories.json.tmp - jq -s '.[0] * .[1]' \ - /tmp/repositories.json.tmp \ - /mnt/docker-images/$i/image/overlay2/repositories.json \ - > /tmp/repositories.json - done - - mv /tmp/repositories.json /var/lib/docker/image/overlay2/repositories.json - ''; - serviceConfig = { - Type = "oneshot"; - }; - }; - }; -} diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index 828419fb4b9..55605b388b7 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -32,7 +32,7 @@ in }; package = mkOption { - type = types.package; + type = types.nullOr types.package; default = config.boot.kernelPackages.prl-tools; defaultText = "config.boot.kernelPackages.prl-tools"; example = literalExample "config.boot.kernelPackages.prl-tools"; diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a650dd72c2a..42e43f5ee02 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -264,7 +264,6 @@ in { imports = [ ../profiles/qemu-guest.nix - ./docker-preloader.nix ]; options = { diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index ece2d091f5a..945ba90e345 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -106,11 +106,29 @@ in rec { (onFullSupported "nixos.tests.networking.scripted.bridge") (onFullSupported "nixos.tests.networking.scripted.dhcpOneIf") (onFullSupported "nixos.tests.networking.scripted.dhcpSimple") + (onFullSupported "nixos.tests.networking.scripted.link") (onFullSupported "nixos.tests.networking.scripted.loopback") (onFullSupported "nixos.tests.networking.scripted.macvlan") + (onFullSupported "nixos.tests.networking.scripted.privacy") + (onFullSupported "nixos.tests.networking.scripted.routes") (onFullSupported "nixos.tests.networking.scripted.sit") (onFullSupported "nixos.tests.networking.scripted.static") + (onFullSupported "nixos.tests.networking.scripted.virtual") (onFullSupported "nixos.tests.networking.scripted.vlan") + (onFullSupported "nixos.tests.networking.networkd.bond") + (onFullSupported "nixos.tests.networking.networkd.bridge") + (onFullSupported "nixos.tests.networking.networkd.dhcpOneIf") + (onFullSupported "nixos.tests.networking.networkd.dhcpSimple") + (onFullSupported "nixos.tests.networking.networkd.link") + (onFullSupported "nixos.tests.networking.networkd.loopback") + # Fails nondeterministically (https://github.com/NixOS/nixpkgs/issues/96709) + #(onFullSupported "nixos.tests.networking.networkd.macvlan") + (onFullSupported "nixos.tests.networking.networkd.privacy") + (onFullSupported "nixos.tests.networking.networkd.routes") + (onFullSupported "nixos.tests.networking.networkd.sit") + (onFullSupported "nixos.tests.networking.networkd.static") + (onFullSupported "nixos.tests.networking.networkd.virtual") + (onFullSupported "nixos.tests.networking.networkd.vlan") (onFullSupported "nixos.tests.systemd-networkd-ipv6-prefix-delegation") (onFullSupported "nixos.tests.nfs3.simple") (onFullSupported "nixos.tests.nfs4.simple") diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 0ce5f89b27c..60ef5a02763 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -49,6 +49,7 @@ in ceph-multi-node = handleTestOn ["x86_64-linux"] ./ceph-multi-node.nix {}; certmgr = handleTest ./certmgr.nix {}; cfssl = handleTestOn ["x86_64-linux"] ./cfssl.nix {}; + charliecloud = handleTest ./charliecloud.nix {}; chromium = (handleTestOn ["x86_64-linux"] ./chromium.nix {}).stable or {}; cjdns = handleTest ./cjdns.nix {}; clickhouse = handleTest ./clickhouse.nix {}; @@ -66,11 +67,13 @@ in containers-macvlans = handleTest ./containers-macvlans.nix {}; containers-physical_interfaces = handleTest ./containers-physical_interfaces.nix {}; containers-portforward = handleTest ./containers-portforward.nix {}; + containers-reloadable = handleTest ./containers-reloadable.nix {}; containers-restart_networking = handleTest ./containers-restart_networking.nix {}; containers-tmpfs = handleTest ./containers-tmpfs.nix {}; convos = handleTest ./convos.nix {}; corerad = handleTest ./corerad.nix {}; couchdb = handleTest ./couchdb.nix {}; + cri-o = handleTestOn ["x86_64-linux"] ./cri-o.nix {}; deluge = handleTest ./deluge.nix {}; dhparams = handleTest ./dhparams.nix {}; dnscrypt-proxy2 = handleTestOn ["x86_64-linux"] ./dnscrypt-proxy2.nix {}; @@ -79,15 +82,13 @@ in docker = handleTestOn ["x86_64-linux"] ./docker.nix {}; oci-containers = handleTestOn ["x86_64-linux"] ./oci-containers.nix {}; docker-edge = handleTestOn ["x86_64-linux"] ./docker-edge.nix {}; - docker-preloader = handleTestOn ["x86_64-linux"] ./docker-preloader.nix {}; docker-registry = handleTest ./docker-registry.nix {}; docker-tools = handleTestOn ["x86_64-linux"] ./docker-tools.nix {}; docker-tools-overlay = handleTestOn ["x86_64-linux"] ./docker-tools-overlay.nix {}; documize = handleTest ./documize.nix {}; dokuwiki = handleTest ./dokuwiki.nix {}; dovecot = handleTest ./dovecot.nix {}; - # ec2-config doesn't work in a sandbox as the simulated ec2 instance needs network access - #ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; + ec2-config = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-config or {}; ec2-nixops = (handleTestOn ["x86_64-linux"] ./ec2.nix {}).boot-ec2-nixops or {}; ecryptfs = handleTest ./ecryptfs.nix {}; ejabberd = handleTest ./xmpp/ejabberd.nix {}; @@ -297,6 +298,7 @@ in redis = handleTest ./redis.nix {}; redmine = handleTest ./redmine.nix {}; restic = handleTest ./restic.nix {}; + robustirc-bridge = handleTest ./robustirc-bridge.nix {}; roundcube = handleTest ./roundcube.nix {}; rspamd = handleTest ./rspamd.nix {}; rss2email = handleTest ./rss2email.nix {}; @@ -307,6 +309,7 @@ in sanoid = handleTest ./sanoid.nix {}; sddm = handleTest ./sddm.nix {}; service-runner = handleTest ./service-runner.nix {}; + shadowsocks = handleTest ./shadowsocks.nix {}; shattered-pixel-dungeon = handleTest ./shattered-pixel-dungeon.nix {}; shiori = handleTest ./shiori.nix {}; signal-desktop = handleTest ./signal-desktop.nix {}; @@ -321,6 +324,7 @@ in spike = handleTest ./spike.nix {}; sonarr = handleTest ./sonarr.nix {}; sslh = handleTest ./sslh.nix {}; + sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; strongswan-swanctl = handleTest ./strongswan-swanctl.nix {}; sudo = handleTest ./sudo.nix {}; switchTest = handleTest ./switch-test.nix {}; diff --git a/nixos/tests/charliecloud.nix b/nixos/tests/charliecloud.nix new file mode 100644 index 00000000000..acba41e228a --- /dev/null +++ b/nixos/tests/charliecloud.nix @@ -0,0 +1,43 @@ +# This test checks charliecloud image construction and run + +import ./make-test-python.nix ({ pkgs, ...} : let + + dockerfile = pkgs.writeText "Dockerfile" '' + FROM nix + RUN mkdir /home /tmp + RUN touch /etc/passwd /etc/group + CMD ["true"] + ''; + +in { + name = "charliecloud"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bzizou ]; + }; + + nodes = { + host = { ... }: { + environment.systemPackages = [ pkgs.charliecloud ]; + virtualisation.docker.enable = true; + users.users.alice = { + isNormalUser = true; + extraGroups = [ "docker" ]; + }; + }; + }; + + testScript = '' + host.start() + host.wait_for_unit("docker.service") + host.succeed( + 'su - alice -c "docker load --input=${pkgs.dockerTools.examples.nix}"' + ) + host.succeed( + "cp ${dockerfile} /home/alice/Dockerfile" + ) + host.succeed('su - alice -c "ch-build -t hello ."') + host.succeed('su - alice -c "ch-builder2tar hello /var/tmp"') + host.succeed('su - alice -c "ch-tar2dir /var/tmp/hello.tar.gz /var/tmp"') + host.succeed('su - alice -c "ch-run /var/tmp/hello -- echo Running_From_Container_OK"') + ''; +}) diff --git a/nixos/tests/common/acme/server/mkcerts.nix b/nixos/tests/common/acme/server/mkcerts.nix index 2474019cbac..c9616bf9672 100644 --- a/nixos/tests/common/acme/server/mkcerts.nix +++ b/nixos/tests/common/acme/server/mkcerts.nix @@ -59,7 +59,8 @@ pkgs.runCommand "acme-snakeoil-ca" { openssl genrsa -out snakeoil.key 4096 openssl req -new -key snakeoil.key -out snakeoil.csr openssl x509 -req -in snakeoil.csr -sha256 -set_serial 666 \ - -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 + -CA ca.pem -CAkey ca.key -out snakeoil.pem -days 36500 \ + -extfile "$OPENSSL_CONF" -extensions req_ext addpem snakeoil.key ${lib.escapeShellArg fqdn} key addpem snakeoil.pem ${lib.escapeShellArg fqdn} cert '') domains} diff --git a/nixos/tests/common/acme/server/snakeoil-certs.nix b/nixos/tests/common/acme/server/snakeoil-certs.nix index fd537c3260f..7325b027c7e 100644 --- a/nixos/tests/common/acme/server/snakeoil-certs.nix +++ b/nixos/tests/common/acme/server/snakeoil-certs.nix @@ -2,170 +2,171 @@ { ca.key = builtins.toFile "ca.key" '' -----BEGIN PRIVATE KEY----- - MIIJQwIBADANBgkqhkiG9w0BAQEFAASCCS0wggkpAgEAAoICAQDCnVZGEn68ezXl - DWE5gjsCPqutR4nxw/wvIbAxB2Vk2WeQ6HGvt2Jdrz5qer2IXd76YtpQeqd+ffet - aLtMeFTr+Xy9yqEpx2AfvmEEcLnuiWbsUGZzsHwW7/4kPgAFBy9TwJn/k892lR6u - QYa0QS39CX85kLMZ/LZXUyClIBa+IxT1OovmGqMOr4nGASRQP6d/nnyn41Knat/d - tpyaa5zgfYwA6YW6UxcywvBSpMOXM0/82BFZGyALt3nQ+ffmrtKcvMjsNLBFaslV - +zYO1PMbLbTCW8SmJTjhzuapXtBHruvoe24133XWlvcP1ylaTx0alwiQWJr1XEOU - WLEFTgOTeRyiVDxDunpz+7oGcwzcdOG8nCgd6w0aYaECz1zvS3FYTQz+MiqmEkx6 - s4bj1U90I0kwUJbeWjjrGO7Y9Qq4i19GafDg7cAMn9eHCiNbNrPj6t/gfaVbCrbk - m3ZVjkvLTQ2mb2lv7+tVii45227iNPuNS6lx2FVlr/DXiRrOVfghPvoOxUfXzogJ - hZLV4Zki+ycbGQa5w8YMDYCv4c08dKA7AatVhNS60c1zgQNjuWF3BvocSySyGUon - VT6h1DYlJ9YAqgqNpedgNR9kpp034SMhB7dj9leB6LRMA+c1fG/T+1lDbkA+vope - pt4+30oDcCTYfEifl1HwqNw/bXDm1wIDAQABAoICABPbd/UYaAQVUk93yQbUKe81 - s9CvbvzTMYUhm9e02Hyszitz/D2gqZHDksvMkFA8u8aylXIGwdZfRglUmV/ZG1kk - kLzQ0xbvN/ilNUL9uYsETBMqtPly9YZloHnUNa5NqF+UVGJGk7GWz5WaLANybx3V - fTzDbfLl3TkVy0vt9UQbUkUfXyzwZNjXwmgIr8rcY9vasP90a3eXqRX3Tw1Wk6A4 - TzO8oB994O0WBO150Fc6Lhwvc72yzddENlLDXq8UAXtqq9mmGqJKnhZ+1mo3AkMw - q7P1JyCIxcAMm26GtRvLVljXV0x5640kxDrCin6jeeW/qWkJEW6dpmuZjR5scmLI - /9n8H+fGzdZH8bOPPotMy12doj3vJqvew3p0eIkmVctYMJKD0j/CWjvKJNE3Yx4O - Ls47X/dEypX6anR1HQUXcpd6JfRWdIJANo2Duaz+HYbyA88bHcJL9shFYcjLs3sX - R/TvnnKHvw/ud7XBgvLGwGAf/cDEuLI2tv+V7tkMGrMUv+gUJNZaJaCpdt+1iUwO - QFq8APyBNn6FFw54TwXWfSjfSNh3geIMLHuErYVu9MIXvB7Yhh+ZvLcfLbmckhAX - wb39RRHnCWvnw5Bm9hnsDhqfDsIoP+2wvUkViyHOmrKi8nSJhSk19C8AuQtSVcJg - 5op+epEmjt70GHt52nuBAoIBAQD2a4Ftp4QxWE2d6oAFI6WPrX7nAwI5/ezCbO/h - yoYAn6ucTVnn5/5ITJ8V4WTWZ4lkoZP3YSJiCyBhs8fN63J+RaJ/bFRblHDns1HA - 2nlMVdNLg6uOfjgUJ8Y6xVM0J2dcFtwIFyK5pfZ7loxMZfvuovg74vDOi2vnO3dO - 16DP3zUx6B/yIt57CYn8NWTq+MO2bzKUnczUQRx0yEzPOfOmVbcqGP8f7WEdDWXm - 7scjjN53OPyKzLOVEhOMsUhIMBMO25I9ZpcVkyj3/nj+fFLf/XjOTM00M/S/KnOj - RwaWffx6mSYS66qNc5JSsojhIiYyiGVEWIznBpNWDU35y/uXAoIBAQDKLj0dyig2 - kj1r3HvdgK4sRULqBQFMqE9ylxDmpJxAj6/A8hJ0RCBR57vnIIZMzK4+6K0l3VBJ - ukzXJHJLPkZ0Uuo2zLuRLkyjBECH6KYznyTkUVRn50Oq6IoP6WTCfd3Eg+7AKYY1 - VFo2iR8sxeSQQ+AylFy6QcQ1xPIW30Jj1/LFjrRdRggapPEekpJec0pEqhasT8rR - UFhRL2NdZnL5b7ZlsJc7gZKEJgNfxgzaCzloqLcjCgGpOhLKx0fFsNOqHcbIGMwG - 6wQCOyNghQJ6AZtRD5TYCJow92FchWjoTIaMJ8RjMKQmxpiwM6wQG4J78Hd3mbhf - q0hiQhPHaNbBAoIBAFeIeMFq8BpXM7sUwcURlI4lIx8Mgo33FVM7PzsFpfQyw9MR - 5w3p6vnjvd8X4aoHvVZxzw3hA0WwjiAmrKMJL/KK6d45rP2bDUBBAplvAgeLtTLt - 4tMLIwCF4HSgA55TIPQlaqO1FDC+M4BTSiMZVxS970/WnZPBEuNgzFDFZ+pvb4X6 - 3t40ZLNwAAQHM4IEPAFiHqWMKGZ9eo5BWIeEHnjHmfjqSDYfLJAVYk1WJIcMUzom - lA76CBC8CxW/I94AtcRhWuFUv/Z5/+OYEYLUxtuqPm+J+JrCmf4OJmWppT1wI2+p - V00BSeRVWXTm1piieM8ahF5y1hp6y3uV3k0NmKECggEBAMC42Ms3s6NpPSE+99eJ - 3P0YPJOkl7uByNGbTKH+kW89SDRsy8iGVCSe9892gm5cwU/4LWyljO3qp2qBNG2i - /DfP/bCk8bqPXsAZwoWK8DrO3bTCDepJWYhlx40pVkHLBwVXGdOVAXh+YswPY2cj - cB9QhDrSj52AKU9z36yLvtY7uBA3Wph6tCjpx2n0H4/m6AmR9LDmEpf5tWYV/OrA - SKKaqUw/y7kOZyKOtbKqr/98qYmpIYFF/ZVZZSZkVXcNeoZzgdOlR37ksVqLEsrj - nxu7wli/uItBj/FTLjyqcvjUUYDyO1KtwBuyPUPgzYhBIN2Rt9+K6WRQelwnToFL - 30ECggEBALzozykZj2sr3z8tQQRZuXLGotUFGsQCB8ikeqoeB8FbNNkC+qgflQGv - zLRB2KWOvnboc94wVgBJH43xG0HBibZnBhUO8/HBI/WlmyEj9KQ/ZskUK4GVZkB6 - r/81ASLwH+P/rqrLEjcp1SIPPevjzCWD9VYR5m/qPHLNxStwGSrPjtPzgaFxhq84 - Jl+YVmNqVlrOKYYfIPh8exPLiTti3wfM61pVYFv56PI2gd5ysMWYnuN+vK0sbmZh - cIWwykcKlODIngI7IzYqt8NuIJI0jrYyHgtUw4jaJzdF4mEOplGONxdz15jAGHtg - JUsBXFNz132nP4iIr3UKrPedQZijSi4= + MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDd1G7OFpXIoHnr + rxdw+hiJVDY6nQDDKFt9FBKwlv7x2hCvX7bnyvHaL7H61c+80McGPISrQn3+MjuR + Zuqwax49DddNXbGt4WqGlx4LAeI37OgNUUz9foNr2rDDV744vwp14/PD1f3nqpWf + Ogzzsh8rxac0mZ5Se9HxOIpI7NRNuHJjj7HWZ4YxeOvi289rmpu0JPcp25njw7h6 + FNfHu8GGp34Uj6wAxubdRyfViV8z9FMfbglLuA9i1OiSy3NQpq8VwBG+u/0iC7PQ + sQjxSragQu25sfATYIrFJQ4ZCvh0nxqKMeyPPBi6dAcMpa2AZAqtqv+CwWdo36Bt + S5XiC7rApgYn+yteKQHSbnCiG2W/boSbfg9lRk3w41dESENCADVajLb3Eovvp0tB + O/BALudvWjzAPbpXleVNr6ngWtGlsZTC7LXDgBqdW2KlzpZGcz+PW3ATlwip/ZFR + t7A15u5dVkWPVoPuQ0w1Tw+g9dxWFTNk3h+2d7K87IxQbcvqxeIDSEVFMrxo0e4C + G2udMcelZwARl6iNTAETa2zJW0XtAdGVM+HY1S/kU6U9J3nubDttAkAMABjPwyjL + G7hfyWqUHf9yPs49GsftAVvIy8XIeu0shD1BG11/VzvwpUCiRc+btuWi2erZ4ZfP + oQ5YoS9gt4S+Ipz7TPGBl+AUk9HO2QIDAQABAoICAGW+aLAXxc2GZUVHQp4r55Md + T94kYtQgL4435bafGwH8vchiQzcfazxiweRFqwl0TMS8fzE5xyYPDilLpfsStoTU + U1sFzVfuWviuWTY9P+/ctjZdgs2F+GtAm/CMzw+h9/9IdWbuQI3APO4SJxyjJw7h + kiZbCzXT2uAjybFXBq07GyQ1JSEszGzmhHLB1OoKuL2wcrj9IyFHhNZhtvLCWCoV + qotttjuI/xyg5VFYt5TRzEpPIu5a1pvDAYVK0XI9cXKtbLYp7RlveqMOgAaD+S2a + ZQTV60JH9n4j18p+sKR00SxvZ4vuyXzDePRBDUolGIy9MIJdiLueTiuzDmTmclnM + 8Yy7oliawW2Bn+1gaWpqmgzEUw9bXRSqIp2zGZ7HaQ+5c/MhS002+/i8WQyssfeg + 9EfI+Vl0D2avTxCECmsfjUxtkhzMYPVNbRPjt0QBEM+s8lDoNsP2zhMO441+TKpe + /5KZHIW+Y0US6GMIUs1o1byKfNz8Nj5HjEKO9CMyK6SBMJnCMroPD4H6opqk3lw9 + 4mk04BdN556EzyJDT0a5/VpXG2DUYwFaNwE1ZPMu3Yx6IBoM1xx8mR80vHQCddmF + NP+BzkpUiHf0Txyy0YQWECZ/anTt0Bo0XqY5tirIM2dkG0ngNl9tGlw6gVAY1ky8 + +cr7qKmhhwMWojaX/L+9AoIBAQD/BZAeF3l9I5RBh6ktWA+opzVyd6ejdLpc2Q1z + fmSmtUKRsEe51sWaIf6Sez408UaCMT2IQuppPgMnV8xfMM1/og75Cs8aPyAohwKo + IbOenXhLfFZiYB4y/Pac3F+FzNKsTT6n+fsE+82UHafY5ZI2FlPb2L0lfyx09zXv + fBYhcXgwSx5ymJLJSl8zFaEGn9qi3UB5ss44SaNM0n8SFGUQUk3PR7SFWSWgNxtl + CP7LWTsjXYoC/qBMe7b8JieK5aFk1EkkG1EkJvdiMnulMcMJzl+kj6LqVPmVDoZS + mMGvgKGJPpFgrbJ5wlA7uOhucGmMpFWP9RCav66DY4GHrLJPAoIBAQDerkZQ03AN + i2iJVjtL97TvDjrE8vtNFS/Auh8JyDIW4GGK3Y/ZoMedQpuu3e6NYM9aMjh+QJoA + kqhaiZ/tMXjEXJByglpc3a43g2ceWtJg5yLgexGgRtegbA57PRCo35Vhc6WycD1l + 6FZNxpTkd2BXX/69KWZ6PpSiLYPvdzxP5ZkYqoWRQIa4ee4orHfz/lUXJm1XwmyG + mx3hN9Z9m8Q/PGMGfwrorcp4DK53lmmhTZyPh+X5T5/KkVmrw/v5HEEB3JsknStR + 3DAqp2XZcRHsGQef9R7H+PINJm9nebjCraataaE4gr76znXKT23P80Ce5Lw6OQUW + XHhoL16gS+pXAoIBADTuz6ofTz01PFmZsfjSdXWZN1PKGEaqPOB2wP7+9h9QMkAR + KeId/Sfv9GotII1Woz70v4Pf983ebEMnSyla9NyQI7F3l+MnxSIEW/3P+PtsTgLF + DR0gPERzEzEd4Mnh6LyQz/eHwJ2ZMmOTADrZ8848Ni3EwAXfbrfcdBqAVAufBMZp + YSmCF72mLTpqO+EnHvd9GxvnjDxMtJOGgY+cIhoQK0xh4stm5JNrvMjs5A4LOGYv + zSyv80/Mwf92X/DJlwVZttDCxsXNPL3qIpX4TTZk2p9KnRMsjh1tRV4xjMpD1cOp + 8/zwMMJrHcI3sC70MERb+9KEmGy2ap+k8MbbhqsCggEAUAqqocDupR+4Kq2BUPQv + 6EHgJA0HAZUc/hSotXZtcsWiqiyr2Vkuhzt7BGcnqU/kGJK2tcL42D3fH/QaNUM0 + Grj+/voWCw1v4uprtYCF4GkUo0X5dvgf570Pk4LGqzz6z/Wm2LX5i9jwtLItsNWs + HpwVz97CxCwcdxMPOpNMbZek6TXaHvTnuAWz8pDT6TNBWLnqUcJECjpVii/s/Gdy + KhzFp38g57QYdABy8e9x9pYUMY9yvaO+VyzZ46DlwIxEXavzZDzOZnVUJvDW7krz + Wz8/+2I7dzvnnYx0POiG3gtXPzwZxFtS1IpD0r2sRjQ0xSiI9BCs4HXKngBw7gN7 + rwKCAQEAloJOFw4bafVXZVXuQVnLDm0/MNTfqxUzFE6V2WkMVkJqcpKt+ndApM8P + MJvojHWw1fmxDzIAwqZ9rXgnwWKydjSZBDYNjhGFUACVywHe5AjC4PPMUdltGptU + lY0BjC7qtwkVugr65goQkEzU61y9JgTqKpYsr3D+qXcoiDvWRuqk5Q0WfYJrUlE0 + APWaqbxmkqUVDRrXXrifiluupk+BCV7cFSnnknSYbd9FZd9DuKaoNBlkp2J9LZE+ + Ux74Cfro8SHINHmvqL+YLFUPVDWNeuXh5Kl6AaJ7yclCLXLxAIix3/rIf6mJeIGc + s9o9Sr49cibZ3CbMjCSNE3AOeVE1/Q== -----END PRIVATE KEY----- ''; ca.cert = builtins.toFile "ca.cert" '' -----BEGIN CERTIFICATE----- - MIIFDzCCAvegAwIBAgIUTRDYSWJvmlhwIR3pzVrIQfnboLEwDQYJKoZIhvcNAQEL - BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwMzIyMjI1NjE3WhgPMjEy - MDAyMjcyMjU2MTdaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG - 9w0BAQEFAAOCAg8AMIICCgKCAgEAwp1WRhJ+vHs15Q1hOYI7Aj6rrUeJ8cP8LyGw - MQdlZNlnkOhxr7diXa8+anq9iF3e+mLaUHqnfn33rWi7THhU6/l8vcqhKcdgH75h - BHC57olm7FBmc7B8Fu/+JD4ABQcvU8CZ/5PPdpUerkGGtEEt/Ql/OZCzGfy2V1Mg - pSAWviMU9TqL5hqjDq+JxgEkUD+nf558p+NSp2rf3bacmmuc4H2MAOmFulMXMsLw - UqTDlzNP/NgRWRsgC7d50Pn35q7SnLzI7DSwRWrJVfs2DtTzGy20wlvEpiU44c7m - qV7QR67r6HtuNd911pb3D9cpWk8dGpcIkFia9VxDlFixBU4Dk3kcolQ8Q7p6c/u6 - BnMM3HThvJwoHesNGmGhAs9c70txWE0M/jIqphJMerOG49VPdCNJMFCW3lo46xju - 2PUKuItfRmnw4O3ADJ/XhwojWzaz4+rf4H2lWwq25Jt2VY5Ly00Npm9pb+/rVYou - Odtu4jT7jUupcdhVZa/w14kazlX4IT76DsVH186ICYWS1eGZIvsnGxkGucPGDA2A - r+HNPHSgOwGrVYTUutHNc4EDY7lhdwb6HEskshlKJ1U+odQ2JSfWAKoKjaXnYDUf - ZKadN+EjIQe3Y/ZXgei0TAPnNXxv0/tZQ25APr6KXqbePt9KA3Ak2HxIn5dR8Kjc - P21w5tcCAwEAAaNTMFEwHQYDVR0OBBYEFCIoeYSYjtMiPrmxfHmcrsZkyTpvMB8G - A1UdIwQYMBaAFCIoeYSYjtMiPrmxfHmcrsZkyTpvMA8GA1UdEwEB/wQFMAMBAf8w - DQYJKoZIhvcNAQELBQADggIBAHPdwOgAxyhIhbqFObNftW8K3sptorB/Fj6jwYCm - mHleFueqQnjTHMWsflOjREvQp1M307FWooGj+KQkjwvAyDc/Hmy7WgJxBg9p3vc+ - /Xf/e7ZfBl8rv7vH8VXW/BC1vVsILdFncrgTrP8/4psV50/cl1F4+nPBiekvvxwZ - k+R7SgeSvcWT7YlOG8tm1M3al4F4mWzSRkYjkrXmwRCKAiya9xcGSt0Bob+LoM/O - mpDGV/PMC1WAoDc1mMuXN2hSc0n68xMcuFs+dj/nQYn8uL5pzOxpX9560ynKyLDv - yOzQlM2VuZ7H2hSIeYOFgrtHJJwhDtzjmUNDQpQdp9Fx+LONQTS1VLCTXND2i/3F - 10X6PkdnLEn09RiPt5qy20pQkICxoEydmlwpFs32musYfJPdBPkZqZWrwINBv2Wb - HfOmEB4xUvXufZ5Ju5icgggBkyNA3PCLo0GZFRrMtvA7i9IXOcXNR+njhKa9246V - QQfeWiz05RmIvgShJYVsnZWtael8ni366d+UXypBYncohimyNlAD1n+Bh3z0PvBB - +FK4JgOSeouM4SuBHdwmlZ/H0mvfUG81Y8Jbrw0yuRHtuCtX5HpN5GKpZPHDE7aQ - fEShVB/GElC3n3DvgK9OJBeVVhYQgUEfJi4rsSxt3cdEI0NrdckUoZbApWVJ3CBc - F8Y7 + MIIFDzCCAvegAwIBAgIUX0P6NfX4gRUpFz+TNV/f26GHokgwDQYJKoZIhvcNAQEL + BQAwFjEUMBIGA1UEAwwLU25ha2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEyWhgPMjEy + MDA3MzEwNzQyMTJaMBYxFDASBgNVBAMMC1NuYWtlb2lsIENBMIICIjANBgkqhkiG + 9w0BAQEFAAOCAg8AMIICCgKCAgEA3dRuzhaVyKB5668XcPoYiVQ2Op0AwyhbfRQS + sJb+8doQr1+258rx2i+x+tXPvNDHBjyEq0J9/jI7kWbqsGsePQ3XTV2xreFqhpce + CwHiN+zoDVFM/X6Da9qww1e+OL8KdePzw9X956qVnzoM87IfK8WnNJmeUnvR8TiK + SOzUTbhyY4+x1meGMXjr4tvPa5qbtCT3KduZ48O4ehTXx7vBhqd+FI+sAMbm3Ucn + 1YlfM/RTH24JS7gPYtTokstzUKavFcARvrv9Iguz0LEI8Uq2oELtubHwE2CKxSUO + GQr4dJ8aijHsjzwYunQHDKWtgGQKrar/gsFnaN+gbUuV4gu6wKYGJ/srXikB0m5w + ohtlv26Em34PZUZN8ONXREhDQgA1Woy29xKL76dLQTvwQC7nb1o8wD26V5XlTa+p + 4FrRpbGUwuy1w4AanVtipc6WRnM/j1twE5cIqf2RUbewNebuXVZFj1aD7kNMNU8P + oPXcVhUzZN4ftneyvOyMUG3L6sXiA0hFRTK8aNHuAhtrnTHHpWcAEZeojUwBE2ts + yVtF7QHRlTPh2NUv5FOlPSd57mw7bQJADAAYz8Moyxu4X8lqlB3/cj7OPRrH7QFb + yMvFyHrtLIQ9QRtdf1c78KVAokXPm7blotnq2eGXz6EOWKEvYLeEviKc+0zxgZfg + FJPRztkCAwEAAaNTMFEwHQYDVR0OBBYEFNhBZxryvykCjfPO85xB3wof2enAMB8G + A1UdIwQYMBaAFNhBZxryvykCjfPO85xB3wof2enAMA8GA1UdEwEB/wQFMAMBAf8w + DQYJKoZIhvcNAQELBQADggIBAEZwlsQ+3yd1MVxLRy9RjoA8hI7iWBNmvPUyNjlb + l/L9N+dZgdx9G5h/KPRUyzvUc/uk/ZxTWVPIOp13WI65qwsBKrwvYKiXiwzjt+9V + CKDRc1sOghTSXk4FD3L5UcKvTQ2lRcFsqxbkopEwQWhoCuhe4vFyt3Nx8ZGLCBUD + 3I5zMHtO8FtpZWKJPw46Yc1kasv0nlfly/vUbnErYfgjWX1hgWUcRgYdKwO4sOZ7 + KbNma0WUsX5mWhXo4Kk7D15wATHO+j9s+j8m86duBL3A4HzpTo1DhHvBi0dkg0CO + XuSdByIzVLIPh3yhCHN1loRCP2rbzKM8IQeU/X5Q4UJeC/x9ew8Kk+RKXoHc8Y2C + JQO1DxuidyDJRhbb98wZo2YfIsdWQGjYZBe1XQRwBD28JnB+Rb9shml6lORWQn9y + P/STo9uWm5zvOCfqwbnCoetljDweItINx622G9SafBwPZc3o79oL7QSl8DgCtN6g + p0wGIlIBx+25w/96PqZcrYb8B7/uBHJviiKjBXDoIJWNiNRhW5HaFjeJdSKq7KIL + I/PO9KuHafif36ksG69X02Rio2/cTjgjEW1hGHcDRyyJWWaj7bd2eWuouh6FF22b + PA6FGY4vewDPnbLKLaix2ZIKxtedUDOH/qru3Mv58IFXmQ4iyM8oC8aOxYSQLZDn + 1yJD -----END CERTIFICATE----- ''; "acme.test".key = builtins.toFile "acme.test.key" '' -----BEGIN RSA PRIVATE KEY----- - MIIJKAIBAAKCAgEAlgQTZjKfs3aHw0J993k7jFAs+hVRPf//zHMAiUkPKUYPTSl1 - TxS/bPbhWzSoom00j4SLhGGGhbd+lnvTg0uvKbxskgATfw5clbm1ZN+gx4DuxwjL - V3xIxpeSY+PKzs5z8w/k+AJh+zOPyXwH3ut3C+ogp1S/5IhmzV3a/yU/6k0zpGxj - N6ZPRTXFrz93I1pPeCkJz90l7tj+2uFc9xtM20NQX52f0Y2oShcG8fKdNZVzuHHk - ZXkrZIhou55/nRy2jKgFeD3GQQfa9rwPWrVybQ6tKMMkoazB/Unky9xcTI2LJarf - xgHDO9v9yFBvmR4UM8B3kM82NHoENtHaZ2mmiMGZzTEQlf8xwYyHFrqBFIVRWEUr - 7rr/O5Qr9gIN0T4u367HCexVYAKzbO2P9h75czzjMMoGkbXze9SMQ/ikrxEmwAHg - r1Xxh6iQYmgPNk8AR3d9+o2I7WJZMUYZARLnuhVr9BNXv510iqZTqX8lcyL5fEj3 - ST4Ab+H7rfevZt6NU26iJLBYAjrA2mSvH+wvkboxrgSS8xYPkOW8NLNEbbodzofI - pB+SaK53OIk0bj9c1YAgrSNER/TDTgDXrWUNrlfVZ/M7+AEdeU06wi7sVhVif6OB - D3OpgKSNjeE6TuJH80Pi5MWugSFBr792Xb6uhVoPiVOFN+qiGB6UkwBgSKkCAwEA - AQKCAgAmN7OZfZwh5DiCDhZ5TXFWNba/n16rJOTN+R5R20L5iNetGLrCAs8hu2N+ - ENRFTPzu8x14BEB5IF4niDRCZq2hPFeMemh9HfOIUV9c63vSV459NkhXaVpA/axV - tlqchQwVCB+U70Z28JPZCLgYmnQhnOvktTqNxhIqj5aTGbJGxpQ5d0Nvkfbv8tsB - 4nE/mGpWel39jqFzT+Tdbjx414Ok+GkpcsacZDJTbbpfOSfD1uc8PgepskzTt8y2 - v5JTPFVlUAjUsSgouQ+XfCGNQlx8XBjRIaXbal+hX4niRald91FTr0yC7UAHp+vn - dFZ586fB526OfbuZctxP+vZhEhFSseQKxHQ0tB8me81xH44daVNr9PPUM69FDT3j - ygJaUJjNEG3vVzePCDzhmxTmz2/rAClp77WTWziBWDoA6YWDDzhgNPrXWzLIbZIx - ue9ZbGEOh/u5ZzrEXxKCz9FjDe9wQu3TeYUe0M+ejzwWgn7zdWDvjjmtLUUuun2Y - wW7WANpu32qvB/V+qssw4O63tbRiwneRCnb8AF2ixgyWr6xyZwch4kacv1KMiixf - gO/5GTj7ba5GcdGoktJb29cUEgz13yPd106RsHK4vcggFxfMbOVauNRIo6ddLwyS - 8UMxLf2i2cToOLkHZrIb8FgimmzRoBd3yYzwVJBydiVcsrHQAQKCAQEAxlzFYCiQ - hjEtblGnrkOC7Hx6HvqMelViOkGN8Y9VczG4GhwntmSE2nbpaAKhFBGdLfuSI3tJ - Lf24f0IGgAhzPmpo2TjbxPO3YSKFTH71fznVBhtQ1iSxwZ1InXktnuhot6VSDx6A - sbHSy1hMFy3nj+Zj5+fQ89tclzBzG9bCShaauO39KrPMwKi6CYoYdGhXBC3+OpHY - zBNvmDTxG2kW8L42rlf14EH4pAlgKs4eeZbpcbZ6fXURP2hToHJ8swyKw/1p12WA - cc19BKFJXL8nNP4uCf/fI0mVYpytz5KwUzG+z+umDqk+RRCH4mNB28xvEEuEyp/e - /C5Is+WrlDAA6QKCAQEAwZsK4AJ/w4Xf4Q/SsnZJO9bfP1ejJjzKElt8rG28JXeb - +FjykZZ6vw2gt2Boest2n9N4fBwaRkaHVtVS4iAmaDXozTlcvCLs2rVjPSguuQtW - 80CKg6+dux+6gFN8IGzDCiX3pWUnhhiXvCcRYEcvgpH6GA5vuCNrXrjH0JFC0kef - aaDMGMTbzhc2IIRztmWU4v8YJSSy5KOkIQLWO+7u9aGx9IqT5/z3gx3XrItyl0Bk - aQmZEh7JOSyhmGhhf5LdeTLu2YgRw3/tzS+lPMX3+UPw99k9MdTOFn2pww5AdRmg - aBIzV+/LBYG0pPRl0D8/6yzGVBPuUDQpmK9Z3gsxwQKCAQEAnNkMZN2Ocd1+6+V7 - LmtJog9HTSmWXMEZG7FsOJ661Yxx44txx2IyPsCaDNlPXxwSaiKrSo0Yr1oZQd8G - XsTPw4HGiETSWijQTulJ99PH8SLck6iTwdBgEhV5LrN75FQnQVdizHu1DUzrvkiC - Wi29FWb6howiCEDjNNVln5SwKn83NpVQgyyK8ag4+oQMlDdQ3wgzJ0Ld53hS3Eq4 - f5EYR6JQgIki7YGcxrB3L0GujTxMONMuhfdEfRvUTGFawwVe0FyYDW7AIrx2Z2vV - I5YuvVNjOhrt6OwtSD1VnnWCITaLh8LwmlUu3NOWbudHUzKSe5MLXGEPo95BNKad - hl5yyQKCAQBNo0gMJtRnawMpdLfwewDJL1SdSR6S0ePS0r8/Qk4l1D5GrByyB183 - yFY/0zhyra7nTt1NH9PlhJj3WFqBdZURSzUNP0iR5YuH9R9Twg5ihEqdB6/EOSOO - i521okTvl83q/ui9ecAMxUXr3NrZ+hHyUWmyRe/FLub6uCzg1a+vNauWpzXRZPgk - QCijh5oDdd7r3JIpKvtWNs01s7aHmDxZYjtDrmK7sDTtboUzm0QbpWXevUuV+aSF - +gDfZlRa3WFVHfisYSWGeYG6O7YOlfDoE7fJHGOu3QC8Ai6Wmtt8Wgd6VHokdHO8 - xJPVZnCBvyt5up3Zz5hMr25S3VazdVfBAoIBAHVteqTGqWpKFxekGwR0RqE30wmN - iIEwFhgOZ8sQ+6ViZJZUR4Nn2fchn2jVwF8V8J1GrJbTknqzAwdXtO3FbgfmmyF2 - 9VbS/GgomXhA9vJkM4KK3Iwo/y/nE9hRhtzuVE0QPudz2fyfaDgnWjcNM59064tH - 88361LVJm3ixyWSBD41UZ7NgWWJX1y2f073vErsfcPpavF5lhn1oSkQnOlgMJsnl - 24qeuzAgTWu/2rFpIA2EK30Bgvsl3pjJxHwyNDAgklV7C783LIoAHi7VO7tzZ6iF - dmD5XLfcUZc3eaB7XehNQKBXDGLJeI5AFmjsHka5GUoitkU2PFrg/3+nJmg= + MIIJKgIBAAKCAgEA3dJl4ByHHRcqbZzblszHIS5eEW3TcXTvllqC1nedGLGU9dnA + YbdpDUYhvWz/y9AfRZ1d8jYz01jZtt5xWYG0QoQUdkCc9QPPh0Axrl38cGliB6IZ + IY0qftW9zrLSgCOUnXL/45JqSpD57DHMSSiJl3hoOo4keBaMRN/UK6F3DxD/nZEs + h+yBBh2js3qxleExqkX8InmjK9pG8j7qa4Be5Lh4iILBHbGAMaxM7ViNAg4KgWyg + d5+4qB86JFtE/cJ+r3D62ARjVaxU6ePOL0AwS/vx5ls6DFQC7+1CpGCNemgLPzcc + 70s0V0SAnF73xHYqRWjJFtumyvyTkiQWLg0zDQOugWd3B9ADuaIEx2nviPyphAtj + M3ZKrL2zN1aIfqzbxJ/L8TQFa2WPsPU2+iza/m9kMfLXZ4XPF/SJxQ+5yVH+rxx5 + OWrXZ13nCMyeVoaXQofmG7oZvOQbtuT9r5DQZd9WN0P3G3sy0/dNnlNVn8uCBvXJ + TQhRKsy1FESZdgcFNtpJEG7BRG9Gc6i0V39aSRzShZyKJSBQhlc0FMTlX445EYsh + PKjEC/+Suq9wy/LuLjIkkqBbVg4617IlibLz0fDY/yrZqkfSqhCVsWnra21Ty3Mp + vD+wnskTzuGrvCVTe3KcWp+wkeH0xvhr8FXX6nn492YCfvZSITO3FF+qWt8CAwEA + AQKCAgEAk2xV0NCk66yNwjPRrTOD1IWgdyzqrijtYpvdAPSWL+c1/P8vYMIoy22k + 1uQuTSKQ5g9kdKmZYAlZCLRl2Pre9qYZg04GAsD5mAYN/rjwITWotTICSc4sRAeC + EnG+fPMovkvDzVdt1QjtURD3mFeculKH0wLNMhKqPswTkrvJCPZfLDVjxyJjzdC9 + D3enttjnzSaeH7t/upFjPXSbD79NUe1YDkH4XuetL1Y3+jYz4P279bBgJaC9dN7s + IWWXQJ+W2rrXu+GOs03JUXjZe4XJk3ZqmpJezfq3yQWCmQSigovLjcPvMwpkSut4 + HnTvbl6qUV8G5m4tOBMNcL8TDqAvIGY8Q2NAT0iKJN187FbHpjSwQL/Ckgqz/taJ + Q82LfIA1+IjwW372gY2Wge8tM/s3+2vOEn2k91sYfiKtrRFfrHBurehVQSpJb2gL + YPoUhUGu4C1nx44sQw+DgugOBp1BTKA1ZOBIk6NyS/J9sU3jSgMr88n10TyepP6w + OVk9kcNomnm/QIOyTDW4m76uoaxslg7kwOJ4j6wycddS8JtvEO4ZPk/fHZCbvlMv + /dAKsC3gigO2zW6IYYb7mSXI07Ew/rFH1NfSILiGw8GofJHDq3plGHZo9ycB6JC+ + 9C8n9IWjn8ahwbulCoQQhdHwXvf61t+RzNFuFiyAT0PF2FtD/eECggEBAPYBNSEY + DSQc/Wh+UlnwQsevxfzatohgQgQJRU1ZpbHQrl2uxk1ISEwrfqZwFmFotdjjzSYe + e1WQ0uFYtdm1V/QeQK+8W0u7E7/fof4dR6XxrzJ2QmtWEmCnLOBUKCfPc7/4p4IU + 7Q8PDwuwvXgaASZDaEsyTxL9bBrNMLFx9hIScQ9CaygpKvufilCHG79maoKArLwX + s7G16qlT4YeEdiNuLGv0Ce0txJuFYp7cGClWQhruw+jIbr+Sn9pL9cn8GboCiUAq + VgZKsofhEkKIEbP1uFypX2JnyRSE/h0qDDcH1sEXjR9zYYpQjVpk3Jiipgw4PXis + 79uat5/QzUqVc1sCggEBAObVp686K9NpxYNoEliMijIdzFnK5J/TvoX9BBMz0dXc + CgQW40tBcroU5nRl3oCjT1Agn8mxWLXH3czx6cPlSA8fnMTJmev8FaLnEcM15pGI + 8/VCBbTegdezJ8vPRS/T9c4CViXo7d0qDMkjNyn22ojPPFYh8M1KVNhibDTEpXMQ + vJxBJgvHePj+5pMOIKwAvQicqD07fNp6jVPmB/GnprBkjcCQZtshNJzWrW3jk7Fr + xWpQJ8nam8wHdMvfKhpzvD6azahwmfKKaQmh/RwmH4xdtIKdh4j+u+Ax+Bxi0g7V + GQfusIFB1MO48yS6E56WZMmsPy+jhTcIB4prIbfu4c0CggEBALgqqUKwRc4+Ybvj + rfUk+GmT/s3QUwx/u4xYAGjq7y/SgWcjG9PphC559WPWz/p2sITB7ehWs5CYTjdj + +SgWKdVY/KZThamJUTy4yAZ8lxH1gGpvvEOs+S8gmGkMt88t8ILMPWMWFW7LoEDp + PL74ANpLZn29GROnY1IhQQ3mughHhBqfZ6d2QnaDtsGYlD5TBvPSLv7VY7Jr9VR0 + toeEtAjMRzc+SFwmgmTHk9BIB1KTAAQ3sbTIsJh8xW1gpo5jTEND+Mpvp10oeMVe + yxPB2Db4gt/j8MOz3QaelbrxqplcJfsCjaT49RHeQiRlE/y070iApgx8s0idaFCd + ucLXZbcCggEBANkcsdg9RYVWoeCj3UWOAll6736xN/IgDb4mqVOKVN3qVT1dbbGV + wFvHVq66NdoWQH4kAUaKWN65OyQNkQqgt/MJj8EDwZNVCeCrp2hNZS0TfCn9TDK/ + aa7AojivHesLWNHIHtEPUdLIPzhbuAHvXcJ58M0upTfhpwXTJOVI5Dji0BPDrw47 + Msw3rBU6n35IP4Q/HHpjXl58EDuOS4B+aGjWWwF4kFWg2MR/oqWN/JdOv2LsO1A/ + HnR7ut4aa5ZvrunPXooERrf6eSsHQnLcZKX4aNTFZ/pxZbJMLYo9ZEdxJVbxqPAa + RA1HAuJTZiquV+Pb755WFfEZy0Xk19URiS0CggEAPT1e+9sdNC15z79SxvJQ4pmT + xiXat+1pq9pxp5HEOre2sSAd7CF5lu/1VQd6p0gtLZY+Aw4BXOyMtzYWgIap+u9j + ThFl9qrTFppG5KlFKKpQ8dQQ8ofO1akS8cK8nQeSdvrqEC/kGT2rmVdeevhBlfGy + BZi2ikhEQrz5jsLgIdT7sN2aLFYtmzLU9THTvlfm4ckQ7jOTxvVahb+WRe/iMCwP + Exrb83JDo31jHvAoYqUFrZkmPA+DUWFlrqb21pCzmC/0iQSuDcayRRjZkY/s5iAh + gtI6YyAsSL8hKvFVCC+VJf1QvFOpgUfsZjrIZuSc3puBWtN2dirHf7EfyxgEOg== -----END RSA PRIVATE KEY----- ''; "acme.test".cert = builtins.toFile "acme.test.cert" '' -----BEGIN CERTIFICATE----- - MIIEoTCCAokCAgKaMA0GCSqGSIb3DQEBCwUAMBYxFDASBgNVBAMMC1NuYWtlb2ls - IENBMCAXDTIwMDMyMjIyNTYxOFoYDzIxMjAwMjI3MjI1NjE4WjAUMRIwEAYDVQQD - DAlhY21lLnRlc3QwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCWBBNm - Mp+zdofDQn33eTuMUCz6FVE9///McwCJSQ8pRg9NKXVPFL9s9uFbNKiibTSPhIuE - YYaFt36We9ODS68pvGySABN/DlyVubVk36DHgO7HCMtXfEjGl5Jj48rOznPzD+T4 - AmH7M4/JfAfe63cL6iCnVL/kiGbNXdr/JT/qTTOkbGM3pk9FNcWvP3cjWk94KQnP - 3SXu2P7a4Vz3G0zbQ1BfnZ/RjahKFwbx8p01lXO4ceRleStkiGi7nn+dHLaMqAV4 - PcZBB9r2vA9atXJtDq0owyShrMH9SeTL3FxMjYslqt/GAcM72/3IUG+ZHhQzwHeQ - zzY0egQ20dpnaaaIwZnNMRCV/zHBjIcWuoEUhVFYRSvuuv87lCv2Ag3RPi7frscJ - 7FVgArNs7Y/2HvlzPOMwygaRtfN71IxD+KSvESbAAeCvVfGHqJBiaA82TwBHd336 - jYjtYlkxRhkBEue6FWv0E1e/nXSKplOpfyVzIvl8SPdJPgBv4fut969m3o1TbqIk - sFgCOsDaZK8f7C+RujGuBJLzFg+Q5bw0s0Rtuh3Oh8ikH5Jornc4iTRuP1zVgCCt - I0RH9MNOANetZQ2uV9Vn8zv4AR15TTrCLuxWFWJ/o4EPc6mApI2N4TpO4kfzQ+Lk - xa6BIUGvv3Zdvq6FWg+JU4U36qIYHpSTAGBIqQIDAQABMA0GCSqGSIb3DQEBCwUA - A4ICAQBCDs0V4z00Ze6Ask3qDOLAPo4k85QCfItlRZmwl2XbPZq7kbe13MqF2wxx - yiLalm6veK+ehU9MYN104hJZnuce5iEcZurk+8A+Pwn1Ifz+oWKVbUtUP3uV8Sm3 - chktJ2H1bebXtNJE5TwvdHiUkXU9ywQt2FkxiTSl6+eac7JKEQ8lVN/o6uYxF5ds - +oIZplb7bv2XxsRCzq55F2tJX7fIzqXrSa+lQTnfLGmDVMAQX4TRB/lx0Gqd1a9y - qGfFnZ7xVyW97f6PiL8MoxPfd2I2JzrzGyP/igNbFOW0ho1OwfxVmvZeS7fQSc5e - +qu+nwnFfl0S4cHRif3G3zmz8Ryx9LM5TYkH41qePIHxoEO2sV0DgWJvbSjysV2S - EU2a31dJ0aZ+z6YtZVpHlujKMVzxVTrqj74trS4LvU5h/9hv7e1gjYdox1TO0HMK - mtDfgBevB21Tvxpz67Ijf31HvfTmCerKJEOjGnbYmyYpMeMNSONRDcToWk8sUwvi - OWa5jlUFRAxgXNM09vCTPi9aRUhcFqACqfAd6I1NqGVlfplLWrc7SWaSa+PsLfBf - 4EOZfk8iEKBVeYXNjg+CcD8j8yk/oEs816/jpihIk8haCDRWYWGKyyGnwn6OQb8d - MdRO2b7Oi/AAmEF3jMlICqv286GIYK5qTKk2/CKHlOLPnsWEuA== + MIIEwDCCAqigAwIBAgICApowDQYJKoZIhvcNAQELBQAwFjEUMBIGA1UEAwwLU25h + a2VvaWwgQ0EwIBcNMjAwODI0MDc0MjEzWhgPMjEyMDA3MzEwNzQyMTNaMBQxEjAQ + BgNVBAMMCWFjbWUudGVzdDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB + AN3SZeAchx0XKm2c25bMxyEuXhFt03F075ZagtZ3nRixlPXZwGG3aQ1GIb1s/8vQ + H0WdXfI2M9NY2bbecVmBtEKEFHZAnPUDz4dAMa5d/HBpYgeiGSGNKn7Vvc6y0oAj + lJ1y/+OSakqQ+ewxzEkoiZd4aDqOJHgWjETf1Cuhdw8Q/52RLIfsgQYdo7N6sZXh + MapF/CJ5oyvaRvI+6muAXuS4eIiCwR2xgDGsTO1YjQIOCoFsoHefuKgfOiRbRP3C + fq9w+tgEY1WsVOnjzi9AMEv78eZbOgxUAu/tQqRgjXpoCz83HO9LNFdEgJxe98R2 + KkVoyRbbpsr8k5IkFi4NMw0DroFndwfQA7miBMdp74j8qYQLYzN2Sqy9szdWiH6s + 28Sfy/E0BWtlj7D1Nvos2v5vZDHy12eFzxf0icUPuclR/q8ceTlq12dd5wjMnlaG + l0KH5hu6GbzkG7bk/a+Q0GXfVjdD9xt7MtP3TZ5TVZ/Lggb1yU0IUSrMtRREmXYH + BTbaSRBuwURvRnOotFd/Wkkc0oWciiUgUIZXNBTE5V+OORGLITyoxAv/krqvcMvy + 7i4yJJKgW1YOOteyJYmy89Hw2P8q2apH0qoQlbFp62ttU8tzKbw/sJ7JE87hq7wl + U3tynFqfsJHh9Mb4a/BV1+p5+PdmAn72UiEztxRfqlrfAgMBAAGjGDAWMBQGA1Ud + EQQNMAuCCWFjbWUudGVzdDANBgkqhkiG9w0BAQsFAAOCAgEAM5WrCpBOmLrZ1QX8 + l6vxVXwoI8pnqyy3cbAm3aLRPbw4gb0Ot90Pv/LoMhP0fkrNOKwH/FGRjSXyti0X + TheKrP7aEf6XL2/Xnb8rK2jYMQo6YJU9T+wBJA6Q+GBrc8SE75KfOi5NWJr8T4Ju + Etb+G05hXClrN19VFzIoz3L4kRV+xNMialcOT3xQfHtXCQUgwAWpPlwcJA/Jf60m + XsfwQwk2Ir16wq+Lc3y+mQ7d/dbG+FVrngFk4qN2B9M/Zyv4N9ZBbqeDUn3mYtJE + FeJrwHgmwH6slf1gBN3gxUKRW7Bvzxk548NdmLOyN+Y4StsqbOaYGtShUJA7f1Ng + qQqdgvxZ9MNwwMv9QVDZEnaaew3/oWOSmQGAai4hrc7gLMLJmIxzgfd5P6Dr06e4 + 2zwsMuI8Qh/IDqu/CfmFYvaua0FEeyAtpoID9Y/KPM7fu9bJuxjZ6kqLVFkEi9nF + /rCMchcSA8N2z/vLPabpNotO7OYH3VD7aQGTfCL82dMlp1vwZ39S3Z1TFLLh3MZ+ + BYcAv8kUvCV6kIdPAXvJRSQOJUlJRV7XiI2mwugdDzMx69wQ0Zc1e4WyGfiSiVYm + ckSJ/EkxuwT/ZYLqCAKSFGMlFhad9g1Zyvd67XgfZq5p0pJTtGxtn5j8QHy6PM6m + NbjvWnP8lDU8j2l3eSG58S14iGs= -----END CERTIFICATE----- ''; } diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix index ba087bb6009..502fe96231f 100644 --- a/nixos/tests/common/ec2.nix +++ b/nixos/tests/common/ec2.nix @@ -20,30 +20,44 @@ with pkgs.lib; in makeTest { name = "ec2-" + name; nodes = {}; - testScript = - '' - my $imageDir = ($ENV{'TMPDIR'} // "/tmp") . "/vm-state-machine"; - mkdir $imageDir, 0700; - my $diskImage = "$imageDir/machine.qcow2"; - system("qemu-img create -f qcow2 -o backing_file=${image} $diskImage") == 0 or die; - system("qemu-img resize $diskImage 10G") == 0 or die; + testScript = '' + import os + import subprocess - # Note: we use net=169.0.0.0/8 rather than - # net=169.254.0.0/16 to prevent dhcpcd from getting horribly - # confused. (It would get a DHCP lease in the 169.254.* - # range, which it would then configure and prompty delete - # again when it deletes link-local addresses.) Ideally we'd - # turn off the DHCP server, but qemu does not have an option - # to do that. - my $startCommand = "qemu-kvm -m 1024"; - $startCommand .= " -device virtio-net-pci,netdev=vlan0"; - $startCommand .= " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'"; - $startCommand .= " -drive file=$diskImage,if=virtio,werror=report"; - $startCommand .= " \$QEMU_OPTS"; + image_dir = os.path.join( + os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine" + ) + os.makedirs(image_dir, mode=0o700, exist_ok=True) + disk_image = os.path.join(image_dir, "machine.qcow2") + subprocess.check_call( + [ + "qemu-img", + "create", + "-f", + "qcow2", + "-o", + "backing_file=${image}", + disk_image, + ] + ) + subprocess.check_call(["qemu-img", "resize", disk_image, "10G"]) - my $machine = createMachine({ startCommand => $startCommand }); + # Note: we use net=169.0.0.0/8 rather than + # net=169.254.0.0/16 to prevent dhcpcd from getting horribly + # confused. (It would get a DHCP lease in the 169.254.* + # range, which it would then configure and prompty delete + # again when it deletes link-local addresses.) Ideally we'd + # turn off the DHCP server, but qemu does not have an option + # to do that. + start_command = ( + "qemu-kvm -m 1024" + + " -device virtio-net-pci,netdev=vlan0" + + " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'" + + f" -drive file={disk_image},if=virtio,werror=report" + + " $QEMU_OPTS" + ) - ${script} - ''; + machine = create_machine({"startCommand": start_command}) + '' + script; }; } diff --git a/nixos/tests/containers-reloadable.nix b/nixos/tests/containers-reloadable.nix index 35aff91e85b..2d81f163938 100644 --- a/nixos/tests/containers-reloadable.nix +++ b/nixos/tests/containers-reloadable.nix @@ -9,13 +9,13 @@ let }; }; - # prevent make-test.nix to change IP + # prevent make-test-python.nix to change IP networking.interfaces = { eth1.ipv4.addresses = lib.mkOverride 0 [ ]; }; }; in { - name = "cotnainers-reloadable"; + name = "containers-reloadable"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ danbst ]; }; diff --git a/nixos/tests/cri-o.nix b/nixos/tests/cri-o.nix new file mode 100644 index 00000000000..f13f1bdacb6 --- /dev/null +++ b/nixos/tests/cri-o.nix @@ -0,0 +1,19 @@ +# This test runs CRI-O and verifies via critest +import ./make-test-python.nix ({ pkgs, ... }: { + name = "cri-o"; + maintainers = with pkgs.stdenv.lib.maintainers; teams.podman.members; + + nodes = { + crio = { + virtualisation.cri-o.enable = true; + }; + }; + + testScript = '' + start_all() + crio.wait_for_unit("crio.service") + crio.succeed( + "critest --ginkgo.focus='Runtime info' --runtime-endpoint unix:///var/run/crio/crio.sock" + ) + ''; +}) diff --git a/nixos/tests/docker-preloader.nix b/nixos/tests/docker-preloader.nix deleted file mode 100644 index c3e8aced351..00000000000 --- a/nixos/tests/docker-preloader.nix +++ /dev/null @@ -1,27 +0,0 @@ -import ./make-test.nix ({ pkgs, ...} : { - name = "docker-preloader"; - meta = with pkgs.stdenv.lib.maintainers; { - maintainers = [ lewo ]; - }; - - nodes = { - docker = - { pkgs, ... }: - { - virtualisation.docker.enable = true; - virtualisation.dockerPreloader.images = [ pkgs.dockerTools.examples.nix pkgs.dockerTools.examples.bash ]; - - services.openssh.enable = true; - services.openssh.permitRootLogin = "yes"; - services.openssh.extraConfig = "PermitEmptyPasswords yes"; - users.extraUsers.root.password = ""; - }; - }; - testScript = '' - startAll; - - $docker->waitForUnit("sockets.target"); - $docker->succeed("docker run nix nix-store --version"); - $docker->succeed("docker run bash bash --version"); - ''; -}) diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix index 5a59d65e602..df067248016 100644 --- a/nixos/tests/ec2.nix +++ b/nixos/tests/ec2.nix @@ -3,58 +3,58 @@ pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; with import common/ec2.nix { inherit makeTest pkgs; }; let - imageCfg = - (import ../lib/eval-config.nix { - inherit system; - modules = [ - ../maintainers/scripts/ec2/amazon-image.nix - ../modules/testing/test-instrumentation.nix - ../modules/profiles/qemu-guest.nix - { ec2.hvm = true; - - # Hack to make the partition resizing work in QEMU. - boot.initrd.postDeviceCommands = mkBefore - '' - ln -s vda /dev/xvda - ln -s vda1 /dev/xvda1 - ''; - - # Needed by nixos-rebuild due to the lack of network - # access. Determined by trial and error. - system.extraDependencies = - with pkgs; ( - [ - # Needed for a nixos-rebuild. - busybox - stdenv - stdenvNoCC - mkinitcpio-nfs-utils - unionfs-fuse - cloud-utils - desktop-file-utils - texinfo - libxslt.bin - xorg.lndir - - # These are used in the configure-from-userdata tests - # for EC2. Httpd and valgrind are requested by the - # configuration. - apacheHttpd apacheHttpd.doc apacheHttpd.man valgrind.doc - ] - ); - } - ]; - }).config; + imageCfg = (import ../lib/eval-config.nix { + inherit system; + modules = [ + ../maintainers/scripts/ec2/amazon-image.nix + ../modules/testing/test-instrumentation.nix + ../modules/profiles/qemu-guest.nix + { + ec2.hvm = true; + + # Hack to make the partition resizing work in QEMU. + boot.initrd.postDeviceCommands = mkBefore '' + ln -s vda /dev/xvda + ln -s vda1 /dev/xvda1 + ''; + + # Needed by nixos-rebuild due to the lack of network + # access. Determined by trial and error. + system.extraDependencies = with pkgs; ( [ + # Needed for a nixos-rebuild. + busybox + cloud-utils + desktop-file-utils + libxslt.bin + mkinitcpio-nfs-utils + stdenv + stdenvNoCC + texinfo + unionfs-fuse + xorg.lndir + + # These are used in the configure-from-userdata tests + # for EC2. Httpd and valgrind are requested by the + # configuration. + apacheHttpd + apacheHttpd.doc + apacheHttpd.man + valgrind.doc + ]); + } + ]; + }).config; image = "${imageCfg.system.build.amazonImage}/${imageCfg.amazonImage.name}.vhd"; sshKeys = import ./ssh-keys.nix pkgs; snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; + snakeOilPrivateKeyFile = pkgs.writeText "private-key" snakeOilPrivateKey; snakeOilPublicKey = sshKeys.snakeOilPublicKey; in { @@ -68,43 +68,47 @@ in { SSH_HOST_ED25519_KEY:${replaceStrings ["\n"] ["|"] snakeOilPrivateKey} ''; script = '' - $machine->start; - $machine->waitForFile("/etc/ec2-metadata/user-data"); - $machine->waitForUnit("sshd.service"); + machine.start() + machine.wait_for_file("/etc/ec2-metadata/user-data") + machine.wait_for_unit("sshd.service") - $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path"); + machine.succeed("grep unknown /etc/ec2-metadata/ami-manifest-path") # We have no keys configured on the client side yet, so this should fail - $machine->fail("ssh -o BatchMode=yes localhost exit"); + machine.fail("ssh -o BatchMode=yes localhost exit") # Let's install our client private key - $machine->succeed("mkdir -p ~/.ssh"); + machine.succeed("mkdir -p ~/.ssh") - $machine->succeed("echo '${snakeOilPrivateKey}' > ~/.ssh/id_ed25519"); - $machine->succeed("chmod 600 ~/.ssh/id_ed25519"); + machine.copy_from_host_via_shell( + "${snakeOilPrivateKeyFile}", "~/.ssh/id_ed25519" + ) + machine.succeed("chmod 600 ~/.ssh/id_ed25519") # We haven't configured the host key yet, so this should still fail - $machine->fail("ssh -o BatchMode=yes localhost exit"); + machine.fail("ssh -o BatchMode=yes localhost exit") # Add the host key; ssh should finally succeed - $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"); - $machine->succeed("ssh -o BatchMode=yes localhost exit"); + machine.succeed( + "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts" + ) + machine.succeed("ssh -o BatchMode=yes localhost exit") # Test whether the root disk was resized. - my $blocks = $machine->succeed("stat -c %b -f /"); - my $bsize = $machine->succeed("stat -c %S -f /"); - my $size = $blocks * $bsize; - die "wrong free space $size" if $size < 9.7 * 1024 * 1024 * 1024 || $size > 10 * 1024 * 1024 * 1024; + blocks, block_size = map(int, machine.succeed("stat -c %b:%S -f /").split(":")) + GB = 1024 ** 3 + assert 9.7 * GB <= blocks * block_size <= 10 * GB # Just to make sure resizing is idempotent. - $machine->shutdown; - $machine->start; - $machine->waitForFile("/etc/ec2-metadata/user-data"); + machine.shutdown() + machine.start() + machine.wait_for_file("/etc/ec2-metadata/user-data") ''; }; boot-ec2-config = makeEc2Test { name = "config-userdata"; + meta.broken = true; # amazon-init wants to download from the internet while building the system inherit image; sshPublicKey = snakeOilPublicKey; @@ -133,17 +137,17 @@ in { } ''; script = '' - $machine->start; + machine.start() # amazon-init must succeed. if it fails, make the test fail - # immediately instead of timing out in waitForFile. - $machine->waitForUnit('amazon-init.service'); + # immediately instead of timing out in wait_for_file. + machine.wait_for_unit("amazon-init.service") - $machine->waitForFile("/etc/testFile"); - $machine->succeed("cat /etc/testFile | grep -q 'whoa'"); + machine.wait_for_file("/etc/testFile") + assert "whoa" in machine.succeed("cat /etc/testFile") - $machine->waitForUnit("httpd.service"); - $machine->succeed("curl http://localhost | grep Valgrind"); + machine.wait_for_unit("httpd.service") + assert "Valgrind" in machine.succeed("curl http://localhost") ''; }; } diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index b3d7aff8bd7..7e301be49d1 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -23,6 +23,13 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { services.xserver.desktopManager.gnome3.enable = true; services.xserver.desktopManager.gnome3.debug = true; + environment.systemPackages = [ + (pkgs.makeAutostartItem { + name = "org.gnome.Terminal"; + package = pkgs.gnome3.gnome-terminal; + }) + ]; + virtualisation.memorySize = 1024; }; @@ -65,9 +72,6 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : { ) with subtest("Open Gnome Terminal"): - machine.succeed( - "${gnomeTerminalCommand}" - ) # correct output should be (true, '"gnome-terminal-server"') machine.wait_until_succeeds( "${wmClass} | grep -q 'gnome-terminal-server'" diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 5ed0dfcf9ab..8d845de70e2 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({ pkgs, latestKernel ? false, ... } : { +import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... } : { name = "hardened"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ joachifm ]; @@ -47,84 +47,88 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... } : { }; in '' - $machine->waitForUnit("multi-user.target"); + machine.wait_for_unit("multi-user.target") + + + with subtest("AppArmor profiles are loaded"): + machine.succeed("systemctl status apparmor.service") - subtest "apparmor-loaded", sub { - $machine->succeed("systemctl status apparmor.service"); - }; # AppArmor securityfs - subtest "apparmor-securityfs", sub { - $machine->succeed("mountpoint -q /sys/kernel/security"); - $machine->succeed("cat /sys/kernel/security/apparmor/profiles"); - }; + with subtest("AppArmor securityfs is mounted"): + machine.succeed("mountpoint -q /sys/kernel/security") + machine.succeed("cat /sys/kernel/security/apparmor/profiles") + # Test loading out-of-tree modules - subtest "extra-module-packages", sub { - $machine->succeed("grep -Fq wireguard /proc/modules"); - }; + with subtest("Out-of-tree modules can be loaded"): + machine.succeed("grep -Fq wireguard /proc/modules") + # Test hidepid - subtest "hidepid", sub { - $machine->succeed("grep -Fq hidepid=2 /proc/mounts"); + with subtest("hidepid=2 option is applied and works"): + machine.succeed("grep -Fq hidepid=2 /proc/mounts") # cannot use pgrep -u here, it segfaults when access to process info is denied - $machine->succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]"); - $machine->succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]"); - }; + machine.succeed("[ `su - sybil -c 'ps --no-headers --user root | wc -l'` = 0 ]") + machine.succeed("[ `su - alice -c 'ps --no-headers --user root | wc -l'` != 0 ]") + # Test kernel module hardening - subtest "lock-modules", sub { + with subtest("No more kernel modules can be loaded"): # note: this better a be module we normally wouldn't load ... - $machine->fail("modprobe dccp"); - }; + machine.fail("modprobe dccp") + # Test userns - subtest "userns", sub { - $machine->succeed("unshare --user true"); - $machine->fail("su -l alice -c 'unshare --user true'"); - }; + with subtest("User namespaces are restricted"): + machine.succeed("unshare --user true") + machine.fail("su -l alice -c 'unshare --user true'") + # Test dmesg restriction - subtest "dmesg", sub { - $machine->fail("su -l alice -c dmesg"); - }; + with subtest("Regular users cannot access dmesg"): + machine.fail("su -l alice -c dmesg") + # Test access to kcore - subtest "kcore", sub { - $machine->fail("cat /proc/kcore"); - }; + with subtest("Kcore is inaccessible as root"): + machine.fail("cat /proc/kcore") + # Test deferred mount - subtest "mount", sub { - $machine->fail("mountpoint -q /efi"); # was deferred - $machine->execute("mkdir -p /efi"); - $machine->succeed("mount /dev/disk/by-label/EFISYS /efi"); - $machine->succeed("mountpoint -q /efi"); # now mounted - }; + with subtest("Deferred mounts work"): + machine.fail("mountpoint -q /efi") # was deferred + machine.execute("mkdir -p /efi") + machine.succeed("mount /dev/disk/by-label/EFISYS /efi") + machine.succeed("mountpoint -q /efi") # now mounted + # Test Nix dæmon usage - subtest "nix-daemon", sub { - $machine->fail("su -l nobody -s /bin/sh -c 'nix ping-store'"); - $machine->succeed("su -l alice -c 'nix ping-store'") =~ "OK"; - }; + with subtest("nix-daemon cannot be used by all users"): + machine.fail("su -l nobody -s /bin/sh -c 'nix ping-store'") + machine.succeed("su -l alice -c 'nix ping-store'") + # Test kernel image protection - subtest "kernelimage", sub { - $machine->fail("systemctl hibernate"); - $machine->fail("systemctl kexec"); - }; + with subtest("The kernel image is protected"): + machine.fail("systemctl hibernate") + machine.fail("systemctl kexec") - # Test hardened memory allocator - sub runMallocTestProg { - my ($progName, $errorText) = @_; - my $text = "fatal allocator error: " . $errorText; - $machine->fail("${hardened-malloc-tests}/bin/" . $progName) =~ $text; - }; - subtest "hardenedmalloc", sub { - runMallocTestProg("double_free_large", "invalid free"); - runMallocTestProg("unaligned_free_small", "invalid unaligned free"); - runMallocTestProg("write_after_free_small", "detected write after free"); - }; + # Test hardened memory allocator + def runMallocTestProg(prog_name, error_text): + text = "fatal allocator error: " + error_text + if not text in machine.fail( + "${hardened-malloc-tests}/bin/" + + prog_name + + " 2>&1" + ): + raise Exception("Hardened malloc does not work for {}".format(error_text)) + + + with subtest("The hardened memory allocator works"): + runMallocTestProg("double_free_large", "invalid free") + runMallocTestProg("unaligned_free_small", "invalid unaligned free") + runMallocTestProg("write_after_free_small", "detected write after free") ''; }) diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix index 4f30f01e403..978dbf310b1 100644 --- a/nixos/tests/hocker-fetchdocker/default.nix +++ b/nixos/tests/hocker-fetchdocker/default.nix @@ -1,15 +1,16 @@ -import ../make-test.nix ({ pkgs, ...} : { +import ../make-test-python.nix ({ pkgs, ...} : { name = "test-hocker-fetchdocker"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ ixmatus ]; + broken = true; # tries to download from registry-1.docker.io - how did this ever work? }; machine = import ./machine.nix; testScript = '' - startAll; + start_all() - $machine->waitForUnit("sockets.target"); - $machine->waitUntilSucceeds("docker run registry-1.docker.io/v2/library/hello-world:latest"); + machine.wait_for_unit("sockets.target") + machine.wait_until_succeeds("docker run registry-1.docker.io/v2/library/hello-world:latest") ''; }) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 02b839fee3f..f64e4101d45 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -74,7 +74,7 @@ let throw "Non-EFI boot methods are only supported on i686 / x86_64" else '' def assemble_qemu_flags(): - flags = "-cpu host" + flags = "-cpu max" ${if system == "x86_64-linux" then ''flags += " -m 768"'' else ''flags += " -m 512 -enable-kvm -machine virt,gic-version=host"'' @@ -317,6 +317,7 @@ let texinfo unionfs-fuse xorg.lndir + (lvm2.override { udev = null; }) # for initrd (extra-utils) # add curl so that rather than seeing the test attempt to download # curl's tarball, we see what it's trying to download @@ -799,7 +800,7 @@ in { "btrfs subvol create /mnt/badpath/boot", "btrfs subvol create /mnt/nixos", "btrfs subvol set-default " - + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print \$2}') /mnt", + + "$(btrfs subvol list /mnt | grep 'nixos' | awk '{print $2}') /mnt", "umount /mnt", "mount -o defaults LABEL=root /mnt", "mkdir -p /mnt/badpath/boot", # Help ensure the detection mechanism diff --git a/nixos/tests/make-test.nix b/nixos/tests/make-test.nix deleted file mode 100644 index cee5da93454..00000000000 --- a/nixos/tests/make-test.nix +++ /dev/null @@ -1,9 +0,0 @@ -f: { - system ? builtins.currentSystem, - pkgs ? import ../.. { inherit system; config = {}; }, - ... -} @ args: - -with import ../lib/testing.nix { inherit system pkgs; }; - -makeTest (if pkgs.lib.isFunction f then f (args // { inherit pkgs; inherit (pkgs) lib; }) else f) diff --git a/nixos/tests/openstack-image.nix b/nixos/tests/openstack-image.nix index 97c9137fe1d..0b57dfb8e7e 100644 --- a/nixos/tests/openstack-image.nix +++ b/nixos/tests/openstack-image.nix @@ -3,30 +3,30 @@ pkgs ? import ../.. { inherit system config; } }: -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; with import common/ec2.nix { inherit makeTest pkgs; }; let - image = - (import ../lib/eval-config.nix { - inherit system; - modules = [ - ../maintainers/scripts/openstack/openstack-image.nix - ../modules/testing/test-instrumentation.nix - ../modules/profiles/qemu-guest.nix - { - # Needed by nixos-rebuild due to lack of network access. - system.extraDependencies = with pkgs; [ - stdenv - ]; - } - ]; - }).config.system.build.openstackImage + "/nixos.qcow2"; + image = (import ../lib/eval-config.nix { + inherit system; + modules = [ + ../maintainers/scripts/openstack/openstack-image.nix + ../modules/testing/test-instrumentation.nix + ../modules/profiles/qemu-guest.nix + { + # Needed by nixos-rebuild due to lack of network access. + system.extraDependencies = with pkgs; [ + stdenv + ]; + } + ]; + }).config.system.build.openstackImage + "/nixos.qcow2"; sshKeys = import ./ssh-keys.nix pkgs; snakeOilPrivateKey = sshKeys.snakeOilPrivateKey.text; + snakeOilPrivateKeyFile = pkgs.writeText "private-key" snakeOilPrivateKey; snakeOilPublicKey = sshKeys.snakeOilPublicKey; in { @@ -39,32 +39,36 @@ in { SSH_HOST_ED25519_KEY:${replaceStrings ["\n"] ["|"] snakeOilPrivateKey} ''; script = '' - $machine->start; - $machine->waitForFile("/etc/ec2-metadata/user-data"); - $machine->waitForUnit("sshd.service"); + machine.start() + machine.wait_for_file("/etc/ec2-metadata/user-data") + machine.wait_for_unit("sshd.service") - $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path"); + machine.succeed("grep unknown /etc/ec2-metadata/ami-manifest-path") # We have no keys configured on the client side yet, so this should fail - $machine->fail("ssh -o BatchMode=yes localhost exit"); + machine.fail("ssh -o BatchMode=yes localhost exit") # Let's install our client private key - $machine->succeed("mkdir -p ~/.ssh"); + machine.succeed("mkdir -p ~/.ssh") - $machine->succeed("echo '${snakeOilPrivateKey}' > ~/.ssh/id_ed25519"); - $machine->succeed("chmod 600 ~/.ssh/id_ed25519"); + machine.copy_from_host_via_shell( + "${snakeOilPrivateKeyFile}", "~/.ssh/id_ed25519" + ) + machine.succeed("chmod 600 ~/.ssh/id_ed25519") # We haven't configured the host key yet, so this should still fail - $machine->fail("ssh -o BatchMode=yes localhost exit"); + machine.fail("ssh -o BatchMode=yes localhost exit") # Add the host key; ssh should finally succeed - $machine->succeed("echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts"); - $machine->succeed("ssh -o BatchMode=yes localhost exit"); + machine.succeed( + "echo localhost,127.0.0.1 ${snakeOilPublicKey} > ~/.ssh/known_hosts" + ) + machine.succeed("ssh -o BatchMode=yes localhost exit") # Just to make sure resizing is idempotent. - $machine->shutdown; - $machine->start; - $machine->waitForFile("/etc/ec2-metadata/user-data"); + machine.shutdown() + machine.start() + machine.wait_for_file("/etc/ec2-metadata/user-data") ''; }; @@ -86,9 +90,9 @@ in { } ''; script = '' - $machine->start; - $machine->waitForFile("/etc/testFile"); - $machine->succeed("cat /etc/testFile | grep -q 'whoa'"); + machine.start() + machine.wait_for_file("/etc/testFile") + assert "whoa" in machine.succeed("cat /etc/testFile") ''; }; } diff --git a/nixos/tests/os-prober.nix b/nixos/tests/os-prober.nix index 6a38f5ca531..be0235a4175 100644 --- a/nixos/tests/os-prober.nix +++ b/nixos/tests/os-prober.nix @@ -1,4 +1,4 @@ -import ./make-test.nix ({pkgs, lib, ...}: +import ./make-test-python.nix ({pkgs, lib, ...}: let # A filesystem image with a (presumably) bootable debian debianImage = pkgs.vmTools.diskImageFuns.debian9i386 { @@ -34,9 +34,6 @@ let ''; }; - # options to add the disk to the test vm - QEMU_OPTS = "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio"; - # a part of the configuration of the test vm simpleConfig = { boot.loader.grub = { @@ -71,7 +68,7 @@ in { machine = { config, pkgs, ... }: (simpleConfig // { imports = [ ../modules/profiles/installation-device.nix ../modules/profiles/base.nix ]; - virtualisation.memorySize = 1024; + virtualisation.memorySize = 1300; # The test cannot access the network, so any packages # nixos-rebuild needs must be included in the VM. system.extraDependencies = with pkgs; @@ -99,22 +96,28 @@ in { testScript = '' # hack to add the secondary disk - $machine->{startCommand} = "QEMU_OPTS=\"\$QEMU_OPTS \"${lib.escapeShellArg QEMU_OPTS} ".$machine->{startCommand}; + os.environ[ + "QEMU_OPTS" + ] = "-drive index=2,file=${debianImage}/disk-image.qcow2,read-only,if=virtio" - $machine->start; - $machine->succeed("udevadm settle"); - $machine->waitForUnit("multi-user.target"); + machine.start() + machine.succeed("udevadm settle") + machine.wait_for_unit("multi-user.target") + print(machine.succeed("lsblk")) # check that os-prober works standalone - $machine->succeed("${pkgs.os-prober}/bin/os-prober | grep /dev/vdb1"); + machine.succeed( + "${pkgs.os-prober}/bin/os-prober | grep /dev/vdb1" + ) # rebuild and test that debian is available in the grub menu - $machine->succeed("nixos-generate-config"); - $machine->copyFileFromHost( + machine.succeed("nixos-generate-config") + machine.copy_from_host( "${configFile}", - "/etc/nixos/configuration.nix"); - $machine->succeed("nixos-rebuild boot >&2"); + "/etc/nixos/configuration.nix", + ) + machine.succeed("nixos-rebuild boot >&2") - $machine->succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg"); + machine.succeed("egrep 'menuentry.*debian' /boot/grub/grub.cfg") ''; }) diff --git a/nixos/tests/postgresql-wal-receiver.nix b/nixos/tests/postgresql-wal-receiver.nix index c50746aa838..432b46234f9 100644 --- a/nixos/tests/postgresql-wal-receiver.nix +++ b/nixos/tests/postgresql-wal-receiver.nix @@ -1,103 +1,111 @@ -{ system ? builtins.currentSystem -, config ? { } -, pkgs ? import ../.. { inherit system config; } }: - -with import ../lib/testing.nix { inherit system pkgs; }; -with pkgs.lib; - let - makePostgresqlWalReceiverTest = subTestName: postgresqlPackage: let + # Makes a test for a PostgreSQL package, given by name and looked up from `pkgs`. + makePostgresqlWalReceiverTest = postgresqlPackage: + { + name = postgresqlPackage; + value = + import ./make-test-python.nix ({ pkgs, lib, ... }: let - postgresqlDataDir = "/var/db/postgresql/test"; - replicationUser = "wal_receiver_user"; - replicationSlot = "wal_receiver_slot"; - replicationConn = "postgresql://${replicationUser}@localhost"; - baseBackupDir = "/tmp/pg_basebackup"; - walBackupDir = "/tmp/pg_wal"; - atLeast12 = versionAtLeast postgresqlPackage.version "12.0"; - restoreCommand = '' - restore_command = 'cp ${walBackupDir}/%f %p' - ''; + pkg = pkgs."${postgresqlPackage}"; + postgresqlDataDir = "/var/lib/postgresql/${pkg.psqlSchema}"; + replicationUser = "wal_receiver_user"; + replicationSlot = "wal_receiver_slot"; + replicationConn = "postgresql://${replicationUser}@localhost"; + baseBackupDir = "/tmp/pg_basebackup"; + walBackupDir = "/tmp/pg_wal"; + atLeast12 = lib.versionAtLeast pkg.version "12.0"; - recoveryFile = if atLeast12 - then pkgs.writeTextDir "recovery.signal" "" - else pkgs.writeTextDir "recovery.conf" "${restoreCommand}"; + recoveryFile = if atLeast12 + then pkgs.writeTextDir "recovery.signal" "" + else pkgs.writeTextDir "recovery.conf" "restore_command = 'cp ${walBackupDir}/%f %p'"; - in makeTest { - name = "postgresql-wal-receiver-${subTestName}"; - meta.maintainers = with maintainers; [ pacien ]; + in { + name = "postgresql-wal-receiver-${postgresqlPackage}"; + meta.maintainers = with lib.maintainers; [ pacien ]; - machine = { ... }: { - # Needed because this test uses a non-default 'services.postgresql.dataDir'. - systemd.tmpfiles.rules = [ - "d /var/db/postgresql 0700 postgres postgres" - ]; - services.postgresql = { - package = postgresqlPackage; - enable = true; - dataDir = postgresqlDataDir; - extraConfig = '' - wal_level = archive # alias for replica on pg >= 9.6 - max_wal_senders = 10 - max_replication_slots = 10 - '' + optionalString atLeast12 '' - ${restoreCommand} - recovery_end_command = 'touch recovery.done' - ''; - authentication = '' - host replication ${replicationUser} all trust - ''; - initialScript = pkgs.writeText "init.sql" '' - create user ${replicationUser} replication; - select * from pg_create_physical_replication_slot('${replicationSlot}'); - ''; - }; + machine = { ... }: { + services.postgresql = { + package = pkg; + enable = true; + settings = lib.mkMerge [ + { + wal_level = "archive"; # alias for replica on pg >= 9.6 + max_wal_senders = 10; + max_replication_slots = 10; + } + (lib.mkIf atLeast12 { + restore_command = "cp ${walBackupDir}/%f %p"; + recovery_end_command = "touch recovery.done"; + }) + ]; + authentication = '' + host replication ${replicationUser} all trust + ''; + initialScript = pkgs.writeText "init.sql" '' + create user ${replicationUser} replication; + select * from pg_create_physical_replication_slot('${replicationSlot}'); + ''; + }; - services.postgresqlWalReceiver.receivers.main = { - inherit postgresqlPackage; - connection = replicationConn; - slot = replicationSlot; - directory = walBackupDir; - }; - # This is only to speedup test, it isn't time racing. Service is set to autorestart always, - # default 60sec is fine for real system, but is too much for a test - systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = mkForce 5; - }; + services.postgresqlWalReceiver.receivers.main = { + postgresqlPackage = pkg; + connection = replicationConn; + slot = replicationSlot; + directory = walBackupDir; + }; + # This is only to speedup test, it isn't time racing. Service is set to autorestart always, + # default 60sec is fine for real system, but is too much for a test + systemd.services.postgresql-wal-receiver-main.serviceConfig.RestartSec = lib.mkForce 5; + }; - testScript = '' - # make an initial base backup - $machine->waitForUnit('postgresql'); - $machine->waitForUnit('postgresql-wal-receiver-main'); - # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other - # required only for 9.4 - $machine->sleep(5); - $machine->succeed('${postgresqlPackage}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}'); + testScript = '' + # make an initial base backup + machine.wait_for_unit("postgresql") + machine.wait_for_unit("postgresql-wal-receiver-main") + # WAL receiver healthchecks PG every 5 seconds, so let's be sure they have connected each other + # required only for 9.4 + machine.sleep(5) + machine.succeed( + "${pkg}/bin/pg_basebackup --dbname=${replicationConn} --pgdata=${baseBackupDir}" + ) - # create a dummy table with 100 records - $machine->succeed('sudo -u postgres psql --command="create table dummy as select * from generate_series(1, 100) as val;"'); + # create a dummy table with 100 records + machine.succeed( + "sudo -u postgres psql --command='create table dummy as select * from generate_series(1, 100) as val;'" + ) - # stop postgres and destroy data - $machine->systemctl('stop postgresql'); - $machine->systemctl('stop postgresql-wal-receiver-main'); - $machine->succeed('rm -r ${postgresqlDataDir}/{base,global,pg_*}'); + # stop postgres and destroy data + machine.systemctl("stop postgresql") + machine.systemctl("stop postgresql-wal-receiver-main") + machine.succeed("rm -r ${postgresqlDataDir}/{base,global,pg_*}") - # restore the base backup - $machine->succeed('cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}'); + # restore the base backup + machine.succeed( + "cp -r ${baseBackupDir}/* ${postgresqlDataDir} && chown postgres:postgres -R ${postgresqlDataDir}" + ) - # prepare WAL and recovery - $machine->succeed('chmod a+rX -R ${walBackupDir}'); - $machine->execute('for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done'); # make use of partial segments too - $machine->succeed('cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*'); + # prepare WAL and recovery + machine.succeed("chmod a+rX -R ${walBackupDir}") + machine.execute( + "for part in ${walBackupDir}/*.partial; do mv $part ''${part%%.*}; done" + ) # make use of partial segments too + machine.succeed( + "cp ${recoveryFile}/* ${postgresqlDataDir}/ && chmod 666 ${postgresqlDataDir}/recovery*" + ) - # replay WAL - $machine->systemctl('start postgresql'); - $machine->waitForFile('${postgresqlDataDir}/recovery.done'); - $machine->systemctl('restart postgresql'); - $machine->waitForUnit('postgresql'); + # replay WAL + machine.systemctl("start postgresql") + machine.wait_for_file("${postgresqlDataDir}/recovery.done") + machine.systemctl("restart postgresql") + machine.wait_for_unit("postgresql") - # check that our records have been restored - $machine->succeed('test $(sudo -u postgres psql --pset="pager=off" --tuples-only --command="select count(distinct val) from dummy;") -eq 100'); - ''; - }; + # check that our records have been restored + machine.succeed( + "test $(sudo -u postgres psql --pset='pager=off' --tuples-only --command='select count(distinct val) from dummy;') -eq 100" + ) + ''; + }); + }; -in mapAttrs makePostgresqlWalReceiverTest (import ../../pkgs/servers/sql/postgresql pkgs) +# Maps the generic function over all attributes of PostgreSQL packages +in builtins.listToAttrs (map makePostgresqlWalReceiverTest (builtins.attrNames (import ../../pkgs/servers/sql/postgresql { }))) diff --git a/nixos/tests/robustirc-bridge.nix b/nixos/tests/robustirc-bridge.nix new file mode 100644 index 00000000000..a5c22d73a34 --- /dev/null +++ b/nixos/tests/robustirc-bridge.nix @@ -0,0 +1,29 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "robustirc-bridge"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ hax404 ]; + }; + + nodes = + { bridge = + { services.robustirc-bridge = { + enable = true; + extraFlags = [ + "-listen localhost:6667" + "-network example.com" + ]; + }; + }; + }; + + testScript = + '' + start_all() + + bridge.wait_for_unit("robustirc-bridge.service") + bridge.wait_for_open_port(1080) + bridge.wait_for_open_port(6667) + ''; +}) diff --git a/nixos/tests/shadowsocks.nix b/nixos/tests/shadowsocks.nix new file mode 100644 index 00000000000..6cb288f7611 --- /dev/null +++ b/nixos/tests/shadowsocks.nix @@ -0,0 +1,80 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "shadowsocks"; + meta = { + maintainers = with lib.maintainers; [ hmenke ]; + }; + + nodes = { + server = { + boot.kernel.sysctl."net.ipv4.ip_forward" = "1"; + networking.useDHCP = false; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.1"; prefixLength = 24; } + ]; + networking.firewall.rejectPackets = true; + networking.firewall.allowedTCPPorts = [ 8488 ]; + networking.firewall.allowedUDPPorts = [ 8488 ]; + services.shadowsocks = { + enable = true; + encryptionMethod = "chacha20-ietf-poly1305"; + password = "pa$$w0rd"; + localAddress = [ "0.0.0.0" ]; + port = 8488; + fastOpen = false; + mode = "tcp_and_udp"; + plugin = "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin"; + pluginOpts = "server;host=nixos.org"; + }; + services.nginx = { + enable = true; + virtualHosts.server = { + locations."/".root = pkgs.writeTextDir "index.html" "It works!"; + }; + }; + }; + + client = { + networking.useDHCP = false; + networking.interfaces.eth1.ipv4.addresses = [ + { address = "192.168.0.2"; prefixLength = 24; } + ]; + systemd.services.shadowsocks-client = { + description = "connect to shadowsocks"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + path = with pkgs; [ + shadowsocks-libev + shadowsocks-v2ray-plugin + ]; + script = '' + exec ss-local \ + -s 192.168.0.1 \ + -p 8488 \ + -l 1080 \ + -k 'pa$$w0rd' \ + -m chacha20-ietf-poly1305 \ + -a nobody \ + --plugin "${pkgs.shadowsocks-v2ray-plugin}/bin/v2ray-plugin" \ + --plugin-opts "host=nixos.org" + ''; + }; + }; + }; + + testScript = '' + start_all() + + server.wait_for_unit("shadowsocks-libev.service") + client.wait_for_unit("shadowsocks-client.service") + + client.fail( + "${pkgs.curl}/bin/curl 192.168.0.1:80" + ) + + msg = client.succeed( + "${pkgs.curl}/bin/curl --socks5 localhost:1080 192.168.0.1:80" + ) + assert msg == "It works!", "Could not connect through shadowsocks" + ''; + } +) diff --git a/nixos/tests/sssd.nix b/nixos/tests/sssd.nix new file mode 100644 index 00000000000..4c6ca86c74c --- /dev/null +++ b/nixos/tests/sssd.nix @@ -0,0 +1,17 @@ +import ./make-test-python.nix ({ pkgs, ... }: + +{ + name = "sssd"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ bbigras ]; + }; + machine = { pkgs, ... }: { + services.sssd.enable = true; + }; + + testScript = '' + start_all() + machine.wait_for_unit("multi-user.target") + machine.wait_for_unit("sssd.service") + ''; +}) diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 99cd341eec1..99395fe3023 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -31,7 +31,7 @@ import ./make-test-python.nix ({pkgs, ...}: { firewall.enable = false; interfaces.eth1.ipv4.addresses = lib.mkForce []; # no need for legacy IP interfaces.eth1.ipv6.addresses = lib.mkForce [ - { address = "2001:DB8::"; prefixLength = 64; } + { address = "2001:DB8::1"; prefixLength = 64; } ]; }; @@ -260,7 +260,7 @@ import ./make-test-python.nix ({pkgs, ...}: { client.wait_until_succeeds("ping -6 -c 1 FD42::1") # the global IP of the ISP router should still not be a reachable - router.fail("ping -6 -c 1 2001:DB8::") + router.fail("ping -6 -c 1 2001:DB8::1") # Once we have internal connectivity boot up the ISP isp.start() @@ -273,11 +273,11 @@ import ./make-test-python.nix ({pkgs, ...}: { # wait until the uplink interface has a good status router.wait_for_unit("network-online.target") - router.wait_until_succeeds("ping -6 -c1 2001:DB8::") + router.wait_until_succeeds("ping -6 -c1 2001:DB8::1") # shortly after that the client should have received it's global IPv6 # address and thus be able to ping the ISP - client.wait_until_succeeds("ping -6 -c1 2001:DB8::") + client.wait_until_succeeds("ping -6 -c1 2001:DB8::1") # verify that we got a globally scoped address in eth1 from the # documentation prefix diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index 319e5e94ece..d5fb2431dba 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -7,18 +7,19 @@ let generateNodeConf = { lib, pkgs, config, privk, pubk, peerId, nodeId, ...}: { virtualisation.vlans = [ 1 ]; environment.systemPackages = with pkgs; [ wireguard-tools ]; boot.extraModulePackages = [ config.boot.kernelPackages.wireguard ]; - systemd.tmpfiles.rules = [ - "f /run/wg_priv 0640 root systemd-network - ${privk}" - ]; systemd.network = { enable = true; netdevs = { "90-wg0" = { netdevConfig = { Kind = "wireguard"; Name = "wg0"; }; wireguardConfig = { - PrivateKeyFile = "/run/wg_priv"; + # NOTE: we're storing the wireguard private key in the + # store for this test. Do not do this in the real + # world. Keep in mind the nix store is + # world-readable. + PrivateKeyFile = pkgs.writeText "wg0-priv" privk; ListenPort = 51820; - FwMark = 42; + FirewallMark = 42; }; wireguardPeers = [ {wireguardPeerConfig={ Endpoint = "192.168.1.${peerId}:51820"; diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index a653932fb37..dfa16eecfad 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -4,7 +4,10 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine = { lib, ... }: { imports = [ common/user-account.nix common/x11.nix ]; - virtualisation.emptyDiskImages = [ 512 ]; + virtualisation.emptyDiskImages = [ 512 512 ]; + virtualisation.memorySize = 1024; + + environment.systemPackages = [ pkgs.cryptsetup ]; fileSystems = lib.mkVMOverride { "/test-x-initrd-mount" = { @@ -141,8 +144,29 @@ import ./make-test-python.nix ({ pkgs, ... }: { ) output = machine.succeed("systemctl show | grep Watchdog") - assert "RuntimeWatchdogUSec=30s" in output - assert "RebootWatchdogUSec=10m" in output - assert "KExecWatchdogUSec=5m" in output + # assert "RuntimeWatchdogUSec=30s" in output + # for some reason RuntimeWatchdogUSec, doesn't seem to be updated in here. + assert "RebootWatchdogUSec=10min" in output + assert "KExecWatchdogUSec=5min" in output + + # Test systemd cryptsetup support + with subtest("systemd successfully reads /etc/crypttab and unlocks volumes"): + # create a luks volume and put a filesystem on it + machine.succeed( + "echo -n supersecret | cryptsetup luksFormat -q /dev/vdc -", + "echo -n supersecret | cryptsetup luksOpen --key-file - /dev/vdc foo", + "mkfs.ext3 /dev/mapper/foo", + ) + + # create a keyfile and /etc/crypttab + machine.succeed("echo -n supersecret > /var/lib/luks-keyfile") + machine.succeed("chmod 600 /var/lib/luks-keyfile") + machine.succeed("echo 'luks1 /dev/vdc /var/lib/luks-keyfile luks' > /etc/crypttab") + + # after a reboot, systemd should unlock the volume and we should be able to mount it + machine.shutdown() + machine.succeed("systemctl status systemd-cryptsetup@luks1.service") + machine.succeed("mkdir -p /tmp/luks1") + machine.succeed("mount /dev/mapper/luks1 /tmp/luks1") ''; }) diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix index af76e6f9844..0d9eafa4a20 100644 --- a/nixos/tests/virtualbox.nix +++ b/nixos/tests/virtualbox.nix @@ -15,7 +15,7 @@ assert use64bitGuest -> useKvmNestedVirt; -with import ../lib/testing.nix { inherit system pkgs; }; +with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; let @@ -91,13 +91,15 @@ let (isYes "SERIAL_8250_CONSOLE") (isYes "SERIAL_8250") ]; + + networking.usePredictableInterfaceNames = false; }; mkLog = logfile: tag: let rotated = map (i: "${logfile}.${toString i}") (range 1 9); all = concatMapStringsSep " " (f: "\"${f}\"") ([logfile] ++ rotated); logcmd = "tail -F ${all} 2> /dev/null | logger -t \"${tag}\""; - in optionalString debug "$machine->execute(ru '${logcmd} & disown');"; + in if debug then "machine.execute(ru('${logcmd} & disown'))" else "pass"; testVM = vmName: vmScript: let cfg = (import ../lib/eval-config.nix { @@ -204,96 +206,105 @@ let }; testSubs = '' - my ${"$" + name}_sharepath = '${sharePath}'; - - sub checkRunning_${name} { - my $cmd = 'VBoxManage list runningvms | grep -q "^\"${name}\""'; - my ($status, $out) = $machine->execute(ru $cmd); - return $status == 0; - } - - sub cleanup_${name} { - $machine->execute(ru "VBoxManage controlvm ${name} poweroff") - if checkRunning_${name}; - $machine->succeed("rm -rf ${sharePath}"); - $machine->succeed("mkdir -p ${sharePath}"); - $machine->succeed("chown alice.users ${sharePath}"); - } - - sub createVM_${name} { - vbm("createvm --name ${name} ${createFlags}"); - vbm("modifyvm ${name} ${vmFlags}"); - vbm("setextradata ${name} VBoxInternal/PDM/HaltOnReset 1"); - vbm("storagectl ${name} ${controllerFlags}"); - vbm("storageattach ${name} ${diskFlags}"); - vbm("sharedfolder add ${name} ${sharedFlags}"); - vbm("sharedfolder add ${name} ${nixstoreFlags}"); - cleanup_${name}; - - ${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"} - } - - sub destroyVM_${name} { - cleanup_${name}; - vbm("unregistervm ${name} --delete"); - } - - sub waitForVMBoot_${name} { - $machine->execute(ru( - 'set -e; i=0; '. - 'while ! test -e ${sharePath}/boot-done; do '. - 'sleep 10; i=$(($i + 10)); [ $i -le 3600 ]; '. - 'VBoxManage list runningvms | grep -q "^\"${name}\""; '. - 'done' - )); - } - - sub waitForIP_${name} ($) { - my $property = "/VirtualBox/GuestInfo/Net/$_[0]/V4/IP"; - my $getip = "VBoxManage guestproperty get ${name} $property | ". - "sed -n -e 's/^Value: //p'"; - my $ip = $machine->succeed(ru( - 'for i in $(seq 1000); do '. - 'if ipaddr="$('.$getip.')" && [ -n "$ipaddr" ]; then '. - 'echo "$ipaddr"; exit 0; '. - 'fi; '. - 'sleep 1; '. - 'done; '. - 'echo "Could not get IPv4 address for ${name}!" >&2; '. - 'exit 1' - )); - chomp $ip; - return $ip; - } - - sub waitForStartup_${name} { - for (my $i = 0; $i <= 120; $i += 10) { - $machine->sleep(10); - return if checkRunning_${name}; - eval { $_[0]->() } if defined $_[0]; - } - die "VirtualBox VM didn't start up within 2 minutes"; - } - - sub waitForShutdown_${name} { - for (my $i = 0; $i <= 120; $i += 10) { - $machine->sleep(10); - return unless checkRunning_${name}; - } - die "VirtualBox VM didn't shut down within 2 minutes"; - } - - sub shutdownVM_${name} { - $machine->succeed(ru "touch ${sharePath}/shutdown"); - $machine->execute( - 'set -e; i=0; '. - 'while test -e ${sharePath}/shutdown '. - ' -o -e ${sharePath}/boot-done; do '. - 'sleep 1; i=$(($i + 1)); [ $i -le 3600 ]; '. - 'done' - ); - waitForShutdown_${name}; - } + + + ${name}_sharepath = "${sharePath}" + + + def check_running_${name}(): + cmd = "VBoxManage list runningvms | grep -q '^\"${name}\"'" + (status, _) = machine.execute(ru(cmd)) + return status == 0 + + + def cleanup_${name}(): + if check_running_${name}(): + machine.execute(ru("VBoxManage controlvm ${name} poweroff")) + machine.succeed("rm -rf ${sharePath}") + machine.succeed("mkdir -p ${sharePath}") + machine.succeed("chown alice.users ${sharePath}") + + + def create_vm_${name}(): + # fmt: off + vbm(f"createvm --name ${name} ${createFlags}") + vbm(f"modifyvm ${name} ${vmFlags}") + vbm(f"setextradata ${name} VBoxInternal/PDM/HaltOnReset 1") + vbm(f"storagectl ${name} ${controllerFlags}") + vbm(f"storageattach ${name} ${diskFlags}") + vbm(f"sharedfolder add ${name} ${sharedFlags}") + vbm(f"sharedfolder add ${name} ${nixstoreFlags}") + cleanup_${name}() + + ${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"} + # fmt: on + + + def destroy_vm_${name}(): + cleanup_${name}() + vbm("unregistervm ${name} --delete") + + + def wait_for_vm_boot_${name}(): + machine.execute( + ru( + "set -e; i=0; " + "while ! test -e ${sharePath}/boot-done; do " + "sleep 10; i=$(($i + 10)); [ $i -le 3600 ]; " + "VBoxManage list runningvms | grep -q '^\"${name}\"'; " + "done" + ) + ) + + + def wait_for_ip_${name}(interface): + property = f"/VirtualBox/GuestInfo/Net/{interface}/V4/IP" + # fmt: off + getip = f"VBoxManage guestproperty get ${name} {property} | sed -n -e 's/^Value: //p'" + # fmt: on + + ip = machine.succeed( + ru( + "for i in $(seq 1000); do " + f'if ipaddr="$({getip})" && [ -n "$ipaddr" ]; then ' + 'echo "$ipaddr"; exit 0; ' + "fi; " + "sleep 1; " + "done; " + "echo 'Could not get IPv4 address for ${name}!' >&2; " + "exit 1" + ) + ).strip() + return ip + + + def wait_for_startup_${name}(nudge=lambda: None): + for _ in range(0, 130, 10): + machine.sleep(10) + if check_running_${name}(): + return + nudge() + raise Exception("VirtualBox VM didn't start up within 2 minutes") + + + def wait_for_shutdown_${name}(): + for _ in range(0, 130, 10): + machine.sleep(10) + if not check_running_${name}(): + return + raise Exception("VirtualBox VM didn't shut down within 2 minutes") + + + def shutdown_vm_${name}(): + machine.succeed(ru("touch ${sharePath}/shutdown")) + machine.execute( + "set -e; i=0; " + "while test -e ${sharePath}/shutdown " + " -o -e ${sharePath}/boot-done; do " + "sleep 1; i=$(($i + 1)); [ $i -le 3600 ]; " + "done" + ) + wait_for_shutdown_${name}() ''; }; @@ -364,26 +375,31 @@ let }; testScript = '' - sub ru ($) { - my $esc = $_[0] =~ s/'/'\\${"'"}'/gr; - return "su - alice -c '$esc'"; - } + from shlex import quote + ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vms)} - sub vbm { - $machine->succeed(ru("VBoxManage ".$_[0])); - }; + def ru(cmd: str) -> str: + return f"su - alice -c {quote(cmd)}" - sub removeUUIDs { - return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n"; - } - ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vms)} + def vbm(cmd: str) -> str: + return machine.succeed(ru(f"VBoxManage {cmd}")) + + + def remove_uuids(output: str) -> str: + return "\n".join( + [line for line in (output or "").splitlines() if not line.startswith("UUID:")] + ) + - $machine->waitForX; + machine.wait_for_x() + # fmt: off ${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"} + # fmt: on ${testScript} + # (keep black happy) ''; meta = with pkgs.stdenv.lib.maintainers; { @@ -393,133 +409,129 @@ let unfreeTests = mapAttrs (mkVBoxTest true vboxVMsWithExtpack) { enable-extension-pack = '' - createVM_testExtensionPack; - vbm("startvm testExtensionPack"); - waitForStartup_testExtensionPack; - $machine->screenshot("cli_started"); - waitForVMBoot_testExtensionPack; - $machine->screenshot("cli_booted"); - - $machine->nest("Checking for privilege escalation", sub { - $machine->fail("test -e '/root/VirtualBox VMs'"); - $machine->fail("test -e '/root/.config/VirtualBox'"); - $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); - }); - - shutdownVM_testExtensionPack; - destroyVM_testExtensionPack; + create_vm_testExtensionPack() + vbm("startvm testExtensionPack") + wait_for_startup_testExtensionPack() + machine.screenshot("cli_started") + wait_for_vm_boot_testExtensionPack() + machine.screenshot("cli_booted") + + with machine.nested("Checking for privilege escalation"): + machine.fail("test -e '/root/VirtualBox VMs'") + machine.fail("test -e '/root/.config/VirtualBox'") + machine.succeed("test -e '/home/alice/VirtualBox VMs'") + + shutdown_vm_testExtensionPack() + destroy_vm_testExtensionPack() ''; }; in mapAttrs (mkVBoxTest false vboxVMs) { simple-gui = '' - createVM_simple; - $machine->succeed(ru "VirtualBox &"); - $machine->waitUntilSucceeds( - ru "xprop -name 'Oracle VM VirtualBox Manager'" - ); - $machine->sleep(5); - $machine->screenshot("gui_manager_started"); # Home to select Tools, down to move to the VM, enter to start it. - $machine->sendKeys("home"); - $machine->sendKeys("down"); - $machine->sendKeys("ret"); - $machine->screenshot("gui_manager_sent_startup"); - waitForStartup_simple (sub { - $machine->sendKeys("home"); - $machine->sendKeys("down"); - $machine->sendKeys("ret"); - }); - $machine->screenshot("gui_started"); - waitForVMBoot_simple; - $machine->screenshot("gui_booted"); - shutdownVM_simple; - $machine->sleep(5); - $machine->screenshot("gui_stopped"); - $machine->sendKeys("ctrl-q"); - $machine->sleep(5); - $machine->screenshot("gui_manager_stopped"); - destroyVM_simple; + def send_vm_startup(): + machine.send_key("home") + machine.send_key("down") + machine.send_key("ret") + + + create_vm_simple() + machine.succeed(ru("VirtualBox &")) + machine.wait_until_succeeds(ru("xprop -name 'Oracle VM VirtualBox Manager'")) + machine.sleep(5) + machine.screenshot("gui_manager_started") + send_vm_startup() + machine.screenshot("gui_manager_sent_startup") + wait_for_startup_simple(send_vm_startup) + machine.screenshot("gui_started") + wait_for_vm_boot_simple() + machine.screenshot("gui_booted") + shutdown_vm_simple() + machine.sleep(5) + machine.screenshot("gui_stopped") + machine.send_key("ctrl-q") + machine.sleep(5) + machine.screenshot("gui_manager_stopped") + destroy_vm_simple() ''; simple-cli = '' - createVM_simple; - vbm("startvm simple"); - waitForStartup_simple; - $machine->screenshot("cli_started"); - waitForVMBoot_simple; - $machine->screenshot("cli_booted"); - - $machine->nest("Checking for privilege escalation", sub { - $machine->fail("test -e '/root/VirtualBox VMs'"); - $machine->fail("test -e '/root/.config/VirtualBox'"); - $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); - }); - - shutdownVM_simple; - destroyVM_simple; + create_vm_simple() + vbm("startvm simple") + wait_for_startup_simple() + machine.screenshot("cli_started") + wait_for_vm_boot_simple() + machine.screenshot("cli_booted") + + with machine.nested("Checking for privilege escalation"): + machine.fail("test -e '/root/VirtualBox VMs'") + machine.fail("test -e '/root/.config/VirtualBox'") + machine.succeed("test -e '/home/alice/VirtualBox VMs'") + + shutdown_vm_simple() + destroy_vm_simple() ''; headless = '' - createVM_headless; - $machine->succeed(ru("VBoxHeadless --startvm headless & disown %1")); - waitForStartup_headless; - waitForVMBoot_headless; - shutdownVM_headless; - destroyVM_headless; + create_vm_headless() + machine.succeed(ru("VBoxHeadless --startvm headless & disown %1")) + wait_for_startup_headless() + wait_for_vm_boot_headless() + shutdown_vm_headless() + destroy_vm_headless() ''; host-usb-permissions = '' - my $userUSB = removeUUIDs vbm("list usbhost"); - print STDERR $userUSB; - my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost"); - print STDERR $rootUSB; - - die "USB host devices differ for root and normal user" - if $userUSB ne $rootUSB; - die "No USB host devices found" if $userUSB =~ /<none>/; + user_usb = remove_uuids(vbm("list usbhost")) + print(user_usb, file=sys.stderr) + root_usb = remove_uuids(machine.succeed("VBoxManage list usbhost")) + print(root_usb, file=sys.stderr) + + if user_usb != root_usb: + raise Exception("USB host devices differ for root and normal user") + if "<none>" in user_usb: + raise Exception("No USB host devices found") ''; systemd-detect-virt = '' - createVM_detectvirt; - vbm("startvm detectvirt"); - waitForStartup_detectvirt; - waitForVMBoot_detectvirt; - shutdownVM_detectvirt; - my $result = $machine->succeed("cat '$detectvirt_sharepath/result'"); - chomp $result; - destroyVM_detectvirt; - die "systemd-detect-virt returned \"$result\" instead of \"oracle\"" - if $result ne "oracle"; + create_vm_detectvirt() + vbm("startvm detectvirt") + wait_for_startup_detectvirt() + wait_for_vm_boot_detectvirt() + shutdown_vm_detectvirt() + result = machine.succeed(f"cat '{detectvirt_sharepath}/result'").strip() + destroy_vm_detectvirt() + if result != "oracle": + raise Exception(f'systemd-detect-virt returned "{result}" instead of "oracle"') ''; net-hostonlyif = '' - createVM_test1; - createVM_test2; + create_vm_test1() + create_vm_test2() - vbm("startvm test1"); - waitForStartup_test1; - waitForVMBoot_test1; + vbm("startvm test1") + wait_for_startup_test1() + wait_for_vm_boot_test1() - vbm("startvm test2"); - waitForStartup_test2; - waitForVMBoot_test2; + vbm("startvm test2") + wait_for_startup_test2() + wait_for_vm_boot_test2() - $machine->screenshot("net_booted"); + machine.screenshot("net_booted") - my $test1IP = waitForIP_test1 1; - my $test2IP = waitForIP_test2 1; + test1_ip = wait_for_ip_test1(1) + test2_ip = wait_for_ip_test2(1) - $machine->succeed("echo '$test2IP' | nc -N '$test1IP' 1234"); - $machine->succeed("echo '$test1IP' | nc -N '$test2IP' 1234"); + machine.succeed(f"echo '{test2_ip}' | nc -N '{test1_ip}' 1234") + machine.succeed(f"echo '{test1_ip}' | nc -N '{test2_ip}' 1234") - $machine->waitUntilSucceeds("nc -N '$test1IP' 5678 < /dev/null >&2"); - $machine->waitUntilSucceeds("nc -N '$test2IP' 5678 < /dev/null >&2"); + machine.wait_until_succeeds(f"nc -N '{test1_ip}' 5678 < /dev/null >&2") + machine.wait_until_succeeds(f"nc -N '{test2_ip}' 5678 < /dev/null >&2") - shutdownVM_test1; - shutdownVM_test2; + shutdown_vm_test1() + shutdown_vm_test2() - destroyVM_test1; - destroyVM_test2; + destroy_vm_test1() + destroy_vm_test2() ''; } // (if enableUnfree then unfreeTests else {}) diff --git a/pkgs/applications/audio/audacity/default.nix b/pkgs/applications/audio/audacity/default.nix index 18f2b4f67cd..20526c8c6c5 100644 --- a/pkgs/applications/audio/audacity/default.nix +++ b/pkgs/applications/audio/audacity/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Sound editor with graphical UI"; - homepage = "http://audacityteam.org/"; + homepage = "https://www.audacityteam.org/"; license = licenses.gpl2Plus; maintainers = with maintainers; [ lheckemann ]; platforms = intersectLists platforms.linux platforms.x86; # fails on ARM diff --git a/pkgs/applications/audio/axoloti/libusb1.nix b/pkgs/applications/audio/axoloti/libusb1.nix index 49b788f6653..255cf3f5e3b 100644 --- a/pkgs/applications/audio/axoloti/libusb1.nix +++ b/pkgs/applications/audio/axoloti/libusb1.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: +{ stdenv, lib, fetchurl, pkgconfig, systemd ? null, libobjc, IOKit, fetchpatch }: stdenv.mkDerivation rec { name = "libusb-1.0.19"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; preFixup = stdenv.lib.optionalString stdenv.isLinux '' - sed 's,-ludev,-L${systemd.lib}/lib -ludev,' -i $out/lib/libusb-1.0.la + sed 's,-ludev,-L${lib.getLib systemd}/lib -ludev,' -i $out/lib/libusb-1.0.la ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/bchoppr/default.nix b/pkgs/applications/audio/bchoppr/default.nix index 1b642e1ed69..7d4d53408d2 100644 --- a/pkgs/applications/audio/bchoppr/default.nix +++ b/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.6.4"; + version = "1.8.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = "${version}"; - sha256 = "16b0sg7q2b8l4y4bp5s3yzsj9j6jayjy2mlvqkby6l7hcgjcj493"; + sha256 = "1nd6byy75f0rbz9dm9drhxmpsfhxhg0y7q3v2m3098llynhy9k2j"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/bjumblr/default.nix b/pkgs/applications/audio/bjumblr/default.nix index 458fe20937a..e1a5bee64b3 100644 --- a/pkgs/applications/audio/bjumblr/default.nix +++ b/pkgs/applications/audio/bjumblr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "BJumblr"; - version = "1.4.0"; + version = "1.4.2"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "03x1gvri9yk000fvvc8zvvywf38cc41vkyhhp9xby71b23n5wbn0"; + sha256 = "0kl6hrxmqrdf0195bfnzsa2h1073fgiqrfhg2276fm1954sm994v"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index de8e55a9545..c0d11e1fe5a 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "0.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "1pcch7j1wgsb77mjy58hl3z43p83dv0vcmyh129m9k216b09gy29"; + sha256 = "1c09acqrbd387ba41f8ch1qykdap5h6cg9if5pgd16i4dmjnpghj"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/dragonfly-reverb/default.nix b/pkgs/applications/audio/dragonfly-reverb/default.nix index b42929ff204..e5cbcd4a2e2 100644 --- a/pkgs/applications/audio/dragonfly-reverb/default.nix +++ b/pkgs/applications/audio/dragonfly-reverb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "dragonfly-reverb"; - version = "3.1.1"; + version = "3.2.1"; src = fetchFromGitHub { owner = "michaelwillis"; repo = "dragonfly-reverb"; rev = version; - sha256 = "188cm45hr0i33m4h2irql1wrsmsfis65s706wjiid0z59q47rf9p"; + sha256 = "0vfm2510shah67k87mdyar4wr4vqwii59y9lqfhwm6blxparkrqa"; fetchSubmodules = true; }; diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index de90bd038be..515f8a6f9af 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -5,8 +5,7 @@ , pkgconfig , cmake , llvm -# TODO: put back when it builds again -# , emscripten +, emscripten , openssl , libsndfile , libmicrohttpd @@ -21,13 +20,13 @@ with stdenv.lib.strings; let - version = "unstable-2020-08-03"; + version = "unstable-2020-08-27"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; - rev = "b6045f4592384076d3b383d116e602a95a000eb3"; - sha256 = "1wcpilwnkc7rrbv9gbkj5hb7kamkh8nrc3r4hbcvbz5ar2pfc6d5"; + rev = "c10f316fa90f338e248787ebf55e3795c3a0d70e"; + sha256 = "068pm04ddafbsj2r8akdpqyzb0m8mp9ql0rgi83hcqs4ndr8v7sb"; fetchSubmodules = true; }; @@ -47,7 +46,7 @@ let inherit src; nativeBuildInputs = [ makeWrapper pkgconfig cmake vim which ]; - buildInputs = [ llvm /*emscripten*/ openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; + buildInputs = [ llvm emscripten openssl libsndfile libmicrohttpd gnutls libtasn1 p11-kit ]; passthru = { diff --git a/pkgs/applications/audio/faust/faust2jack.nix b/pkgs/applications/audio/faust/faust2jack.nix index 370c25ecd74..0f703704961 100644 --- a/pkgs/applications/audio/faust/faust2jack.nix +++ b/pkgs/applications/audio/faust/faust2jack.nix @@ -4,6 +4,7 @@ , alsaLib , opencv2 , libsndfile +, which }: faust.wrapWithBuildEnv { @@ -21,6 +22,7 @@ faust.wrapWithBuildEnv { alsaLib opencv2 libsndfile + which ]; } diff --git a/pkgs/applications/audio/faust/faust2jaqt.nix b/pkgs/applications/audio/faust/faust2jaqt.nix index a2f1c2139a1..753208c54c2 100644 --- a/pkgs/applications/audio/faust/faust2jaqt.nix +++ b/pkgs/applications/audio/faust/faust2jaqt.nix @@ -3,6 +3,7 @@ , opencv2 , qt4 , libsndfile +, alsaLib , which }: @@ -20,6 +21,7 @@ faust.wrapWithBuildEnv { opencv2 qt4 libsndfile + alsaLib which ]; diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index 114cf5e192f..f173d2fe02b 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -11,13 +11,13 @@ with stdenv.lib; mkDerivation rec { pname = "fmit"; - version = "1.2.13"; + version = "1.2.14"; src = fetchFromGitHub { owner = "gillesdegottex"; repo = "fmit"; rev = "v${version}"; - sha256 = "1qyskam053pvlap1av80rgp12pzhr92rs88vqs6s0ia3ypnixcc6"; + sha256 = "1q062pfwz2vr9hbfn29fv54ip3jqfd9r99nhpr8w7mn1csy38azx"; }; nativeBuildInputs = [ qmake itstool wrapQtAppsHook ]; diff --git a/pkgs/applications/audio/geonkick/default.nix b/pkgs/applications/audio/geonkick/default.nix index c2dc39fe610..dcfb5426034 100644 --- a/pkgs/applications/audio/geonkick/default.nix +++ b/pkgs/applications/audio/geonkick/default.nix @@ -2,20 +2,21 @@ stdenv.mkDerivation rec { pname = "geonkick"; - version = "2.3.3"; + version = "2.3.7"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "0h1abb6q2bmi01a3v37adkc4zc03j47jpvffz8p2lpp33xhljghs"; + sha256 = "1wdcbwiyy6i5agq5lffkyilyc8mv1cc4mp9h0nybn240vb2flqc2"; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ redkite libsndfile rapidjson libjack2 lv2 libX11 cairo ]; - cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" ]; + # https://github.com/iurie-sw/geonkick/issues/120 + cmakeFlags = [ "-DGKICK_REDKITE_SDK_PATH=${redkite}" "-DCMAKE_INSTALL_LIBDIR=lib" ]; meta = { homepage = "https://gitlab.com/iurie-sw/geonkick"; diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 8459967a363..145ba68b08b 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,5 +1,16 @@ -{ stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 -, lv2, pkgconfig, libGLU, libGL }: +{ stdenv +, fetchFromGitHub +, fetchpatch +, xorg +, freetype +, alsaLib +, curl +, libjack2 +, lv2 +, pkgconfig +, libGLU +, libGL +}: stdenv.mkDerivation { version = "0.9.0"; @@ -20,7 +31,15 @@ CXXFLAGS = "-DHAVE_LROUND"; - patchPhase = '' + patches = [ + # gcc9 compatibility https://github.com/mtytel/helm/pull/233 + (fetchpatch { + url = "https://github.com/mtytel/helm/commit/cb611a80bd5a36d31bfc31212ebbf79aa86c6f08.patch"; + sha256 = "1i2289srcfz17c3zzab6f51aznzdj62kk53l4afr32bkjh9s4ixk"; + }) + ]; + + prePatch = '' sed -i 's|usr/||g' Makefile ''; diff --git a/pkgs/applications/audio/mooSpace/default.nix b/pkgs/applications/audio/mooSpace/default.nix new file mode 100644 index 00000000000..f6958c5e974 --- /dev/null +++ b/pkgs/applications/audio/mooSpace/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, faust2jaqt, faust2lv2 }: +stdenv.mkDerivation rec { + pname = "mooSpace"; + version = "unstable-2020-06-10"; + + src = fetchFromGitHub { + owner = "modularev"; + repo = pname; + rev = "e5440407ea6ef9f7fcca838383b2b9a388c22874"; + sha256 = "10vsbddf6d7i06040850v8xkmqh3bqawczs29kfgakair809wqxl"; + }; + + buildInputs = [ faust2jaqt faust2lv2 ]; + + patchPhase = "mv ${pname}_faust.dsp ${pname}.dsp"; + + buildPhase = '' + faust2jaqt -time -vec -t 0 ${pname}.dsp + faust2lv2 -time -vec -t 0 -gui ${pname}.dsp + ''; + + installPhase = '' + mkdir -p $out/bin + cp ${pname} $out/bin/ + mkdir -p $out/lib/lv2 + cp -r ${pname}.lv2 $out/lib/lv2 + ''; + + meta = { + description = "Variable reverb audio effect, jack and lv2"; + homepage = "https://github.com/modularev/mooSpace"; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.magnetophon ]; + }; +} diff --git a/pkgs/applications/audio/mopidy/iris.nix b/pkgs/applications/audio/mopidy/iris.nix index 796812a9bd0..467ba6fe3f7 100644 --- a/pkgs/applications/audio/mopidy/iris.nix +++ b/pkgs/applications/audio/mopidy/iris.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ configobj requests - tornado_4 + tornado ]); # no tests implemented diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index ae65d9b2f6e..28216020b78 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -21,7 +21,7 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado_4 requests setuptools + gst-python pygobject3 pykka tornado requests setuptools ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests diff --git a/pkgs/applications/audio/musly/default.nix b/pkgs/applications/audio/musly/default.nix index b1e8822cdcf..7ef2b400b76 100644 --- a/pkgs/applications/audio/musly/default.nix +++ b/pkgs/applications/audio/musly/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, eigen, libav_all }: +{ stdenv, fetchFromGitHub, cmake, eigen, libav }: stdenv.mkDerivation { pname = "musly"; version = "unstable-2017-04-26"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1q42wvdwy2pac7bhfraqqj2czw7w2m33ms3ifjl8phm7d87i8825"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ eigen (libav_all.override { vaapiSupport = stdenv.isLinux; }).libav_11 ]; + buildInputs = [ eigen (libav.override { vaapiSupport = stdenv.isLinux; }) ]; fixupPhase = if stdenv.isDarwin then '' install_name_tool -change libmusly.dylib $out/lib/libmusly.dylib $out/bin/musly install_name_tool -change libmusly_resample.dylib $out/lib/libmusly_resample.dylib $out/bin/musly diff --git a/pkgs/applications/audio/ncmpc/default.nix b/pkgs/applications/audio/ncmpc/default.nix index aea50d71d75..ca61aa0cd6f 100644 --- a/pkgs/applications/audio/ncmpc/default.nix +++ b/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.38"; + version = "0.39"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "1kidpd1xrfax3v31q93r9g9b7jd841476q47wgd94h1a86b70gs9"; + sha256 = "08xrcinfm1a7hjycf8la7gnsxbp3six70ks987dr7j42kd42irfq"; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index 90dc4e6db33..2fcbf82107d 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -14,16 +14,16 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "1yx0fc24bgh1x6fdwznc1hqvjq0j7i0zvws3bsyijzs7q48jm0z7"; + sha256 = "1i17pidw2hylijwfn96f2bnswfxxwdln2ydsq8b1q4hfzfbxlfk2"; }; - cargoSha256 = "0bh2shg80xbs2cw10dabrdxkvhf2csk5h9wmmk5z87q6w25paz1f"; + cargoSha256 = "1cpy4wrj9dz2crva4p18f8hzym73x4m2mcfds4ppri4ir7qg29dr"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; diff --git a/pkgs/applications/audio/netease-cloud-music/default.nix b/pkgs/applications/audio/netease-cloud-music/default.nix deleted file mode 100644 index c4cc291d026..00000000000 --- a/pkgs/applications/audio/netease-cloud-music/default.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, lib, fontconfig, zlib, libGL, glib, pango -, gdk-pixbuf, freetype, atk, cairo, libsForQt5, xorg -, sqlite, taglib, nss, nspr, cups, dbus, alsaLib -, libpulseaudio, deepin, qt5, harfbuzz, p11-kit -, libgpgerror, libudev0-shim, makeWrapper, dpkg, fetchurl }: -let - rpath = lib.makeLibraryPath [ - fontconfig.lib - zlib - stdenv.cc.cc.lib - libGL - glib - pango - gdk-pixbuf - freetype - atk - cairo - libsForQt5.vlc - sqlite - taglib - nss - nspr - cups.lib - dbus.lib - alsaLib - libpulseaudio - xorg.libX11 - xorg.libXext - xorg.libXtst - xorg.libXdamage - xorg.libXScrnSaver - xorg.libxcb - xorg.libXi - deepin.qcef - qt5.qtwebchannel - qt5.qtbase - qt5.qtx11extras - qt5.qtdeclarative - harfbuzz - p11-kit - libgpgerror - ]; - - runtimeLibs = lib.makeLibraryPath [ libudev0-shim ]; - -in stdenv.mkDerivation rec { - pname = "netease-cloud-music"; - version = "1.2.0"; - src = fetchurl { - url = "http://d1.music.126.net/dmusic/netease-cloud-music_1.2.0_amd64_deepin_stable_20190424.deb"; - sha256 = "0hg8jqim77vd0fmk8gfbz2fmlj99byxcm9jn70xf7vk1sy7wp6h1"; - curlOpts = "-A 'Mozilla/5.0'"; - }; - unpackCmd = "${dpkg}/bin/dpkg -x $src ."; - sourceRoot = "."; - - nativeBuildInputs = [ qt5.wrapQtAppsHook makeWrapper ]; - - installPhase = '' - mkdir -p $out - cp -r usr/* $out - ''; - - preFixup = '' - local exefile="$out/bin/netease-cloud-music" - patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$exefile" - patchelf --set-rpath "$out/libs:$(patchelf --print-rpath "$exefile"):${rpath}" "$exefile" - - wrapProgram $out/bin/netease-cloud-music \ - --prefix LD_LIBRARY_PATH : "${runtimeLibs}" \ - --set QCEF_INSTALL_PATH "${deepin.qcef}/lib/qcef" - ''; - - meta = { - description = "Client for Netease Cloud Music service"; - homepage = "https://music.163.com"; - platforms = [ "i686-linux" "x86_64-linux" ]; - maintainers = [ stdenv.lib.maintainers.mlatus ]; - license = stdenv.lib.licenses.unfreeRedistributable; - }; -} diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 276fe75dd9f..2aeae1f1890 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "0s4jmcg1n6ayxf7x0amq67rgn6y127h98s2k4fcna6n9477krrwf"; + sha256 = "0sbccsisk9w0gnblvhg7wk1c5ydppldjbvaa0zhl3yrid5a363ah"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/pkgs/applications/audio/puddletag/default.nix b/pkgs/applications/audio/puddletag/default.nix index a0813fa0c80..47ea078c4b2 100644 --- a/pkgs/applications/audio/puddletag/default.nix +++ b/pkgs/applications/audio/puddletag/default.nix @@ -1,37 +1,34 @@ -{ stdenv, fetchFromGitHub, python2Packages, chromaprint }: +{ stdenv, fetchFromGitHub, python3Packages, chromaprint }: -python2Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "puddletag"; - version = "1.2.0"; + version = "2.0.1"; src = fetchFromGitHub { - owner = "keithgg"; - repo = "puddletag"; - rev = "v${version}"; - sha256 = "1g6wa91awy17z5b704yi9kfynnvfm9lkrvpfvwccscr1h8s3qmiz"; + owner = "keithgg"; + repo = "puddletag"; + rev = version; + sha256 = "sha256-9l8Pc77MX5zFkOqU00HFS8//3Bzd2OMnVV1brmWsNAQ="; }; - setSourceRoot = '' - sourceRoot=$(echo */source) - ''; + sourceRoot = "source/source"; - disabled = python2Packages.isPy3k; # work to support python 3 has not begun - - propagatedBuildInputs = [ chromaprint ] ++ (with python2Packages; [ + propagatedBuildInputs = [ chromaprint ] ++ (with python3Packages; [ configobj mutagen pyparsing - pyqt4 + pyqt5 ]); doCheck = false; # there are no tests + dontStrip = true; # we are not generating any binaries meta = with stdenv.lib; { description = "An audio tag editor similar to the Windows program, Mp3tag"; - homepage = "https://docs.puddletag.net"; - license = licenses.gpl3; + homepage = "https://docs.puddletag.net"; + license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; - platforms = platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/audio/pulseaudio-dlna/default.nix b/pkgs/applications/audio/pulseaudio-dlna/default.nix index 75990d593df..c0986880c09 100644 --- a/pkgs/applications/audio/pulseaudio-dlna/default.nix +++ b/pkgs/applications/audio/pulseaudio-dlna/default.nix @@ -4,7 +4,7 @@ , faacSupport ? false, faac ? null , flacSupport ? true, flac ? null , soxSupport ? true, sox ? null -, vorbisSupport ? true, vorbisTools ? null +, vorbisSupport ? true, vorbis-tools ? null }: assert mp3Support -> lame != null; @@ -12,7 +12,7 @@ assert opusSupport -> opusTools != null; assert faacSupport -> faac != null; assert flacSupport -> flac != null; assert soxSupport -> sox != null; -assert vorbisSupport -> vorbisTools != null; +assert vorbisSupport -> vorbis-tools != null; let zeroconf = pythonPackages.callPackage ./zeroconf.nix { }; @@ -37,7 +37,7 @@ pythonPackages.buildPythonApplication { ++ stdenv.lib.optional faacSupport faac ++ stdenv.lib.optional flacSupport flac ++ stdenv.lib.optional soxSupport sox - ++ stdenv.lib.optional vorbisSupport vorbisTools; + ++ stdenv.lib.optional vorbisSupport vorbis-tools; # upstream has no tests checkPhase = '' diff --git a/pkgs/applications/audio/qsynth/default.nix b/pkgs/applications/audio/qsynth/default.nix index 5da8f4cd462..af59bb56eb9 100644 --- a/pkgs/applications/audio/qsynth/default.nix +++ b/pkgs/applications/audio/qsynth/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "qsynth"; - version = "0.6.2"; + version = "0.6.3"; src = fetchurl { url = "mirror://sourceforge/qsynth/${pname}-${version}.tar.gz"; - sha256 = "0cp6vrqrj37rv3a7qfvqrg64j7zwpfj60y5b83mlkzvmg1sgjnlv"; + sha256 = "0xiqmpzpxjvh32vivfj6h33w0ahmyfjzjb41b6fnf92bbg9k6mqv"; }; nativeBuildInputs = [ autoconf pkgconfig ]; diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix index 1cbd5b3afa2..0ae65cb8c37 100644 --- a/pkgs/applications/audio/renoise/default.nix +++ b/pkgs/applications/audio/renoise/default.nix @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { pname = "renoise"; - version = "3.2.1"; + version = "3.2.2"; src = if stdenv.hostPlatform.system == "x86_64-linux" then @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { "https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" "https://web.archive.org/web/https://files.renoise.com/demo/Renoise_${urlVersion version}_Demo_Linux.tar.gz" ]; - sha256 = "0dhcidgnjzd4abw0xw1waj9mazp03nbvjcr2xx09l8gnfrkvny46"; + sha256 = "1v249kmyidx55kppk3sry7yg6hl1a91ixhnwz36h4y134fs7bkrl"; } else releasePath diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix index 68eefadf411..cf3f173a096 100644 --- a/pkgs/applications/audio/sonata/default.nix +++ b/pkgs/applications/audio/sonata/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gettext, intltool, wrapGAppsHook -, python3Packages, gnome3, gtk3, gsettings-desktop-schemas, gobject-introspection }: +{ stdenv, fetchFromGitHub, wrapGAppsHook, gettext +, python3Packages, gnome3, gtk3, glib, gdk-pixbuf, gsettings-desktop-schemas, gobject-introspection }: let inherit (python3Packages) buildPythonApplication isPy3k dbus-python pygobject3 mpd2 setuptools; @@ -16,26 +16,38 @@ in buildPythonApplication rec { disabled = !isPy3k; - nativeBuildInputs = [ pkgconfig gettext ]; + nativeBuildInputs = [ + gettext + gobject-introspection + wrapGAppsHook + ]; + buildInputs = [ - intltool wrapGAppsHook + glib gnome3.adwaita-icon-theme gsettings-desktop-schemas + gtk3 + gdk-pixbuf + ]; + + # The optional tagpy dependency (for editing metadata) is not yet + # included because it's difficult to build. + pythonPath = [ + dbus-python + mpd2 + pygobject3 + setuptools ]; + # Otherwise the setup hook for gobject-introspection is not run: + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + postPatch = '' # Remove "Local MPD" tab which is not suitable for NixOS. sed -i '/localmpd/d' sonata/consts.py ''; - propagatedBuildInputs = [ - gobject-introspection gtk3 pygobject3 setuptools - ]; - - # The optional tagpy dependency (for editing metadata) is not yet - # included because it's difficult to build. - pythonPath = [ dbus-python pygobject3 mpd2 ]; - meta = { description = "An elegant client for the Music Player Daemon"; longDescription = '' diff --git a/pkgs/applications/audio/sonic-visualiser/default.nix b/pkgs/applications/audio/sonic-visualiser/default.nix index e8b6a4d4313..2593bf38d19 100644 --- a/pkgs/applications/audio/sonic-visualiser/default.nix +++ b/pkgs/applications/audio/sonic-visualiser/default.nix @@ -1,8 +1,8 @@ # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html { stdenv, fetchurl, alsaLib, bzip2, fftw, libjack2, libX11, liblo -, libmad, libogg, lrdf, librdf_raptor, librdf_rasqal, libsamplerate -, libsndfile, pkgconfig, libpulseaudio, qtbase, qtsvg, redland +, libmad, lrdf, librdf_raptor, librdf_rasqal, libsamplerate +, libsndfile, pkg-config, libpulseaudio, qtbase, qtsvg, redland , rubberband, serd, sord, vamp-plugin-sdk, fftwFloat , capnproto, liboggz, libfishsound, libid3tag, opusfile , wrapQtAppsHook @@ -10,13 +10,14 @@ stdenv.mkDerivation rec { pname = "sonic-visualiser"; - version = "4.0.1"; + version = "4.2"; src = fetchurl { - url = "https://code.soundsoftware.ac.uk/attachments/download/2607/${pname}-${version}.tar.gz"; - sha256 = "14674adzp3chilymna236qyvci3b1zmi3wyz696wk7bcd3ndpsg6"; + url = "https://code.soundsoftware.ac.uk/attachments/download/2755/${pname}-${version}.tar.gz"; + sha256 = "1wsvranhvdl21ksbinbgb55qvs3g2d4i57ssj1vx2aln6m01ms9q"; }; + nativeBuildInputs = [ pkg-config wrapQtAppsHook ]; buildInputs = [ libsndfile qtbase qtsvg fftw fftwFloat bzip2 lrdf rubberband libsamplerate vamp-plugin-sdk alsaLib librdf_raptor librdf_rasqal redland @@ -27,7 +28,6 @@ stdenv.mkDerivation rec { # portaudio libpulseaudio libmad - libogg # ? libfishsound liblo libX11 @@ -37,15 +37,13 @@ stdenv.mkDerivation rec { opusfile ]; - nativeBuildInputs = [ pkgconfig wrapQtAppsHook ]; - - enableParallelBuilding = true; - # comment out the tests preConfigure = '' sed -i 's/sub_test_svcore_/#sub_test_svcore_/' sonic-visualiser.pro ''; + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "View and analyse contents of music audio files"; homepage = "https://www.sonicvisualiser.org/"; diff --git a/pkgs/applications/audio/soundkonverter/default.nix b/pkgs/applications/audio/soundkonverter/default.nix index df5806b50b9..3e133a0caa1 100644 --- a/pkgs/applications/audio/soundkonverter/default.nix +++ b/pkgs/applications/audio/soundkonverter/default.nix @@ -1,6 +1,6 @@ # currently needs to be installed into an environment and needs a `kbuildsycoca5` run afterwards for plugin discovery { - mkDerivation, fetchFromGitHub, lib, makeWrapper, + mkDerivation, fetchFromGitHub, fetchpatch, lib, makeWrapper, cmake, extra-cmake-modules, pkgconfig, libkcddb, kconfig, kconfigwidgets, ki18n, kdelibs4support, kio, solid, kwidgetsaddons, kxmlgui, qtbase, phonon, @@ -53,6 +53,15 @@ mkDerivation rec { rev = "v" + version; sha256 = "1g2khdsjmsi4zzynkq8chd11cbdhjzmi37r9jhpal0b730nq9x7l"; }; + patches = [ + # already merged into master, so it can go during the next release + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/dfaust/soundkonverter/pull/87.patch"; + sha256 = "sha256-XIpD4ZMTZVcu+F27OtpRy51H+uQgpd5l22IZ6XsD64w="; + name = "soundkonverter_taglib.patch"; + stripLen = 1; + }) + ]; enableParallelBuilding = true; nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig kdelibs4support makeWrapper ]; propagatedBuildInputs = [ libkcddb kconfig kconfigwidgets ki18n kdelibs4support kio solid kwidgetsaddons kxmlgui qtbase phonon]; diff --git a/pkgs/applications/audio/surge/default.nix b/pkgs/applications/audio/surge/default.nix new file mode 100644 index 00000000000..1614bbfae66 --- /dev/null +++ b/pkgs/applications/audio/surge/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchFromGitHub, cmake, git, pkg-config, python3 +, cairo, libsndfile, libxcb, libxkbcommon, xcbutil, xcbutilcursor, xcbutilkeysyms, zenity +}: + +stdenv.mkDerivation rec { + pname = "surge"; + version = "1.7.1"; + + src = fetchFromGitHub { + owner = "surge-synthesizer"; + repo = pname; + rev = "release_${version}"; + sha256 = "1b3ccc78vrpzy18w7070zfa250dnd1bww147xxcnj457vd6n065s"; + leaveDotGit = true; # for SURGE_VERSION + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake git pkg-config python3 ]; + buildInputs = [ cairo libsndfile libxcb libxkbcommon xcbutil xcbutilcursor xcbutilkeysyms zenity ]; + + postPatch = '' + substituteInPlace src/common/SurgeStorage.cpp --replace "/usr/share/Surge" "$out/share/surge" + substituteInPlace src/common/gui/PopupEditorDialog.cpp --replace '"zenity' '"${zenity}/bin/zenity' + substituteInPlace src/linux/UserInteractionsLinux.cpp --replace '"zenity' '"${zenity}/bin/zenity' + substituteInPlace vstgui.surge/vstgui/lib/platform/linux/x11fileselector.cpp --replace /usr/bin/zenity ${zenity}/bin/zenity + ''; + + installPhase = '' + mkdir -p $out/lib/lv2 $out/lib/vst3 $out/share/surge + cp -r surge_products/Surge.lv2 $out/lib/lv2/ + cp -r surge_products/Surge.vst3 $out/lib/vst3/ + cp -r ../resources/data/* $out/share/surge/ + ''; + + doInstallCheck = true; + installCheckPhase = '' + cd .. + build/surge-headless + ''; + + meta = with stdenv.lib; { + description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)"; + homepage = "https://surge-synthesizer.github.io"; + license = licenses.gpl3; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ magnetophon orivej ]; + }; +} diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/applications/audio/synthv1/default.nix index c7e936d28e5..74f68283fd6 100644 --- a/pkgs/applications/audio/synthv1/default.nix +++ b/pkgs/applications/audio/synthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "synthv1"; - version = "0.9.14"; + version = "0.9.15"; src = fetchurl { url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz"; - sha256 = "08n83krkak20924flb9azhm9hn40lyfvn29m63zs3lw3wajf0b40"; + sha256 = "047y2l7ipzv00ly54f074v6p043xjml7vz0svc7z81bhx74vs0ix"; }; buildInputs = [ qtbase qttools libjack2 alsaLib liblo lv2 ]; diff --git a/pkgs/applications/audio/tunefish/default.nix b/pkgs/applications/audio/tunefish/default.nix new file mode 100644 index 00000000000..72802c4f878 --- /dev/null +++ b/pkgs/applications/audio/tunefish/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, pkg-config, python3 +, alsaLib, curl, freetype, gtk3, libGL, libX11, libXext, libXinerama, webkitgtk +}: + +stdenv.mkDerivation { + pname = "tunefish"; + version = "unstable-2020-08-13"; + + src = fetchFromGitHub { + owner = "jpcima"; + repo = "tunefish"; + rev = "b3d83cc66201619f6399500f6897fbeb1786d9ed"; + fetchSubmodules = true; + sha256 = "0rjpq3s609fblzkvnc9729glcnfinmxljh0z8ldpzr245h367zxh"; + }; + + nativeBuildInputs = [ pkg-config python3 ]; + buildInputs = [ alsaLib curl freetype gtk3 libGL libX11 libXext libXinerama webkitgtk ]; + + postPatch = '' + patchShebangs src/tunefish4/generate-lv2-ttl.py + ''; + + makeFlags = [ + "-C" "src/tunefish4/Builds/LinuxMakefile" + "CONFIG=Release" + ]; + + installPhase = '' + mkdir -p $out/lib/lv2 + cp -r src/tunefish4/Builds/LinuxMakefile/build/Tunefish4.lv2 $out/lib/lv2 + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "https://tunefish-synth.com/"; + description = "Virtual analog synthesizer LV2 plugin"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ orivej ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/blockchains/clightning.nix b/pkgs/applications/blockchains/clightning.nix index f289139d8d8..43de23b68fc 100644 --- a/pkgs/applications/blockchains/clightning.nix +++ b/pkgs/applications/blockchains/clightning.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "clightning"; - version = "0.9.0"; + version = "0.9.0-1"; src = fetchurl { url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip"; - sha256 = "11ig5bqxvhx82gq9nl7c5iqaf3x8xbwfx7cf2318pyqdimz4r1v6"; + sha256 = "01cwcrqysqsrf96bbbj0grm8j5m46a3acgwy0kzxdx05jdzld9sc"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index f69489c7ffe..5c3f2207643 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-ethereum"; - version = "1.9.19"; + version = "1.9.20"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "08wf7qklk31dky2z0l2j9vbyr8721gkvy4dsc60afwrwihwd8lrp"; + sha256 = "031cbl8yqw5g5yrm5h1x8s5ckdw2xkym46009l579zvafn2vcnj7"; }; runVend = true; @@ -42,6 +42,6 @@ buildGoModule rec { homepage = "https://geth.ethereum.org/"; description = "Official golang implementation of the Ethereum protocol"; license = with licenses; [ lgpl3 gpl3 ]; - maintainers = with maintainers; [ adisbladis lionello xrelkd ]; + maintainers = with maintainers; [ adisbladis lionello xrelkd RaghavSood ]; }; } diff --git a/pkgs/applications/blockchains/lnd.nix b/pkgs/applications/blockchains/lnd.nix index b6c7879c3b8..831195f06f0 100644 --- a/pkgs/applications/blockchains/lnd.nix +++ b/pkgs/applications/blockchains/lnd.nix @@ -4,16 +4,16 @@ buildGoModule rec { pname = "lnd"; - version = "0.10.3-beta"; + version = "0.11.0-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "129vi8z2sk4hagk7axa675nba6sbj9km88zlq8a1g8di7v2k9z6a"; + sha256 = "1r1hwz8ka5mnmrvj9zcd78kn68g8fg3d4bdx9i0xy4sc2hh1dcpj"; }; - vendorSha256 = "0a4bk2qry0isnrvl0adwikqn6imxwzlaq5j3nglb5rmwwq2cdz0r"; + vendorSha256 = "090b9sxvdwh787w0rhrcbky9pbx64qgqx1pvk9ysk3886nxdhf7k"; doCheck = false; diff --git a/pkgs/applications/blockchains/wasabiwallet/default.nix b/pkgs/applications/blockchains/wasabiwallet/default.nix index a098f14668e..3b4ec1c49c4 100644 --- a/pkgs/applications/blockchains/wasabiwallet/default.nix +++ b/pkgs/applications/blockchains/wasabiwallet/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "wasabiwallet"; - version = "1.1.11.1"; + version = "1.1.12"; src = fetchurl { - url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/WasabiLinux-${version}.tar.gz"; - sha256 = "04v8f2h67aqvcb5a8vmzbp2sqnq7g4m0v1ng52ccb4ii668ya8hy"; + url = "https://github.com/zkSNACKs/WalletWasabi/releases/download/v${version}/Wasabi-${version}.tar.gz"; + sha256 = "0nfd0pwsgrkaxcxfs8wb3i8kslfcqnc91iahw3rmlcxdzb81kjs4"; }; dontBuild = true; diff --git a/pkgs/applications/editors/android-studio/common.nix b/pkgs/applications/editors/android-studio/common.nix index f1e680f60e6..605d810b3d9 100644 --- a/pkgs/applications/editors/android-studio/common.nix +++ b/pkgs/applications/editors/android-studio/common.nix @@ -200,7 +200,7 @@ in runCommand platforms = [ "x86_64-linux" ]; maintainers = with maintainers; rec { stable = [ meutraa ]; - beta = [ galagora ]; + beta = [ meutraa ]; canary = [ meutraa ]; dev = canary; }."${channel}"; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index c622a1fcead..e84d2e9dac1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,14 +14,14 @@ let sha256Hash = "15vm7fvi8c286wx9f28z6ysvm8wqqda759qql0zy9simwx22gy7j"; }; betaVersion = { - version = "4.1.0.14"; # "Android Studio 4.1 Beta 4" - build = "201.6667167"; - sha256Hash = "11lkwcbzdl86cyz4lci65cx9z5jjhrc4z40maqx2r5hw1xka9290"; + version = "4.1.0.17"; # "Android Studio 4.1 RC 2" + build = "201.6776251"; + sha256Hash = "sha256-3W+eUcffRk7lZxbvf3X/Np4hkwAUqU51sQ061XR7Ddc="; }; latestVersion = { # canary & dev - version = "4.2.0.5"; # "Android Studio 4.2 Canary 5" - build = "201.6682321"; - sha256Hash = "076q6d7kmi0wcsqak7n6ggp1qns4xj1134xcpdzb92qk3dmg3wrh"; + version = "4.2.0.8"; # "Android Studio 4.2 Canary 8" + build = "202.6787931"; + sha256Hash = "0y5fzr22dknzxay1bhd1ymhdnmdrpccdw8dswy2z9bxjsvq65n62"; }; in { # Attributes are named by their corresponding release channels diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix index 3e01bcdb0f9..9d5978e605a 100644 --- a/pkgs/applications/editors/brackets/default.nix +++ b/pkgs/applications/editors/brackets/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf +{ stdenv, lib, fetchurl, gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, gconf , cups, libgcrypt_1_5, systemd, dbus, libXdamage, expat }: with stdenv.lib; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { rmdir $out/usr ln -sf $out/opt/brackets/brackets $out/bin/brackets - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0 substituteInPlace $out/opt/brackets/brackets.desktop \ --replace "Exec=/opt/brackets/brackets" "Exec=brackets" diff --git a/pkgs/applications/editors/code-browser/default.nix b/pkgs/applications/editors/code-browser/default.nix new file mode 100644 index 00000000000..11476cae702 --- /dev/null +++ b/pkgs/applications/editors/code-browser/default.nix @@ -0,0 +1,48 @@ +{ stdenv +, fetchurl +, copper +, ruby +, python3 +, qtbase +, gtk3 +, pkg-config +, withQt ? false +, withGtk ? false, wrapQtAppsHook ? null +}: +stdenv.mkDerivation rec { + pname = "code-browser"; + version = "7.1.20"; + src = fetchurl { + url = "https://tibleiz.net/download/code-browser-${version}-src.tar.gz"; + sha256 = "1svi0v3h42h2lrb8c7pjvqc8019v1p20ibsnl48pfhl8d96mmdnz"; + }; + postPatch = '' + substituteInPlace Makefile --replace "LFLAGS=-no-pie" "LFLAGS=-no-pie -L." + substituteInPlace libs/copper-ui/Makefile --replace "moc -o" "${qtbase.dev}/bin/moc -o" + patchShebangs . + ''; + nativeBuildInputs = [ copper + python3 + ruby + qtbase + gtk3 + pkg-config + ] + ++ stdenv.lib.optionals withQt [ wrapQtAppsHook ]; + buildInputs = stdenv.lib.optionals withQt [ qtbase ] + ++ stdenv.lib.optionals withGtk [ gtk3 ]; + makeFlags = [ + "prefix=$(out)" + "COPPER=${copper}/bin/copper-elf64" + "with-local-libs" + "QINC=${qtbase.dev}/include" + ] + ++ stdenv.lib.optionals withQt [ "UI=qt" ] + ++ stdenv.lib.optionals withGtk [ "UI=gtk" ]; + meta = with stdenv.lib; { + description = "Folding text editor, designed to hierarchically structure any kind of text file and especially source code."; + homepage = "https://tibleiz.net/code-browser/"; + license = licenses.gpl2; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix index f228d34a654..c48e342977e 100644 --- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix +++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix @@ -531,6 +531,12 @@ let (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; })); + orgit-forge = super.orgit-forge.overrideAttrs (attrs: { + # searches for Git at build time + nativeBuildInputs = + (attrs.nativeBuildInputs or [ ]) ++ [ external.git ]; + }); + # tries to write to $HOME php-auto-yasnippets = super.php-auto-yasnippets.overrideAttrs (attrs: { HOME = "/tmp"; diff --git a/pkgs/applications/editors/featherpad/default.nix b/pkgs/applications/editors/featherpad/default.nix index c6089fd5308..8343472fa70 100644 --- a/pkgs/applications/editors/featherpad/default.nix +++ b/pkgs/applications/editors/featherpad/default.nix @@ -1,18 +1,18 @@ -{ stdenv, pkgconfig, qt5, fetchFromGitHub }: - -with qt5; - -stdenv.mkDerivation rec { - version = "0.10.0"; +{ stdenv, mkDerivation, pkgconfig, qmake, qttools, qtbase, qtsvg, qtx11extras, fetchFromGitHub }: +mkDerivation rec { pname = "featherpad"; + version = "0.10.0"; + src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; rev = "V${version}"; sha256 = "1wrbs6kni9s3x39cckm9kzpglryxn5vyarilvh9pafbzpc6rc57p"; }; + nativeBuildInputs = [ qmake pkgconfig qttools ]; buildInputs = [ qtbase qtsvg qtx11extras ]; + meta = with stdenv.lib; { description = "Lightweight Qt5 Plain-Text Editor for Linux"; homepage = "https://github.com/tsujan/FeatherPad"; diff --git a/pkgs/applications/editors/gophernotes/default.nix b/pkgs/applications/editors/gophernotes/default.nix new file mode 100644 index 00000000000..e48ee4dd13c --- /dev/null +++ b/pkgs/applications/editors/gophernotes/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gophernotes"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "gopherdata"; + repo = "gophernotes"; + rev = "v${version}"; + sha256 = "0hs92bdrsjqafdkhg2fk3z16h307i32mvbm9f6bb80bgsciysh27"; + }; + + vendorSha256 = "1ylqf1sx0h2kixnq9f3prn3sha43q3ybd5ay57yy5z79qr8zqvxs"; + + meta = with lib; { + description = "Go kernel for Jupyter notebooks"; + homepage = "https://github.com/gopherdata/gophernotes"; + license = licenses.mit; + maintainers = [ maintainers.costrouc ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/applications/editors/kakoune/plugins/case.kak.nix b/pkgs/applications/editors/kakoune/plugins/case.kak.nix new file mode 100644 index 00000000000..20df2872628 --- /dev/null +++ b/pkgs/applications/editors/kakoune/plugins/case.kak.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitLab }: + +stdenv.mkDerivation { + name = "case.kak"; + version = "unstable-2020-04-06"; + + src = fetchFromGitLab { + owner = "FlyingWombat"; + repo = "case.kak"; + rev = "6f1511820aa3abfa118e0f856118adc8113e2185"; + sha256 = "002njrlwgakqgp74wivbppr9qyn57dn4n5bxkr6k6nglk9qndwdp"; + }; + + installPhase = '' + mkdir -p $out/share/kak/autoload/plugins + cp -r rc/case.kak $out/share/kak/autoload/plugins + ''; + + meta = with stdenv.lib; { + description = "Ease navigation between opened buffers in Kakoune"; + homepage = "https://gitlab.com/FlyingWombat/case.kak"; + license = licenses.unlicense; + maintainers = with maintainers; [ eraserhd ]; + platform = platforms.all; + }; +} + diff --git a/pkgs/applications/editors/kakoune/plugins/default.nix b/pkgs/applications/editors/kakoune/plugins/default.nix index 915a5a9ec93..3926973f7ea 100644 --- a/pkgs/applications/editors/kakoune/plugins/default.nix +++ b/pkgs/applications/editors/kakoune/plugins/default.nix @@ -3,6 +3,7 @@ { inherit parinfer-rust; + case-kak = pkgs.callPackage ./case.kak.nix { }; kak-ansi = pkgs.callPackage ./kak-ansi.nix { }; kak-auto-pairs = pkgs.callPackage ./kak-auto-pairs.nix { }; kak-buffers = pkgs.callPackage ./kak-buffers.nix { }; diff --git a/pkgs/applications/editors/kibi/default.nix b/pkgs/applications/editors/kibi/default.nix new file mode 100644 index 00000000000..85ad49a01d6 --- /dev/null +++ b/pkgs/applications/editors/kibi/default.nix @@ -0,0 +1,25 @@ +{ stdenv +, fetchFromGitHub +, rustPlatform +}: + +rustPlatform.buildRustPackage rec { + pname = "kibi"; + version = "0.2.0"; + + cargoSha256 = "0zyqzb3k4ak7h58zjbg9b32hz1vgbbn9i9l85j4vd4aw8mhsz0n9"; + + src = fetchFromGitHub { + owner = "ilai-deutel"; + repo = "kibi"; + rev = "v${version}"; + sha256 = "1cqnzw6gpsmrqcz82zn1x5i6najcr3i7shj0wnqzpwppff9a6yac"; + }; + + meta = with stdenv.lib; { + description = "A text editor in ≤1024 lines of code, written in Rust"; + homepage = "https://github.com/ilai-deutel/kibi"; + license = licenses.mit; + maintainers = with maintainers; [ robertodr ]; + }; +} diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index 26c5ee42152..abf55b42c55 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, glib, alsaLib, makeDesktopItem +{ stdenv, lib, fetchurl, zlib, glib, alsaLib, makeDesktopItem , dbus, gtk2, atk, pango, freetype, fontconfig, libgnome-keyring3, gdk-pixbuf , cairo, cups, expat, libgpgerror, nspr, gnome2, nss, xorg, systemd, libnotify }: @@ -45,9 +45,9 @@ stdenv.mkDerivation rec { mv $out/share/LightTable/light $out/bin/light - ln -sf ${systemd.lib}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 + ln -sf ${lib.getLib systemd}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0 substituteInPlace $out/bin/light \ - --replace "/usr/lib/x86_64-linux-gnu" "${systemd.lib}/lib" \ + --replace "/usr/lib/x86_64-linux-gnu" "${lib.getLib systemd}/lib" \ --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \ --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable" diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix index 13a0e797adc..244649f8663 100644 --- a/pkgs/applications/editors/nano/default.nix +++ b/pkgs/applications/editors/nano/default.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "5.0"; + version = "5.2"; src = fetchurl { url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - sha256 = "0dmagj4p1llb1a2w0iwdrqbd9cgp0bda4s18vwh6y1ndd6z983bw"; + sha256 = "1qd7pn9g5dgzbfg4fb3nqxqgi2iqq0g6x33x8d1mx6mfw51xmhij"; }; nativeBuildInputs = [ texinfo ] ++ optional enableNls gettext; diff --git a/pkgs/applications/editors/neovim/qt.nix b/pkgs/applications/editors/neovim/qt.nix index 8fe93d37c7e..b04c575dded 100644 --- a/pkgs/applications/editors/neovim/qt.nix +++ b/pkgs/applications/editors/neovim/qt.nix @@ -38,6 +38,7 @@ let meta = with stdenv.lib; { description = "Neovim client library and GUI, in Qt5"; + homepage = "https://github.com/equalsraf/neovim-qt"; license = licenses.isc; maintainers = with maintainers; [ peterhoeg ]; inherit (neovim.meta) platforms; diff --git a/pkgs/applications/editors/setzer/default.nix b/pkgs/applications/editors/setzer/default.nix index 5a0ef754db1..0b1dd8fcb9f 100644 --- a/pkgs/applications/editors/setzer/default.nix +++ b/pkgs/applications/editors/setzer/default.nix @@ -17,13 +17,13 @@ python3.pkgs.buildPythonApplication rec { pname = "setzer"; - version = "0.2.8"; + version = "0.3.0"; src = fetchFromGitHub { owner = "cvfosammmm"; repo = "Setzer"; rev = "v${version}"; - sha256 = "1llxxjj038nd2p857bjdyyhzskn56826qi259v47vaqlv9hkifil"; + sha256 = "0gx5fnyi932lswkhdvxfqs0wxx7hz690cbnpv4m3ysydi96mxwiv"; }; format = "other"; diff --git a/pkgs/applications/editors/texstudio/default.nix b/pkgs/applications/editors/texstudio/default.nix index 94837023ca0..8f7e18a35c5 100644 --- a/pkgs/applications/editors/texstudio/default.nix +++ b/pkgs/applications/editors/texstudio/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "texstudio"; - version = "2.12.22"; + version = "3.0.0"; src = fetchFromGitHub { owner = "${pname}-org"; repo = pname; rev = version; - sha256 = "037jvsfln8wav17qj9anxz2a7p51v7ky85wmhdj2hgwp40al651g"; + sha256 = "1663lgl30698awa7fjplr8rjnf6capqvf8z80lzlnkfl5m9ph0jb"; }; nativeBuildInputs = [ qmake wrapQtAppsHook pkgconfig ]; diff --git a/pkgs/applications/editors/typora/default.nix b/pkgs/applications/editors/typora/default.nix index 049ba45f7af..3c55cffdcf1 100644 --- a/pkgs/applications/editors/typora/default.nix +++ b/pkgs/applications/editors/typora/default.nix @@ -2,7 +2,7 @@ , lib , fetchurl , makeWrapper -, electron_8 +, electron_9 , dpkg , gtk3 , glib @@ -13,15 +13,15 @@ }: let - electron = electron_8; + electron = electron_9; in stdenv.mkDerivation rec { pname = "typora"; - version = "0.9.89"; + version = "0.9.95"; src = fetchurl { url = "https://www.typora.io/linux/typora_${version}_amd64.deb"; - sha256 = "0gk8j13z1ymad34zzcy4vqwyjgd5khgyw5xjj9rbzm5v537kqmx6"; + sha256 = "0kgzk7z707vlbjrvykrnw2h6wscmc3h5hxycyz1z1j2cz26fns4p"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix deleted file mode 100644 index 0e3a4a15052..00000000000 --- a/pkgs/applications/editors/vim/qvim.nix +++ /dev/null @@ -1,113 +0,0 @@ -args@{ fetchgit, stdenv, ncurses, pkgconfig, gettext -, lib, config, python, perl, tcl, ruby, qt4 -, libX11, libXext, libSM, libXpm, libXt, libXaw, libXau, libXmu -, libICE -, lua -, features -, luaSupport ? config.vim.lua or true -, perlSupport ? config.vim.perl or false # Perl interpreter -, pythonSupport ? config.vim.python or true -, rubySupport ? config.vim.ruby or true -, nlsSupport ? config.vim.nls or false -, tclSupport ? config.vim.tcl or false -, multibyteSupport ? config.vim.multibyte or false -, cscopeSupport ? config.vim.cscope or false -, netbeansSupport ? config.netbeans or true # eg envim is using it - -# by default, compile with darwin support if we're compiling on darwin, but -# allow this to be disabled by setting config.vim.darwin to false -, darwinSupport ? stdenv.isDarwin && (config.vim.darwin or true) - -# add .nix filetype detection and minimal syntax highlighting support -, ftNixSupport ? config.vim.ftNix or true - -, ... }: with args; - -let tag = "20140827"; - sha256 = "0ncgbcm23z25naicxqkblz0mcl1zar2qwgi37y5ar8q8884w9ml2"; -in { - - name = "qvim-7.4." + tag; - - enableParallelBuilding = true; # test this - - src = fetchgit { - url = "https://bitbucket.org/equalsraf/vim-qt.git"; - rev = "refs/tags/package-" + tag; - inherit sha256; - }; - - # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux - # to meta.platforms.unix - preConfigure = assert (! stdenv.isDarwin); ""; - - configureFlags = [ - "--with-vim-name=qvim" - "--enable-gui=qt" - "--with-features=${features}" - "--disable-xsmp" - "--disable-xsmp_interact" - "--disable-workshop" # Sun Visual Workshop support - "--disable-sniff" # Sniff interface - "--disable-hangulinput" # Hangul input support - "--disable-fontset" # X fontset output support - "--disable-acl" # ACL support - "--disable-gpm" # GPM (Linux mouse daemon) - "--disable-mzscheme" - ] - ++ stdenv.lib.optionals luaSupport [ - "--with-lua-prefix=${lua}" - "--enable-luainterp" - ] - ++ stdenv.lib.optional pythonSupport "--enable-pythoninterp" - ++ stdenv.lib.optional (pythonSupport && stdenv.isDarwin) "--with-python-config-dir=${python}/lib" - ++ stdenv.lib.optional nlsSupport "--enable-nls" - ++ stdenv.lib.optional perlSupport "--enable-perlinterp" - ++ stdenv.lib.optional rubySupport "--enable-rubyinterp" - ++ stdenv.lib.optional tclSupport "--enable-tcl" - ++ stdenv.lib.optional multibyteSupport "--enable-multibyte" - ++ stdenv.lib.optional darwinSupport "--enable-darwin" - ++ stdenv.lib.optional cscopeSupport "--enable-cscope"; - - nativeBuildInputs = [ ncurses pkgconfig libX11 libXext libSM libXpm libXt libXaw - libXau libXmu libICE qt4 - ] - ++ stdenv.lib.optional nlsSupport gettext - ++ stdenv.lib.optional perlSupport perl - ++ stdenv.lib.optional pythonSupport python - ++ stdenv.lib.optional tclSupport tcl - ++ stdenv.lib.optional rubySupport ruby - ++ stdenv.lib.optional luaSupport lua - ; - - postPatch = '' - '' + stdenv.lib.optionalString ftNixSupport '' - # because we cd to src in the main patch phase, we can't just add this - # patch to the list, we have to apply it manually - cd runtime - patch -p2 < ${./ft-nix-support.patch} - cd .. - ''; - - postInstall = stdenv.lib.optionalString stdenv.isLinux '' - rpath=`patchelf --print-rpath $out/bin/qvim`; - for i in $nativeBuildInputs; do - echo adding $i/lib - rpath=$rpath:$i/lib - done - echo $nativeBuildInputs - echo $rpath - patchelf --set-rpath $rpath $out/bin/qvim - ''; - - dontStrip = 1; - - meta = with stdenv.lib; { - description = "The most popular clone of the VI editor (Qt GUI fork)"; - homepage = "https://bitbucket.org/equalsraf/vim-qt/wiki/Home"; - license = licenses.vim; - maintainers = with maintainers; [ smironov ttuegel ]; - platforms = platforms.linux; - }; -} - diff --git a/pkgs/applications/editors/viw/default.nix b/pkgs/applications/editors/viw/default.nix new file mode 100644 index 00000000000..4025bf252b3 --- /dev/null +++ b/pkgs/applications/editors/viw/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + pname = "viw"; + version = "unstable-20171029"; + + src = fetchFromGitHub { + owner = "lpan"; + repo = pname; + rev = "2cf317f6d82a6fa58f284074400297b6dc0f44c2"; + sha256 = "0bnkh57v01zay6ggk0rbddaf75i48h8z06xsv33wfbjldclaljp1"; + }; + + buildInputs = [ ncurses ]; + + makeFlags = [ "CC=cc" ]; + checkFlags = [ "test-command" "test-buffer" "test-state" ]; + + installPhase = '' + install -Dm 755 -t $out/bin viw + install -Dm 644 -t $out/share/doc/${pname} README.md + ''; + + meta = with stdenv.lib; { + description = "VI Worsened, a fun and light clone of VI"; + homepage = "https://github.com/lpan/viw"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ AndersonTorres ]; + }; +} diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 38d695bd74a..57bd73d6019 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -62,7 +62,7 @@ in else [ gtk2 at-spi2-atk wrapGAppsHook ] ++ atomEnv.packages) ++ [ libsecret libXScrnSaver ]; - runtimeDependencies = lib.optional (stdenv.isLinux) [ systemd.lib fontconfig.lib ]; + runtimeDependencies = lib.optional (stdenv.isLinux) [ (lib.getLib systemd) fontconfig.lib ]; nativeBuildInputs = lib.optional (!stdenv.isDarwin) autoPatchelfHook; diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 0bf0435d2fc..bedc8c60c70 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1yar8j6h39gpnq4givxh5cvi336p56sgc8pg32j6sasqk6mxv02c"; - x86_64-darwin = "1d68xkqkd49z7v4y3230l2v77aw34d7jkdbgj0wnc04kv6n8wx88"; + x86_64-linux = "1i4vq8a81jgshn9iqkj8rp0yqihq2bjim27c8sh4vl9d6a8a6vcr"; + x86_64-darwin = "090xj8pq3fdn7dcfrzvgvx906k6gs2xm04xkymz8vpm3a4rq1svn"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.1"; + version = "1.48.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index edb55264354..5039fa4707c 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0f8p25963i7bbm2zxb4ra935maxk3sxims6j873wqwqnzn701diq"; - x86_64-darwin = "0k8ylcbiqvb0cnvbz3059rbyjqxmvig8zf7bfqgln1w591i411c4"; + x86_64-linux = "17frdyli375l20mb7sb5bmw000p9cplj4pagmhnb6nibi9wqypdx"; + x86_64-darwin = "1dh5k36fjdfwhidlsg1grjwy3s9jik3pg6xpdgi6946vzqv1vxll"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.48.1"; + version = "1.48.2"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/gis/gmt/dcw.nix b/pkgs/applications/gis/gmt/dcw.nix new file mode 100644 index 00000000000..58390e89290 --- /dev/null +++ b/pkgs/applications/gis/gmt/dcw.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "dcw-gmt"; + version = "1.1.4"; + src = fetchurl { + url = "ftp://ftp.soest.hawaii.edu/gmt/dcw-gmt-${version}.tar.gz"; + sha256 = "8d47402abcd7f54a0f711365cd022e4eaea7da324edac83611ca035ea443aad3"; + }; + + installPhase = '' + mkdir -p $out/share/dcw-gmt + cp -rv ./* $out/share/dcw-gmt + ''; + + meta = with stdenv.lib; { + homepage = "https://www.soest.hawaii.edu/pwessel/dcw/"; + description = "Vector basemap of the world, for use with GMT"; + longDescription = '' + DCW-GMT is an enhancement to the original 1:1,000,000 scale vector basemap + of the world, available from the Princeton University Digital Map and + Geospatial Information Center. It contains more state boundaries (the + largest 8 countries are now represented) than the original data + source. Information about DCW can be found on Wikipedia + (https://en.wikipedia.org/wiki/Digital_Chart_of_the_World). This data is + for use by GMT, the Generic Mapping Tools. + ''; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ tviti ]; + }; + +} diff --git a/pkgs/applications/gis/gmt/default.nix b/pkgs/applications/gis/gmt/default.nix new file mode 100644 index 00000000000..8c7c7687f3d --- /dev/null +++ b/pkgs/applications/gis/gmt/default.nix @@ -0,0 +1,73 @@ +{ stdenv, fetchurl, cmake, curl, Accelerate, CoreGraphics, CoreVideo +, fftwSinglePrec, netcdf, pcre, gdal, blas, lapack, glibc, ghostscript, dcw-gmt +, gshhg-gmt }: + +/* The onus is on the user to also install: + - ffmpeg for webm or mp4 output + - graphicsmagick for gif output +*/ + +stdenv.mkDerivation rec { + pname = "gmt"; + version = "6.1.0"; + src = fetchurl { + url = "https://github.com/GenericMappingTools/gmt/releases/download/${version}/gmt-${version}-src.tar.gz"; + sha256 = "0vzxzpvbf1sqma2airsibxvqb9m4sajm7jsfr7rrv6q7924c7ijw"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ curl gdal netcdf pcre dcw-gmt gshhg-gmt ] + ++ (if stdenv.isDarwin then [ + Accelerate + CoreGraphics + CoreVideo + ] else [ + glibc + fftwSinglePrec + blas + lapack + ]); + + propagatedBuildInputs = [ ghostscript ]; + + cmakeFlags = [ + "-DGMT_DOCDIR=share/doc/gmt" + "-DGMT_MANDIR=share/man" + "-DGMT_LIBDIR=lib" + "-DCOPY_GSHHG:BOOL=FALSE" + "-DGSHHG_ROOT=${gshhg-gmt.out}/share/gshhg-gmt" + "-DCOPY_DCW:BOOL=FALSE" + "-DDCW_ROOT=${dcw-gmt.out}/share/dcw-gmt" + "-DGDAL_ROOT=${gdal.out}" + "-DNETCDF_ROOT=${netcdf.out}" + "-DPCRE_ROOT=${pcre.out}" + "-DGMT_INSTALL_TRADITIONAL_FOLDERNAMES:BOOL=FALSE" + "-DGMT_ENABLE_OPENMP:BOOL=TRUE" + "-DGMT_INSTALL_MODULE_LINKS:BOOL=FALSE" + "-DLICENSE_RESTRICTED=LGPL" # "GPL" and "no" also valid + ] ++ (with stdenv; + lib.optional (!isDarwin) [ + "-DFFTW3_ROOT=${fftwSinglePrec.dev}" + "-DLAPACK_LIBRARY=${lapack}/lib/liblapack.so" + "-DBLAS_LIBRARY=${blas}/lib/libblas.so" + ]); + + meta = with stdenv.lib; { + homepage = "https://www.generic-mapping-tools.org"; + description = "Tools for manipulating geographic and cartesian data sets"; + longDescription = '' + GMT is an open-source collection of command-line tools for manipulating + geographic and Cartesian data sets (including filtering, trend fitting, + gridding, projecting, etc.) and producing high-quality illustrations + ranging from simple x–y plots via contour maps to artificially illuminated + surfaces and 3D perspective views. It supports many map projections and + transformations and includes supporting data such as coastlines, rivers, + and political boundaries and optionally country polygons. + ''; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ tviti ]; + }; + +} diff --git a/pkgs/applications/gis/gmt/gshhg.nix b/pkgs/applications/gis/gmt/gshhg.nix new file mode 100644 index 00000000000..0f22f87c89b --- /dev/null +++ b/pkgs/applications/gis/gmt/gshhg.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "gshhg-gmt"; + version = "2.3.7"; + src = fetchurl { + url = "ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-${version}.tar.gz"; + sha256 = "9bb1a956fca0718c083bef842e625797535a00ce81f175df08b042c2a92cfe7f"; + }; + + installPhase = '' + mkdir -p $out/share/gshhg-gmt + cp -rv ./* $out/share/gshhg-gmt + ''; + + meta = with stdenv.lib; { + homepage = "https://www.soest.hawaii.edu/pwessel/gshhg/"; + description = "High-resolution shoreline data set, for use with GMT"; + longDescription = '' + GSHHG is a high-resolution shoreline data set amalgamated from two + databases: Global Self-consistent Hierarchical High-resolution Shorelines + (GSHHS) and CIA World Data Bank II (WDBII). GSHHG contains vector + descriptions at five different resolutions of land outlines, lakes, + rivers, and political boundaries. This data is for use by GMT, the Generic + Mapping Tools. + ''; + license = licenses.lgpl3Plus; + maintainers = with maintainers; [ tviti ]; + }; + +} diff --git a/pkgs/applications/gis/qgis/unwrapped.nix b/pkgs/applications/gis/qgis/unwrapped.nix index 72e84620252..130c0af6ee2 100644 --- a/pkgs/applications/gis/qgis/unwrapped.nix +++ b/pkgs/applications/gis/qgis/unwrapped.nix @@ -10,7 +10,7 @@ let [ qscintilla-qt5 gdal jinja2 numpy psycopg2 chardet dateutil pyyaml pytz requests urllib3 pygments pyqt5 sip owslib six ]; in mkDerivation rec { - version = "3.10.7"; + version = "3.10.9"; pname = "qgis"; name = "${pname}-unwrapped-${version}"; @@ -18,7 +18,7 @@ in mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings ["."] ["_"] version}"; - sha256 = "0z593n5g3zwhlzhs0z7nlpblz6z2rl3y7y3j1wf1rdx76i8p3qgf"; + sha256 = "0d646hvrhhgsw789qc2g3iblmsvr64qh15jck1jkaljzrj3qbml6"; }; passthru = { diff --git a/pkgs/applications/graphics/drawio/default.nix b/pkgs/applications/graphics/drawio/default.nix index a8dbff6ca8b..5d037bba5ba 100644 --- a/pkgs/applications/graphics/drawio/default.nix +++ b/pkgs/applications/graphics/drawio/default.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - systemd.lib + (lib.getLib systemd) ]; dontBuild = true; diff --git a/pkgs/applications/graphics/drawpile/default.nix b/pkgs/applications/graphics/drawpile/default.nix index 0ffcb5cdb41..20e295c85e9 100644 --- a/pkgs/applications/graphics/drawpile/default.nix +++ b/pkgs/applications/graphics/drawpile/default.nix @@ -1,7 +1,8 @@ -{ lib +{ stdenv +, lib , mkDerivation -, fetchurl -, cmake +, fetchFromGitHub +, fetchpatch , extra-cmake-modules # common deps @@ -9,6 +10,7 @@ # client deps , qtbase +, qtkeychain , qtmultimedia , qtsvg , qttools @@ -23,6 +25,8 @@ # optional server deps , libmicrohttpd , libsodium +, withSystemd ? stdenv.isLinux +, systemd ? null # options , buildClient ? true @@ -35,11 +39,9 @@ with lib; let - commonDeps = [ - karchive - ]; clientDeps = [ qtbase + qtkeychain qtmultimedia qtsvg qttools @@ -49,40 +51,57 @@ let libvpx # WebM video export miniupnpc # automatic port forwarding ]; + serverDeps = [ # optional: libmicrohttpd # HTTP admin api libsodium # ext-auth support - ]; + ] ++ optional withSystemd systemd; + kisDeps = [ qtx11extras ]; + boolToFlag = bool: + if bool then "ON" else "OFF"; + in mkDerivation rec { pname = "drawpile"; version = "2.1.17"; - src = fetchurl { - url = "https://drawpile.net/files/src/drawpile-${version}.tar.gz"; - sha256 = "11lhn1mymhqk9g5sh384xhj3qw8h9lv88pr768y9q6kg3sl7nzzf"; + src = fetchFromGitHub { + owner = "drawpile"; + repo = "drawpile"; + rev = "${version}"; + sha256 = "sha256-AFFY+FcY9ExAur13OoWR9285RZtBe6jnRIrwi5raiCM="; }; - nativeBuildInputs = [ - cmake - extra-cmake-modules + patches = [ + # fix for libmicrohttpd 0.9.71 + (fetchpatch { + url = "https://github.com/drawpile/Drawpile/commit/ed1a75deb113da2d1df91a28f557509c4897130e.diff"; + sha256 = "sha256-54wabH5F3Hf+6vv9rpCwCRdhjSaUFtuF/mE1/U+CpOA="; + name = "mhdfix.patch"; }) + ]; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ + karchive + ] + ++ optionals buildClient clientDeps + ++ optionals buildServer serverDeps + ++ optionals enableKisTablet kisDeps; + + cmakeFlags = [ + "-Wno-dev" + "-DINITSYS=systemd" + "-DCLIENT=${boolToFlag buildClient}" + "-DSERVER=${boolToFlag buildServer}" + "-DSERVERGUI=${boolToFlag buildServerGui}" + "-DTOOLS=${boolToFlag buildExtraTools}" + "-DKIS_TABLET=${boolToFlag enableKisTablet}" ]; - buildInputs = - commonDeps ++ - optionals buildClient clientDeps ++ - optionals buildServer serverDeps ++ - optionals enableKisTablet kisDeps ; - - cmakeFlags = - optional (!buildClient ) "-DCLIENT=off" ++ - optional (!buildServer ) "-DSERVER=off" ++ - optional (!buildServerGui ) "-DSERVERGUI=off" ++ - optional ( buildExtraTools) "-DTOOLS=on" ++ - optional ( enableKisTablet) "-DKIS_TABLET=on"; meta = { description = "A collaborative drawing program that allows multiple users to sketch on the same canvas simultaneously"; diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index 4782d920148..82128f81353 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "feh"; - version = "3.4.1"; + version = "3.5"; src = fetchurl { url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2"; - sha256 = "0yvvj1s7ayn0lwils582smwkmckdk0gij5c58g45n4xh981n693q"; + sha256 = "07jklibpi4ig9pbdrwhllsfffxn2h8xf4ma36qii00w4hb69v3rq"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/graphics/gcolor3/default.nix b/pkgs/applications/graphics/gcolor3/default.nix index 1c1c6ba08ee..2962825e49b 100644 --- a/pkgs/applications/graphics/gcolor3/default.nix +++ b/pkgs/applications/graphics/gcolor3/default.nix @@ -1,31 +1,40 @@ -{ stdenv, fetchFromGitLab, meson, ninja, gettext, pkgconfig, libxml2, gtk3, hicolor-icon-theme, wrapGAppsHook -, fetchpatch }: +{ stdenv +, fetchFromGitLab +, meson +, ninja +, gettext +, pkg-config +, libxml2 +, gtk3 +, libportal +, wrapGAppsHook +}: -let - version = "2.3.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gcolor3"; - inherit version; + version = "2.4.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "gcolor3"; rev = "v${version}"; - sha256 = "10cfzlkflwkb7f51rnrxmgxpfryh1qzvqaydj6lffjq9zvnhigg7"; + sha256 = "rHIAjk2m3Lkz11obgNZaapa1Zr2GDH7XzgzuAJmq+MU="; }; - patches = [ - # Remove useage of deprecrated G_PARAM_PRIVATE - (fetchpatch { - url = "https://gitlab.gnome.org/World/gcolor3/commit/96612cdd6c2cc71e28eb97ee17956004a05e5140.patch"; - sha256 = "134wv5x15bd7k0fjzifrddwssaq213sx2l38r3xw6x1j625qwzq9"; - }) + nativeBuildInputs = [ + meson + ninja + gettext + pkg-config + libxml2 # xml-stripblanks preprocessing of GResource + wrapGAppsHook ]; - nativeBuildInputs = [ meson ninja gettext pkgconfig libxml2 wrapGAppsHook ]; - - buildInputs = [ gtk3 hicolor-icon-theme ]; + buildInputs = [ + gtk3 + libportal + ]; postPatch = '' chmod +x meson_install.sh # patchShebangs requires executable file @@ -34,7 +43,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "A simple color chooser written in GTK3"; - homepage = "https://www.hjdskes.nl/projects/gcolor3/"; + homepage = "https://gitlab.gnome.org/World/gcolor3"; license = licenses.gpl2Plus; maintainers = with maintainers; [ jtojnar ]; platforms = platforms.unix; diff --git a/pkgs/applications/graphics/nomacs/default.nix b/pkgs/applications/graphics/nomacs/default.nix index f1bd85bae0c..d23c02dbbdf 100644 --- a/pkgs/applications/graphics/nomacs/default.nix +++ b/pkgs/applications/graphics/nomacs/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "nomacs"; - version = "3.17.2045"; + version = "3.17.2206"; src = fetchFromGitHub { owner = "nomacs"; repo = "nomacs"; rev = version; - sha256 = "1lchdmmw2sg0xbpcnsk3sxh120xpcv1lh2khf4h5zzdlccbklq7l"; + sha256 = "1bq7bv4p7w67172y893lvpk90d6fgdpnylynbj2kn8m2hs6khya4"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/odafileconverter/default.nix b/pkgs/applications/graphics/odafileconverter/default.nix new file mode 100644 index 00000000000..0378c4db13b --- /dev/null +++ b/pkgs/applications/graphics/odafileconverter/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, mkDerivation, dpkg, fetchurl, qtbase }: + +let + # To obtain the version you will need to run the following command: + # + # dpkg-deb -I ${odafileconverter.src} | grep Version + version = "21.7.0.0"; + rpath = "$ORIGIN:${lib.makeLibraryPath [ stdenv.cc.cc qtbase ]}"; + +in mkDerivation { + pname = "oda-file-converter"; + inherit version; + nativeBuildInputs = [ dpkg ]; + + src = fetchurl { + # NB: this URL is not stable (i.e. the underlying file and the corresponding version will change over time) + url = "https://download.opendesign.com/guestfiles/ODAFileConverter/ODAFileConverter_QT5_lnxX64_7.2dll.deb"; + sha256 = "0sa21nnwzqb6g7gl0z43smqgcd9h3xipj3cq2cl7ybfh3cvcxfi9"; + }; + + unpackPhase = '' + dpkg -x $src oda_unpacked + sourceRoot=$PWD/oda_unpacked + ''; + + installPhase = '' + mkdir -p $out/bin $out/lib + cp -vr $sourceRoot/usr/bin/ODAFileConverter_${version} $out/libexec + cp -vr $sourceRoot/usr/share $out/share + ''; + + dontWrapQtApps = true; + fixupPhase = '' + echo "setting interpreter" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/libexec/ODAFileConverter + patchelf --set-rpath '${rpath}' $out/libexec/ODAFileConverter + wrapQtApp $out/libexec/ODAFileConverter + mv $out/libexec/ODAFileConverter $out/bin + + find $out/libexec -type f -executable | while read file; do + echo "patching $file" + patchelf --set-rpath '${rpath}' $file + done + ''; + + meta = with stdenv.lib; { + description = "For converting between different versions of .dwg and .dxf"; + homepage = "https://www.opendesign.com/guestfiles/oda_file_converter"; + license = licenses.unfree; + maintainers = with maintainers; [ nagisa ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/graphics/opentoonz/default.nix b/pkgs/applications/graphics/opentoonz/default.nix new file mode 100644 index 00000000000..68830699699 --- /dev/null +++ b/pkgs/applications/graphics/opentoonz/default.nix @@ -0,0 +1,51 @@ +{ boost, cmake, fetchFromGitHub, freeglut, freetype, glew, libjpeg, libmypaint +, libpng, libtiff, libusb1, lz4, lzma, lzo, openblas, pkgconfig, qtbase +, qtmultimedia, qtscript, stdenv, superlu, wrapQtAppsHook, }: +let source = import ./source.nix { inherit fetchFromGitHub; }; +in stdenv.mkDerivation rec { + inherit (source) src; + + pname = "opentoonz"; + version = source.versions.opentoonz; + + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; + + buildInputs = [ + boost + freeglut + freetype + glew + libjpeg + libmypaint + libpng + libtiff + libusb1 + lz4 + lzma + lzo + openblas + qtbase + qtmultimedia + qtscript + superlu + ]; + + postUnpack = "sourceRoot=$sourceRoot/toonz"; + + cmakeDir = "../sources"; + cmakeFlags = [ + "-DTIFF_INCLUDE_DIR=${libtiff.dev}/include" + "-DTIFF_LIBRARY=${libtiff.out}/lib/libtiff.so" + ]; + + postInstall = '' + sed -i '/cp -r .*stuff/a\ chmod -R u+w $HOME/.config/OpenToonz/stuff' $out/bin/opentoonz + ''; + + meta = { + description = "Full-featured 2D animation creation software"; + homepage = "https://opentoonz.github.io/"; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ chkno ]; + }; +} diff --git a/pkgs/applications/graphics/opentoonz/libtiff.nix b/pkgs/applications/graphics/opentoonz/libtiff.nix new file mode 100644 index 00000000000..6663c47553e --- /dev/null +++ b/pkgs/applications/graphics/opentoonz/libtiff.nix @@ -0,0 +1,21 @@ +# Per https://github.com/opentoonz/opentoonz/blob/master/doc/how_to_build_linux.md , +# opentoonz requires its own modified version of libtiff. We still build it as +# a separate package +# 1. For visibility for tools like vulnix, and +# 2. To avoid a diamond-dependency problem with qt linking the normal libtiff +# and opentoonz linking qt and this modified libtiff, we build a qt against +# this modified libtiff as well. + +{ fetchFromGitHub, libtiff }: +let source = import ./source.nix { inherit fetchFromGitHub; }; +in libtiff.overrideAttrs (old: { + inherit (source) src; + version = source.versions.libtiff + "-opentoonz"; + postUnpack = (old.postUnpack or "") + '' + sourceRoot="$sourceRoot/thirdparty/tiff-${source.versions.libtiff}" + ''; + # opentoonz uses internal libtiff headers + postInstall = (old.postInstall or "") + '' + cp libtiff/{tif_config,tif_dir,tiffiop}.h $dev/include + ''; +}) diff --git a/pkgs/applications/graphics/opentoonz/source.nix b/pkgs/applications/graphics/opentoonz/source.nix new file mode 100644 index 00000000000..7378d2f5f96 --- /dev/null +++ b/pkgs/applications/graphics/opentoonz/source.nix @@ -0,0 +1,16 @@ +# opentoonz's source archive contains both opentoonz's source and a modified +# version of libtiff that opentoonz requires. + +{ fetchFromGitHub, }: rec { + versions = { + opentoonz = "1.4.0"; + libtiff = "4.0.3"; + }; + + src = fetchFromGitHub { + owner = "opentoonz"; + repo = "opentoonz"; + rev = "v${versions.opentoonz}"; + sha256 = "0vgclx2yydsm5i2smff3fj8m750nhf35wfhva37kywgws01s189b"; + }; +} diff --git a/pkgs/applications/graphics/pencil/default.nix b/pkgs/applications/graphics/pencil/default.nix index edd923822ea..19e8121ac08 100644 --- a/pkgs/applications/graphics/pencil/default.nix +++ b/pkgs/applications/graphics/pencil/default.nix @@ -91,7 +91,7 @@ in stdenv.mkDerivation rec { $out/opt/pencil/pencil # fix missing libudev - ln -s ${systemd.lib}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1 + ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/opt/pencil/libudev.so.1 wrapProgram $out/opt/pencil/pencil \ --prefix LD_LIBRARY_PATH : $out/opt/pencil ''; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 3549a16e270..c041d2dde8c 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -40,11 +40,11 @@ stdenv.mkDerivation rec { pname = "shotwell"; - version = "0.31.1"; + version = "0.31.2"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0mbgrad4d4snffw2z3rkhwqq1bkxdgy52pblx99vjadvpgspb034"; + sha256 = "0ywzr6vgcz8yy60v0jp55na9lgqi4dbh2vakfphkcml1gpah0r2l"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index 41463a7627a..1addb2d7bd5 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -1,24 +1,38 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, gtk2, libpng, exiv2, lcms +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, desktop-file-utils, gtk2, libpng, exiv2, lcms , intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}: stdenv.mkDerivation rec { pname = "viewnior"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { - owner = "xsisqox"; + owner = "hellosiyan"; repo = "Viewnior"; rev = "${pname}-${version}"; - sha256 = "06ppv3r85l3id4ij6h4y5fgm3nib2587fdrdv9fccyi75zk7fs0p"; + sha256 = "0y4hk3vq8psba5k615w18qj0kbdfp5w0lm98nv5apy6hmcpwfyig"; }; - nativeBuildInputs = [ autoreconfHook ]; - buildInputs = - [ pkgconfig gtk2 libpng exiv2 lcms intltool gettext - shared-mime-info glib gdk-pixbuf perl - ]; - - meta = { + nativeBuildInputs = [ + meson + ninja + pkgconfig + desktop-file-utils + intltool + gettext + ]; + + buildInputs = [ + gtk2 + libpng + exiv2 + lcms + shared-mime-info + glib + gdk-pixbuf + perl + ]; + + meta = with stdenv.lib; { description = "Fast and simple image viewer"; longDescription = '' Viewnior is insipred by big projects like Eye of Gnome, because of it's @@ -27,13 +41,9 @@ stdenv.mkDerivation rec { with the quality of it's functions. The program is made with better integration in mind (follows Gnome HIG2). ''; - - license = stdenv.lib.licenses.gpl3; - + license = licenses.gpl3; homepage = "http://siyanpanayotov.com/project/viewnior/"; - - maintainers = [ stdenv.lib.maintainers.smironov ]; - - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.linux; + maintainers = with maintainers; [ smironov artturin ]; + platforms = platforms.gnu ++ platforms.linux; }; } diff --git a/pkgs/applications/graphics/write_stylus/default.nix b/pkgs/applications/graphics/write_stylus/default.nix index 380f70c7c93..8396ce72e50 100644 --- a/pkgs/applications/graphics/write_stylus/default.nix +++ b/pkgs/applications/graphics/write_stylus/default.nix @@ -1,29 +1,22 @@ { mkDerivation, stdenv, lib, qtbase, qtsvg, libglvnd, libX11, libXi, fetchurl, makeDesktopItem }: let - # taken from: https://www.iconfinder.com/icons/50835/edit_pencil_write_icon - # license: Free for commercial use - desktopIcon = fetchurl { - url = "https://www.iconfinder.com/icons/50835/download/png/256"; - sha256 = "0abdya42yf9alxbsmc2nf8jwld50zfria6z3d4ncvp1zw2a9jhb8"; - }; -in -mkDerivation rec { - pname = "write_stylus"; - version = "300"; - desktopItem = makeDesktopItem { name = "Write"; exec = "Write"; comment = "A word processor for handwriting"; - icon = desktopIcon; + icon = "write_stylus"; desktopName = "Write"; genericName = "Write"; categories = "Office;Graphics"; }; +in +mkDerivation rec { + pname = "write_stylus"; + version = "300"; src = fetchurl { url = "http://www.styluslabs.com/write/write${version}.tar.gz"; - sha256 = "1kg4qqxgg7iyxl13hkbl3j27dykra56dj67hbv0392mwdcgavihq"; + sha256 = "0h1wf3af7jzp3f3l8mlnshi83d7a4v4y8nfqfai4lmskyicqlz7c"; }; sourceRoot = "."; @@ -36,8 +29,11 @@ mkDerivation rec { # symlink the binary to bin/ ln -s $out/Write/Write $out/bin/Write + # Create desktop item mkdir -p $out/share/applications ln -s ${desktopItem}/share/applications/* $out/share/applications/ + mkdir -p $out/share/icons + ln -s $out/Write/Write144x144.png $out/share/icons/write_stylus.png ''; preFixup = let libPath = lib.makeLibraryPath [ diff --git a/pkgs/applications/graphics/xfractint/default.nix b/pkgs/applications/graphics/xfractint/default.nix index 5c7b4c22a38..08ef0cd7b58 100644 --- a/pkgs/applications/graphics/xfractint/default.nix +++ b/pkgs/applications/graphics/xfractint/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, libX11, libXft}: stdenv.mkDerivation rec { pname = "xfractint"; - version = "20.04p15"; + version = "20.04p16"; # or fetchFromGitHub(owner,repo,rev) or fetchgit(rev) src = fetchurl { url = "https://www.fractint.net/ftp/current/linux/xfractint-${version}.tar.gz"; - sha256 = "1wv2hgyjvrjxzqxb55vz65ra80p24j8sd34llykk2qlx73x8f3nk"; + sha256 = "1ba77jifxv8jql044mdydh4p4ms4w5vw3qrqmcfzlvqfxk7h2m2f"; }; buildInputs = [libX11 libXft]; diff --git a/pkgs/applications/kde/calendarsupport.nix b/pkgs/applications/kde/calendarsupport.nix index 485397ec4aa..1537bd25d55 100644 --- a/pkgs/applications/kde/calendarsupport.nix +++ b/pkgs/applications/kde/calendarsupport.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-calendar, akonadi-mime, kcalutils, kdepim-apps-libs, + akonadi, akonadi-calendar, akonadi-mime, akonadi-notes, kcalutils, kdepim-apps-libs, kholidays, kidentitymanagement, kmime, pimcommon, qttools, }: @@ -13,7 +13,7 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi akonadi-mime kcalutils kdepim-apps-libs kholidays pimcommon qttools + akonadi akonadi-mime akonadi-notes kcalutils kdepim-apps-libs kholidays pimcommon qttools ]; propagatedBuildInputs = [ akonadi-calendar kidentitymanagement kmime ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index ea2e3722419..8816ae3cbbc 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -100,7 +100,6 @@ let kcalutils = callPackage ./kcalutils.nix {}; kcharselect = callPackage ./kcharselect.nix {}; kcolorchooser = callPackage ./kcolorchooser.nix {}; - kdav = callPackage ./kdav.nix {}; kdebugsettings = callPackage ./kdebugsettings.nix {}; kdegraphics-mobipocket = callPackage ./kdegraphics-mobipocket.nix {}; kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {}; diff --git a/pkgs/applications/kde/fetch.sh b/pkgs/applications/kde/fetch.sh index 3d632271869..f0ce412cff1 100644 --- a/pkgs/applications/kde/fetch.sh +++ b/pkgs/applications/kde/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(http://download.kde.org/stable/release-service/20.04.3/src) +WGET_ARGS=(http://download.kde.org/stable/release-service/20.08.0/src) diff --git a/pkgs/applications/kde/grantleetheme/default.nix b/pkgs/applications/kde/grantleetheme/default.nix index bb8a97e8341..0e815127fa1 100644 --- a/pkgs/applications/kde/grantleetheme/default.nix +++ b/pkgs/applications/kde/grantleetheme/default.nix @@ -11,7 +11,6 @@ mkDerivation { maintainers = kdepimTeam; }; output = [ "out" "dev" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ grantlee ki18n kiconthemes knewstuff kservice kxmlgui qtbase diff --git a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch deleted file mode 100644 index ebb81248475..00000000000 --- a/pkgs/applications/kde/grantleetheme/grantlee-merge-theme-dirs.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff --git a/src/grantleetheme.cpp b/src/grantleetheme.cpp -index 27d5bc8..8d43140 100644 ---- a/src/grantleetheme.cpp -+++ b/src/grantleetheme.cpp -@@ -46,7 +46,7 @@ ThemePrivate::ThemePrivate(const ThemePrivate &other) - , description(other.description) - , name(other.name) - , dirName(other.dirName) -- , absolutePath(other.absolutePath) -+ , absolutePaths(other.absolutePaths) - , author(other.author) - , email(other.email) - , loader(other.loader) -@@ -64,12 +64,15 @@ void ThemePrivate::setupEngine() - - void ThemePrivate::setupLoader() - { -- // Get the parent dir with themes, we set the theme directory separately -- QDir dir(absolutePath); -- dir.cdUp(); -+ QStringList templateDirs; -+ for (const QString& path : absolutePaths) { -+ QDir dir(path); -+ dir.cdUp(); -+ templateDirs << dir.absolutePath(); -+ } - - loader = QSharedPointer<GrantleeTheme::QtResourceTemplateLoader>::create(); -- loader->setTemplateDirs({ dir.absolutePath() }); -+ loader->setTemplateDirs(templateDirs); - loader->setTheme(dirName); - - if (!sEngine) { -@@ -121,7 +124,7 @@ Theme::Theme(const QString &themePath, const QString &dirName, const QString &de - KConfigGroup group(&config, QStringLiteral("Desktop Entry")); - if (group.isValid()) { - d->dirName = dirName; -- d->absolutePath = themePath; -+ d->absolutePaths = QStringList(themePath); - d->name = group.readEntry("Name", QString()); - d->description = group.readEntry("Description", QString()); - d->themeFileName = group.readEntry("FileName", QString()); -@@ -140,7 +143,7 @@ Theme::~Theme() - - bool Theme::operator==(const Theme &other) const - { -- return isValid() && other.isValid() && d->absolutePath == other.absolutePath(); -+ return isValid() && other.isValid() && d->absolutePaths == other.absolutePaths(); - } - - Theme &Theme::operator=(const Theme &other) -@@ -184,7 +187,12 @@ QString Theme::dirName() const - - QString Theme::absolutePath() const - { -- return d->absolutePath; -+ return d->absolutePaths.first(); -+} -+ -+QStringList Theme::absolutePaths() const -+{ -+ return d->absolutePaths; - } - - QString Theme::author() const -@@ -223,6 +231,13 @@ QString Theme::render(const QString &templateName, const QVariantHash &data, con - return result; - } - -+void Theme::addThemeDir(const QString& path) -+{ -+ QDir dir(path); -+ dir.cdUp(); -+ d->absolutePaths << dir.absolutePath(); -+} -+ - void Theme::addPluginPath(const QString &path) - { - if (!ThemePrivate::sEngine) { -diff --git a/src/grantleetheme.h b/src/grantleetheme.h -index a25c27b..be38299 100644 ---- a/src/grantleetheme.h -+++ b/src/grantleetheme.h -@@ -48,11 +48,14 @@ public: - Q_REQUIRED_RESULT QStringList displayExtraVariables() const; - Q_REQUIRED_RESULT QString dirName() const; - Q_REQUIRED_RESULT QString absolutePath() const; -+ Q_REQUIRED_RESULT QStringList absolutePaths() const; - Q_REQUIRED_RESULT QString author() const; - Q_REQUIRED_RESULT QString authorEmail() const; - - Q_REQUIRED_RESULT QString render(const QString &templateName, const QVariantHash &data, const QByteArray &applicationDomain = QByteArray()); - -+ void addThemeDir(const QString&); -+ - static void addPluginPath(const QString &path); - - private: -diff --git a/src/grantleetheme_p.h b/src/grantleetheme_p.h -index eb73dcb..00510e9 100644 ---- a/src/grantleetheme_p.h -+++ b/src/grantleetheme_p.h -@@ -43,7 +43,7 @@ public: - QString description; - QString name; - QString dirName; -- QString absolutePath; -+ QStringList absolutePaths; - QString author; - QString email; - -diff --git a/src/grantleethememanager.cpp b/src/grantleethememanager.cpp -index 606d717..dc99041 100644 ---- a/src/grantleethememanager.cpp -+++ b/src/grantleethememanager.cpp -@@ -125,25 +125,18 @@ public: - - for (const QString &directory : qAsConst(themesDirectories)) { - QDirIterator dirIt(directory, QStringList(), QDir::AllDirs | QDir::NoDotAndDotDot); -- QStringList alreadyLoadedThemeName; - while (dirIt.hasNext()) { - dirIt.next(); - const QString dirName = dirIt.fileName(); - GrantleeTheme::Theme theme = q->loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - QString themeName = theme.name(); -- if (alreadyLoadedThemeName.contains(themeName)) { -- int i = 2; -- const QString originalName(theme.name()); -- while (alreadyLoadedThemeName.contains(themeName)) { -- themeName = originalName + QStringLiteral(" (%1)").arg(i); -- ++i; -- } -- theme.d->name = themeName; -+ QMap<QString, GrantleeTheme::Theme>::iterator i = themes.find(dirName); -+ if (i != themes.end()) { -+ i.value().addThemeDir(dirIt.filePath()); -+ } else { -+ themes.insert(dirName, theme); - } -- alreadyLoadedThemeName << themeName; -- themes.insert(dirName, theme); -- //qDebug()<<" theme.name()"<<theme.name(); - } - } - watch->addDir(directory); -@@ -366,7 +359,7 @@ QString ThemeManager::pathFromThemes(const QString &themesRelativePath, const QS - GrantleeTheme::Theme theme = loadTheme(dirIt.filePath(), dirName, defaultDesktopFileName); - if (theme.isValid()) { - if (dirName == themeName) { -- return theme.absolutePath(); -+ return theme.absolutePaths().first(); - } - } - } diff --git a/pkgs/applications/kde/grantleetheme/series b/pkgs/applications/kde/grantleetheme/series deleted file mode 100644 index 9095599ea56..00000000000 --- a/pkgs/applications/kde/grantleetheme/series +++ /dev/null @@ -1 +0,0 @@ -grantlee-merge-theme-dirs.patch diff --git a/pkgs/applications/kde/incidenceeditor.nix b/pkgs/applications/kde/incidenceeditor.nix index 8224b98253b..30955d1c274 100644 --- a/pkgs/applications/kde/incidenceeditor.nix +++ b/pkgs/applications/kde/incidenceeditor.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-mime, calendarsupport, eventviews, kdepim-apps-libs, - kdiagram, kldap, kmime, qtbase, + kdiagram, kldap, kmime, pimcommon, qtbase }: mkDerivation { @@ -14,7 +14,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-mime calendarsupport eventviews kdepim-apps-libs kdiagram - kldap kmime qtbase + kldap kmime pimcommon qtbase ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/kdepim-apps-libs/default.nix b/pkgs/applications/kde/kdepim-apps-libs/default.nix index 6189e8706db..a9b906b7b23 100644 --- a/pkgs/applications/kde/kdepim-apps-libs/default.nix +++ b/pkgs/applications/kde/kdepim-apps-libs/default.nix @@ -11,7 +11,6 @@ mkDerivation { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; maintainers = kdepimTeam; }; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-contacts grantlee grantleetheme kconfig kconfigwidgets diff --git a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch b/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch deleted file mode 100644 index 02c369cc4ee..00000000000 --- a/pkgs/applications/kde/kdepim-apps-libs/kdepim-apps-libs-grantlee-merge-theme-dirs.patch +++ /dev/null @@ -1,62 +0,0 @@ -Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp -=================================================================== ---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp -+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactgroupformatter.cpp -@@ -50,9 +50,9 @@ public: - mTemplateLoader.clear(); - } - -- void changeGrantleePath(const QString &path) -+ void changeGrantleePath(const QStringList &paths) - { -- mTemplateLoader->setTemplateDirs(QStringList() << path); -+ mTemplateLoader->setTemplateDirs(paths); - mEngine->addTemplateLoader(mTemplateLoader); - - mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contactgroup.html")); -@@ -86,12 +86,12 @@ GrantleeContactGroupFormatter::~Grantlee - - void GrantleeContactGroupFormatter::setAbsoluteThemePath(const QString &path) - { -- d->changeGrantleePath(path); -+ d->changeGrantleePath(QStringList(path)); - } - - void GrantleeContactGroupFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) - { -- d->changeGrantleePath(theme.absolutePath()); -+ d->changeGrantleePath(theme.absolutePaths()); - } - - inline static void setHashField(QVariantHash &hash, const QString &name, const QString &value) -Index: kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp -=================================================================== ---- kdepim-apps-libs-17.04.0.orig/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp -+++ kdepim-apps-libs-17.04.0/kaddressbookgrantlee/src/formatter/grantleecontactformatter.cpp -@@ -74,9 +74,9 @@ public: - mTemplateLoader.clear(); - } - -- void changeGrantleePath(const QString &path) -+ void changeGrantleePath(const QStringList &paths) - { -- mTemplateLoader->setTemplateDirs(QStringList() << path); -+ mTemplateLoader->setTemplateDirs(paths); - mEngine->addTemplateLoader(mTemplateLoader); - - mSelfcontainedTemplate = mEngine->loadByName(QStringLiteral("contact.html")); -@@ -112,12 +112,12 @@ GrantleeContactFormatter::~GrantleeConta - - void GrantleeContactFormatter::setAbsoluteThemePath(const QString &path) - { -- d->changeGrantleePath(path); -+ d->changeGrantleePath(QStringList(path)); - } - - void GrantleeContactFormatter::setGrantleeTheme(const GrantleeTheme::Theme &theme) - { -- d->changeGrantleePath(theme.absolutePath()); -+ d->changeGrantleePath(theme.absolutePaths()); - } - - void GrantleeContactFormatter::setForceDisableQRCode(bool b) diff --git a/pkgs/applications/kde/kdepim-apps-libs/series b/pkgs/applications/kde/kdepim-apps-libs/series deleted file mode 100644 index 1e8a52b55e9..00000000000 --- a/pkgs/applications/kde/kdepim-apps-libs/series +++ /dev/null @@ -1 +0,0 @@ -kdepim-apps-libs-grantlee-merge-theme-dirs.patch diff --git a/pkgs/applications/kde/kdepim-runtime/default.nix b/pkgs/applications/kde/kdepim-runtime/default.nix index 65719514f96..27ca6ff9aaf 100644 --- a/pkgs/applications/kde/kdepim-runtime/default.nix +++ b/pkgs/applications/kde/kdepim-runtime/default.nix @@ -4,8 +4,8 @@ shared-mime-info, akonadi, akonadi-calendar, akonadi-contacts, akonadi-mime, akonadi-notes, kalarmcal, kcalutils, kcontacts, kdav, kdelibs4support, kidentitymanagement, - kimap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, - pimcommon, qtwebengine, libkgapi, qtnetworkauth, qtspeech, qtxmlpatterns, + kimap, kldap, kmailtransport, kmbox, kmime, knotifications, knotifyconfig, + pimcommon, qtwebengine, libkgapi, qca-qt5, qtnetworkauth, qtspeech, qtxmlpatterns, }: mkDerivation { @@ -18,7 +18,7 @@ mkDerivation { buildInputs = [ akonadi akonadi-calendar akonadi-contacts akonadi-mime akonadi-notes kalarmcal kcalutils kcontacts kdav kdelibs4support kidentitymanagement kimap - kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine - pimcommon libkgapi qtnetworkauth qtspeech qtxmlpatterns + kldap kmailtransport kmbox kmime knotifications knotifyconfig qtwebengine + pimcommon libkgapi qca-qt5 qtnetworkauth qtspeech qtxmlpatterns ]; } diff --git a/pkgs/applications/kde/kmail.nix b/pkgs/applications/kde/kmail.nix index 6b8941e5787..d225eba8223 100644 --- a/pkgs/applications/kde/kmail.nix +++ b/pkgs/applications/kde/kmail.nix @@ -27,5 +27,4 @@ mkDerivation { kdepim-addons ]; propagatedUserEnvPkgs = [ kdepim-runtime kwallet akonadi ]; - patches = [ ./kmail.patch ]; } diff --git a/pkgs/applications/kde/kmail.patch b/pkgs/applications/kde/kmail.patch deleted file mode 100644 index 71a23be2d83..00000000000 --- a/pkgs/applications/kde/kmail.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/agents/archivemailagent/CMakeLists.txt b/agents/archivemailagent/CMakeLists.txt -index 48ed076..9c56896 100644 ---- a/agents/archivemailagent/CMakeLists.txt -+++ b/agents/archivemailagent/CMakeLists.txt -@@ -22,6 +22,7 @@ ki18n_wrap_ui(libarchivemailagent_SRCS ui/archivemailwidget.ui ) - add_library(archivemailagent STATIC ${libarchivemailagent_SRCS}) - target_link_libraries(archivemailagent - KF5::MailCommon -+ KF5::Libkdepim - KF5::I18n - KF5::Notifications - KF5::IconThemes -diff --git a/agents/followupreminderagent/CMakeLists.txt b/agents/followupreminderagent/CMakeLists.txt -index a56b730..83604cf 100644 ---- a/agents/followupreminderagent/CMakeLists.txt -+++ b/agents/followupreminderagent/CMakeLists.txt -@@ -23,6 +23,7 @@ target_link_libraries(followupreminderagent - KF5::AkonadiMime - KF5::AkonadiAgentBase - KF5::DBusAddons -+ KF5::FollowupReminder - KF5::XmlGui - KF5::KIOWidgets - KF5::Notifications diff --git a/pkgs/applications/kde/kontact.nix b/pkgs/applications/kde/kontact.nix index 978baa925e5..eb28458392c 100644 --- a/pkgs/applications/kde/kontact.nix +++ b/pkgs/applications/kde/kontact.nix @@ -4,7 +4,7 @@ qtwebengine, kcmutils, kcrash, kdbusaddons, kparts, kwindowsystem, akonadi, grantleetheme, kdepim-apps-libs, kontactinterface, kpimtextedit, - mailcommon, libkdepim + mailcommon, libkdepim, pimcommon }: mkDerivation { @@ -18,6 +18,6 @@ mkDerivation { qtwebengine kcmutils kcrash kdbusaddons kparts kwindowsystem akonadi grantleetheme kdepim-apps-libs kontactinterface kpimtextedit - mailcommon libkdepim + mailcommon libkdepim pimcommon ]; } diff --git a/pkgs/applications/kde/mailimporter.nix b/pkgs/applications/kde/mailimporter.nix index f002ff0f340..5de58658777 100644 --- a/pkgs/applications/kde/mailimporter.nix +++ b/pkgs/applications/kde/mailimporter.nix @@ -2,7 +2,7 @@ mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, akonadi, akonadi-mime, karchive, kcompletion, kconfig, kcoreaddons, ki18n, - kmime, kxmlgui, libkdepim + kmime, kxmlgui, libkdepim, pimcommon }: mkDerivation { @@ -14,6 +14,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ akonadi akonadi-mime karchive kcompletion kconfig kcoreaddons ki18n kmime - kxmlgui libkdepim + kxmlgui libkdepim pimcommon ]; } diff --git a/pkgs/applications/kde/pimcommon.nix b/pkgs/applications/kde/pimcommon.nix index cd9ff2528fa..2e74f528aeb 100644 --- a/pkgs/applications/kde/pimcommon.nix +++ b/pkgs/applications/kde/pimcommon.nix @@ -1,9 +1,9 @@ { mkDerivation, lib, kdepimTeam, extra-cmake-modules, kdoctools, - akonadi, akonadi-contacts, akonadi-mime, grantlee, karchive, kcodecs, + akonadi, akonadi-contacts, akonadi-mime, akonadi-search, grantlee, karchive, kcmutils, kcodecs, kcompletion, kconfig, kconfigwidgets, kcontacts, kdbusaddons, - kiconthemes, kimap, kio, kitemmodels, kjobwidgets, knewstuff, kpimtextedit, + kiconthemes, kimap, kio, kitemmodels, kjobwidgets, kldap, knewstuff, kpimtextedit, kpurpose, kwallet, kwindowsystem, libkdepim, qtwebengine }: @@ -15,12 +15,12 @@ mkDerivation { }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - akonadi-mime grantlee karchive kcodecs kcompletion kconfigwidgets - kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kpimtextedit + akonadi-mime grantlee karchive kcmutils kcodecs kcompletion kconfigwidgets + kdbusaddons kiconthemes kio kitemmodels kjobwidgets knewstuff kldap kpimtextedit kpurpose kwallet kwindowsystem libkdepim qtwebengine ]; propagatedBuildInputs = [ - akonadi akonadi-contacts kconfig kcontacts kimap + akonadi akonadi-contacts akonadi-search kconfig kcontacts kimap ]; outputs = [ "out" "dev" ]; } diff --git a/pkgs/applications/kde/srcs.nix b/pkgs/applications/kde/srcs.nix index 12a84991adb..78674306e2f 100644 --- a/pkgs/applications/kde/srcs.nix +++ b/pkgs/applications/kde/srcs.nix @@ -4,1739 +4,1731 @@ { akonadi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-20.04.3.tar.xz"; - sha256 = "c91cc53afd2f81fbeed55700cd86010ee865de2594948769410167e6992bdb32"; - name = "akonadi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-20.08.0.tar.xz"; + sha256 = "a18ce2d8c9e9fc7f195a7546ee5b7c2541e37ceb7afa0aa25e9ade4f54de2813"; + name = "akonadi-20.08.0.tar.xz"; }; }; akonadi-calendar = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-20.04.3.tar.xz"; - sha256 = "ff8732b0d09b87ce0760b7df02ee390d3c0c064780076ed4c6ed05c52ca634bb"; - name = "akonadi-calendar-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-20.08.0.tar.xz"; + sha256 = "4664e2dc6bc0762d999662188c64410fa70be2cef1be221569ec3b9270f80fd8"; + name = "akonadi-calendar-20.08.0.tar.xz"; }; }; akonadi-calendar-tools = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-calendar-tools-20.04.3.tar.xz"; - sha256 = "654fec93158e6623a8a81a371fa85d0a18b9f486f6c29926d97a8105a2d65ed2"; - name = "akonadi-calendar-tools-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-calendar-tools-20.08.0.tar.xz"; + sha256 = "f994db29d374b0fbfd3328fc618df44680b0dfaec1cf9f842a7a9c6ecbb841fa"; + name = "akonadi-calendar-tools-20.08.0.tar.xz"; }; }; akonadiconsole = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadiconsole-20.04.3.tar.xz"; - sha256 = "acd6d63a30af49ec66ff30c3ecdd4e53c4f4a15c4d1e41ffd988366b5106447c"; - name = "akonadiconsole-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadiconsole-20.08.0.tar.xz"; + sha256 = "a43c6b756a69301f7756464deea58c72aaefaa1b47f1136959588e8f41b7b91b"; + name = "akonadiconsole-20.08.0.tar.xz"; }; }; akonadi-contacts = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-contacts-20.04.3.tar.xz"; - sha256 = "5bcd7acc70631e844ed77e127ff895efb573b62ef79062a6065e24b8826af39d"; - name = "akonadi-contacts-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-contacts-20.08.0.tar.xz"; + sha256 = "206f0704768a789201ead784e78d7138aba6b50b8f3880369df8799730fca8b4"; + name = "akonadi-contacts-20.08.0.tar.xz"; }; }; akonadi-import-wizard = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-import-wizard-20.04.3.tar.xz"; - sha256 = "225615f9d64166ce33718817dfda7aadada5876204c939edc1455ae01b7bf1b2"; - name = "akonadi-import-wizard-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-import-wizard-20.08.0.tar.xz"; + sha256 = "d742ced3b498f39edff33f7fc73db1e882bf4b1e17b35d5f734f8732cb1e7bde"; + name = "akonadi-import-wizard-20.08.0.tar.xz"; }; }; akonadi-mime = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-mime-20.04.3.tar.xz"; - sha256 = "92e9bab71f87c0de8e3437dd4779054332826fe2522c36a7c038c789b207f7ac"; - name = "akonadi-mime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-mime-20.08.0.tar.xz"; + sha256 = "c0a709e25fef86f778ef21adbf78c6beab203f4f4a8d9f5e17a4d3175fe01d33"; + name = "akonadi-mime-20.08.0.tar.xz"; }; }; akonadi-notes = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-notes-20.04.3.tar.xz"; - sha256 = "e1b4b6d2347038774589a9a8a935e4697d248008dfd2b5b496e6555974c96a55"; - name = "akonadi-notes-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-notes-20.08.0.tar.xz"; + sha256 = "aeb348d6af30e8775d60cab0894634c6e5ac95a3baf97f69407602dea5944525"; + name = "akonadi-notes-20.08.0.tar.xz"; }; }; akonadi-search = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akonadi-search-20.04.3.tar.xz"; - sha256 = "21ca09d39d6e550ca01e80f1a112557f00387e014763b1f47824d53d41cb5bdf"; - name = "akonadi-search-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akonadi-search-20.08.0.tar.xz"; + sha256 = "06974398ddd6cbd42d0cb9dc3cac4b6ad6bdc8062d1f94523a973ed702b40e2f"; + name = "akonadi-search-20.08.0.tar.xz"; }; }; akregator = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/akregator-20.04.3.tar.xz"; - sha256 = "e175a1b60270ad76afaf16e8e5630d237cdc068c06d0ae93591494b18ad4584c"; - name = "akregator-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/akregator-20.08.0.tar.xz"; + sha256 = "e8dbef1b8e8c165e824f108a33f9d2a6a0ea8668299f808fcc2ce2b4d398dcf5"; + name = "akregator-20.08.0.tar.xz"; }; }; analitza = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/analitza-20.04.3.tar.xz"; - sha256 = "f9d1873c6190dc1eaeb6fad97d4197256342e0b729f7e8199e15bfb495f854b7"; - name = "analitza-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/analitza-20.08.0.tar.xz"; + sha256 = "51bc5ecd31e557fcf5660e57458aa866ee44e386550bb2c37c22fae252405aa1"; + name = "analitza-20.08.0.tar.xz"; }; }; ark = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ark-20.04.3.tar.xz"; - sha256 = "e7251b0b6f12291ffbaa328bf7f8e101ebeef6fd110dabbcf76d8ad7cfd305bc"; - name = "ark-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ark-20.08.0.tar.xz"; + sha256 = "7627ffa17466d31dfdedabaa07b491ce14b46041d04f8b20316a0fa731fab098"; + name = "ark-20.08.0.tar.xz"; }; }; artikulate = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/artikulate-20.04.3.tar.xz"; - sha256 = "394e93df2b370ba1e6621b2bcf871be42efde6fa2189de29d4c8198e387767ea"; - name = "artikulate-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/artikulate-20.08.0.tar.xz"; + sha256 = "30ef4eedabebccfb600eec1ba7bc691e8ad4e0de8d7fdcf56a630714d6b9848b"; + name = "artikulate-20.08.0.tar.xz"; }; }; audiocd-kio = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/audiocd-kio-20.04.3.tar.xz"; - sha256 = "af8782771a5d48fb2e3ba9703f8b8e542f5fddd418ca293d23a6eb83ebe86929"; - name = "audiocd-kio-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/audiocd-kio-20.08.0.tar.xz"; + sha256 = "7a01d5b89f5271ee1eba203e15c46b146879e4651643ec6348e1033c0ffdc8c7"; + name = "audiocd-kio-20.08.0.tar.xz"; }; }; baloo-widgets = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/baloo-widgets-20.04.3.tar.xz"; - sha256 = "29394f9d47407074a5ec0f85ceade5dcc8c03f0d9a83c1e339310f19f7711ae3"; - name = "baloo-widgets-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/baloo-widgets-20.08.0.tar.xz"; + sha256 = "37800c3cde7e2a9cfbab2e11f21dd1ae76b2a31b687802bc45027966a8734985"; + name = "baloo-widgets-20.08.0.tar.xz"; }; }; blinken = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/blinken-20.04.3.tar.xz"; - sha256 = "d6901fe40768ba8319609bfd143b2d1c585b04a148aedcb4b358b041db7f1afb"; - name = "blinken-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/blinken-20.08.0.tar.xz"; + sha256 = "0a08f5fc8e0c100956bb99910265d9630191e462f8f812842e79b64e76055c1c"; + name = "blinken-20.08.0.tar.xz"; }; }; bomber = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/bomber-20.04.3.tar.xz"; - sha256 = "b292c11ebfb4311420ce6b9a4b132a437d061946e8eb08556fec89bb84c23428"; - name = "bomber-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/bomber-20.08.0.tar.xz"; + sha256 = "91b4ff0e0615cd42e36c6755d30ee62b74d6c5ae309512b9f8f347c34786ec47"; + name = "bomber-20.08.0.tar.xz"; }; }; bovo = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/bovo-20.04.3.tar.xz"; - sha256 = "5365c0fd5a57814f224585e4331be129414d1f5d51d2b90bac8421df4ae5f300"; - name = "bovo-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/bovo-20.08.0.tar.xz"; + sha256 = "f66997324d596095b30442b2446a3c581834ad60d1a27fd7f7f394549f2418a8"; + name = "bovo-20.08.0.tar.xz"; }; }; calendarsupport = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/calendarsupport-20.04.3.tar.xz"; - sha256 = "40b069e1561fac49f46dd0504af0ac459010ac98f30748b8f15a50ca1fd35b5b"; - name = "calendarsupport-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/calendarsupport-20.08.0.tar.xz"; + sha256 = "1c1682d46f248b092062a461cdefec9da3733cb0ee1a590b7c48c4977028e977"; + name = "calendarsupport-20.08.0.tar.xz"; }; }; cantor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/cantor-20.04.3.tar.xz"; - sha256 = "ff589ccb48016fd784de9883fe19ee0c2c450e3993e9cc5f7dc499448db0c6a4"; - name = "cantor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/cantor-20.08.0.tar.xz"; + sha256 = "1d4babf783f53929f0ea42380dacdb7ab989b66383dd3c37ab22787a26715082"; + name = "cantor-20.08.0.tar.xz"; }; }; cervisia = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/cervisia-20.04.3.tar.xz"; - sha256 = "3e2aac0a08c01d9ea5c5814e739f082ec5a510cd8f0f6bce37cfff9130b0f078"; - name = "cervisia-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/cervisia-20.08.0.tar.xz"; + sha256 = "6e10acc196661b7d1873e370eb67486386e25e4d6b7946ade8479b70fba34d66"; + name = "cervisia-20.08.0.tar.xz"; }; }; dolphin = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/dolphin-20.04.3.tar.xz"; - sha256 = "5e493e898e02005780b59474f506904742625b50e4669c113906d4f30daa863e"; - name = "dolphin-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/dolphin-20.08.0.tar.xz"; + sha256 = "fe5a68d9afd0771ba9ffc2d5d79e7bc43da85fd3ee3c2493a9a2d5c359c3cd6f"; + name = "dolphin-20.08.0.tar.xz"; }; }; dolphin-plugins = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/dolphin-plugins-20.04.3.tar.xz"; - sha256 = "f0dad66e7302711e136b0253fb73dbf16bc9facdbb4ad617207fb818fc84130a"; - name = "dolphin-plugins-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/dolphin-plugins-20.08.0.tar.xz"; + sha256 = "a8a0c35f75eb8e63ee90f44ce930babceff86676b8bba213c82b7ffb29e526bb"; + name = "dolphin-plugins-20.08.0.tar.xz"; }; }; dragon = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/dragon-20.04.3.tar.xz"; - sha256 = "2b0d6414f2cea9f2a0b2ebddeffa7e5342db96fac34b2a00439fca5784f6131f"; - name = "dragon-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/dragon-20.08.0.tar.xz"; + sha256 = "0e3a540b3f93118a9a17f2c6f675d0f007b123266c6e71a27b5ddb6b9a7e14a8"; + name = "dragon-20.08.0.tar.xz"; }; }; elisa = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/elisa-20.04.3.tar.xz"; - sha256 = "d99dc2eb80d4219d08c72e612ac07cbb6c91c2eff365b49da69cbc3c1e70885b"; - name = "elisa-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/elisa-20.08.0.tar.xz"; + sha256 = "acbff9f3c3d26c2a2c249974ccd8ff0bdeb22148a8a5b72e1199f1ec2f9d712e"; + name = "elisa-20.08.0.tar.xz"; }; }; eventviews = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/eventviews-20.04.3.tar.xz"; - sha256 = "f10d43f57e62d68b6d0b41e9e3442baee8b68664e085f6e4347ac6adc1af32ff"; - name = "eventviews-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/eventviews-20.08.0.tar.xz"; + sha256 = "205607d89d739f1efa4472303206647d04fba4e9d80610800a4a229676ede732"; + name = "eventviews-20.08.0.tar.xz"; }; }; ffmpegthumbs = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ffmpegthumbs-20.04.3.tar.xz"; - sha256 = "089305a75d32cf8bf1b9279623b524912af78aa538379dcccf998ca1ab165164"; - name = "ffmpegthumbs-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ffmpegthumbs-20.08.0.tar.xz"; + sha256 = "84c3a8f064423d7e51a57b9ed32a9f4fdbca73f7fa7e47a6289d9b516f1ba9ff"; + name = "ffmpegthumbs-20.08.0.tar.xz"; }; }; filelight = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/filelight-20.04.3.tar.xz"; - sha256 = "d0939d0a04424978c06b675ac784c6a1ecbccbb67a31f5af661c6716bf38f0a4"; - name = "filelight-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/filelight-20.08.0.tar.xz"; + sha256 = "29ea650f7b0f1863ea6caeca39362eff652edee755963967eb4653665a2499b4"; + name = "filelight-20.08.0.tar.xz"; }; }; granatier = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/granatier-20.04.3.tar.xz"; - sha256 = "9d06047f613a03b32d603e90bd14ca2873be9da9b4b17b98a65242e9855a7aaf"; - name = "granatier-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/granatier-20.08.0.tar.xz"; + sha256 = "9fd034875c2ac80a089145c47f36b3b97ed69eaa1693aa83bc5bd76561096efd"; + name = "granatier-20.08.0.tar.xz"; }; }; grantlee-editor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/grantlee-editor-20.04.3.tar.xz"; - sha256 = "1a3e4ece1a37e11735291bbec99314bc0ede0714377db916ed1266ec19325ef5"; - name = "grantlee-editor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/grantlee-editor-20.08.0.tar.xz"; + sha256 = "08aeac1c6bacabdeb4e4273efc5c5f4995454c45bd51069b3ef6105237b84afa"; + name = "grantlee-editor-20.08.0.tar.xz"; }; }; grantleetheme = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/grantleetheme-20.04.3.tar.xz"; - sha256 = "c5b2e4b1d5e14b39d2e66d160ba0b86c16f86e921abf578640bf1576a5f25eb3"; - name = "grantleetheme-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/grantleetheme-20.08.0.tar.xz"; + sha256 = "7e86d2f9f5a725f988211f676da2c4191ed6df55418135f3a54da5d687d63e8e"; + name = "grantleetheme-20.08.0.tar.xz"; }; }; gwenview = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/gwenview-20.04.3.tar.xz"; - sha256 = "d176021d6784e33cb0aaa6fa2517e81f9eac237079d2a06d6b55b8f4b04e8bd9"; - name = "gwenview-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/gwenview-20.08.0.tar.xz"; + sha256 = "e7a6d96801bfc41156292faac915691b929d4da641cf04839c74a68debc95c44"; + name = "gwenview-20.08.0.tar.xz"; }; }; incidenceeditor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/incidenceeditor-20.04.3.tar.xz"; - sha256 = "b3c70c926acab7a0585bf2bf7575ebe4d04c439fc49af073d0cb599f3b9e57c2"; - name = "incidenceeditor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/incidenceeditor-20.08.0.tar.xz"; + sha256 = "5f23343959cd672570a4a3439be0e8b27c413b9747a17bd04138359c43dac678"; + name = "incidenceeditor-20.08.0.tar.xz"; }; }; juk = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/juk-20.04.3.tar.xz"; - sha256 = "2566257f83db74d69b95e109146a82e1e03966b3592c891b48e81cf2a13d812b"; - name = "juk-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/juk-20.08.0.tar.xz"; + sha256 = "ec00ef054768efc64b5b0da69fba90104689b314a064f52989d1c6dbd73dad1b"; + name = "juk-20.08.0.tar.xz"; }; }; k3b = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/k3b-20.04.3.tar.xz"; - sha256 = "562dc91be0a992ef0f139310bfd941202e4ae273e11b754d02a8cf6f85f20420"; - name = "k3b-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/k3b-20.08.0.tar.xz"; + sha256 = "d10ac6bfa89744ec857ce7c65d5d7eae5f26ce151341d6f393b9a141cc05540a"; + name = "k3b-20.08.0.tar.xz"; }; }; kaccounts-integration = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-integration-20.04.3.tar.xz"; - sha256 = "57661418d6fe58f9c3d308ba8804e5bc83312bba0967e13bf144b1a7dba9b36d"; - name = "kaccounts-integration-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-integration-20.08.0.tar.xz"; + sha256 = "b1d0912ec7771be6c04f4cf635d9196acee1c63f47fe1814a5da2002196125a0"; + name = "kaccounts-integration-20.08.0.tar.xz"; }; }; kaccounts-providers = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kaccounts-providers-20.04.3.tar.xz"; - sha256 = "ffeeac1283c453a4bbd4249cbe314eb7f9800a9cbedce192fdb1f12f30670e3e"; - name = "kaccounts-providers-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kaccounts-providers-20.08.0.tar.xz"; + sha256 = "5a2293e124839dec3ca5cbe72548ff01ce3c0f7edc5c6dd78ca4d8a27054f574"; + name = "kaccounts-providers-20.08.0.tar.xz"; }; }; kaddressbook = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kaddressbook-20.04.3.tar.xz"; - sha256 = "d1c8f6af88572548a90756963921a8555df239467858432079a37788f4980b58"; - name = "kaddressbook-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kaddressbook-20.08.0.tar.xz"; + sha256 = "e34b4515a5721b9dd1d9d391acb81905bc2b6a0d219347c7dac87ebbb5b7b921"; + name = "kaddressbook-20.08.0.tar.xz"; }; }; kajongg = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kajongg-20.04.3.tar.xz"; - sha256 = "0175fb44b4f092fa318113a576f41e0a29dc1f5d7dfbf0ca7877a5c46a095d00"; - name = "kajongg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kajongg-20.08.0.tar.xz"; + sha256 = "1813ff2d960f96d63c5680b4a7e7dca6249146876c7a6d203eb0f9768eca244b"; + name = "kajongg-20.08.0.tar.xz"; }; }; kalarm = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalarm-20.04.3.tar.xz"; - sha256 = "71f94af998495c759b9c2e7bf2092887748301c993f76dbf36f6ac9e4bb2a1f5"; - name = "kalarm-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kalarm-20.08.0.tar.xz"; + sha256 = "02c1a62f603cc6917d0f95eff4aaa23cf808395bed9b1dad21817f6c32256748"; + name = "kalarm-20.08.0.tar.xz"; }; }; kalarmcal = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalarmcal-20.04.3.tar.xz"; - sha256 = "19c9aab451f95f7689d8b18059e84f189b11cf15bb7f60fe55402b944512692e"; - name = "kalarmcal-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kalarmcal-20.08.0.tar.xz"; + sha256 = "bd4f048a976829ee5768b9d26aebe4efbbfa0a2991486c8f57f250fe4198532c"; + name = "kalarmcal-20.08.0.tar.xz"; }; }; kalgebra = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalgebra-20.04.3.tar.xz"; - sha256 = "988ae02433e961a84da35498aa6ff88fbcc36f8f12d55457116935740d3f1475"; - name = "kalgebra-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kalgebra-20.08.0.tar.xz"; + sha256 = "658fd3eae218b6b73dbf3ff2edb59c511bfb11d549b7e41a5224c62b4bfedc2c"; + name = "kalgebra-20.08.0.tar.xz"; }; }; kalzium = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kalzium-20.04.3.tar.xz"; - sha256 = "b884fc8c13c3618a73e3ecfd265660e7045245059a951aff32c12ee5981902ca"; - name = "kalzium-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kalzium-20.08.0.tar.xz"; + sha256 = "e9b402ea91ac87a19cef6e686bfb8507f6afac0d19c5dc7de777475d5db1b06f"; + name = "kalzium-20.08.0.tar.xz"; }; }; kamera = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kamera-20.04.3.tar.xz"; - sha256 = "dcac50db634fccb3e602abb575322342d50c56832a61731546cf1fec552d5b3e"; - name = "kamera-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kamera-20.08.0.tar.xz"; + sha256 = "ca4194b99703a1908d4991538419c49fc28f5df8cb32f7c07a20454f4918f12a"; + name = "kamera-20.08.0.tar.xz"; }; }; kamoso = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kamoso-20.04.3.tar.xz"; - sha256 = "9b6410f75bd47901cdd787ea5a7a7bc93da16837f955f27de9e609d9e7b4b896"; - name = "kamoso-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kamoso-20.08.0.tar.xz"; + sha256 = "c27ea592a70d7634740973e860acdf8cda49c0880a13f623c315fbc02cc3d592"; + name = "kamoso-20.08.0.tar.xz"; }; }; kanagram = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kanagram-20.04.3.tar.xz"; - sha256 = "7fe8fde45d54b09118238f4a7a63aa2f6fc24ae14c49739ffe71cffc44bc5a95"; - name = "kanagram-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kanagram-20.08.0.tar.xz"; + sha256 = "d7fc300883bb5420ce1f9bc2ec52324a74b775a8ecea12b904afedc0a6af6ca3"; + name = "kanagram-20.08.0.tar.xz"; }; }; kapman = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kapman-20.04.3.tar.xz"; - sha256 = "e3c34e94a204e6d9a4ebb35c415b8c5707313fba746867f2984fd0e95926d529"; - name = "kapman-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kapman-20.08.0.tar.xz"; + sha256 = "24ad6ae146c0770fe4498983604b25ced25eab98b4a94898311553f7e4a97475"; + name = "kapman-20.08.0.tar.xz"; }; }; kapptemplate = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kapptemplate-20.04.3.tar.xz"; - sha256 = "72ce76b66ae503591a60081f334c2d2a0e9338a125b64de413e1e4ab81c29013"; - name = "kapptemplate-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kapptemplate-20.08.0.tar.xz"; + sha256 = "ef92d56a155f1218d28a63167e67f4fc7bbdf9ba63344bef9512b2e1435f322d"; + name = "kapptemplate-20.08.0.tar.xz"; }; }; kate = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kate-20.04.3.tar.xz"; - sha256 = "38d92f2b95032cd20bd5b78ada2ee25fc9c06593047d063c28419df0839bc334"; - name = "kate-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kate-20.08.0.tar.xz"; + sha256 = "aa0695f40cf9d491a08338f1c9b4331dfbb63cb311cf815ed0499b38940fa0db"; + name = "kate-20.08.0.tar.xz"; }; }; katomic = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/katomic-20.04.3.tar.xz"; - sha256 = "9ced288f46af528aa31931a0ab1a1b2d346d63ce6729e508163bf3370dbd261f"; - name = "katomic-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/katomic-20.08.0.tar.xz"; + sha256 = "006c55f3f688f70b51cf89589843037f09d30e826cf1a30ec441e84724ad27ab"; + name = "katomic-20.08.0.tar.xz"; }; }; kbackup = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbackup-20.04.3.tar.xz"; - sha256 = "0360f5b5d512a48975e09e5c1d2f035b7c2e1ead00b9b9f76059b76eb4499f92"; - name = "kbackup-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kbackup-20.08.0.tar.xz"; + sha256 = "5d5882df3dfa6a078940ea6e292fd1c1aba7c016426e36d87f0d7f8c149bcd59"; + name = "kbackup-20.08.0.tar.xz"; }; }; kblackbox = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kblackbox-20.04.3.tar.xz"; - sha256 = "8bf24ceaf33fabd3ec3030b42565dcbb2d8b282553a3222d741b0b43d70d3a38"; - name = "kblackbox-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kblackbox-20.08.0.tar.xz"; + sha256 = "0f6d0341e5bbc16d2d0ec9dc14027ebc91fdda2b9eb2ac6061055a60541db358"; + name = "kblackbox-20.08.0.tar.xz"; }; }; kblocks = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kblocks-20.04.3.tar.xz"; - sha256 = "128cbd7751883cc46d3bc0fcf3c2fc40d8d87631ad54c90459727da209237609"; - name = "kblocks-20.04.3.tar.xz"; - }; - }; - kblog = { - version = "20.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kblog-20.04.3.tar.xz"; - sha256 = "5932a8ba3ec33f13aec201252abb6d0712740f52af03747e9eb0f6c0764cb9b4"; - name = "kblog-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kblocks-20.08.0.tar.xz"; + sha256 = "041904451ce1aec7da113ed4fb442abd92083b8d7522b1c91e05933d574fba8e"; + name = "kblocks-20.08.0.tar.xz"; }; }; kbounce = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbounce-20.04.3.tar.xz"; - sha256 = "21977895752b7a33484463cf3fe47ff6f4d5ad4bb8ee824b92b309c5c0ee3837"; - name = "kbounce-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kbounce-20.08.0.tar.xz"; + sha256 = "7949b9ea43ca93b13378c018d8a532c200233f5f3d2acaba3c74d90f3ed79ccb"; + name = "kbounce-20.08.0.tar.xz"; }; }; kbreakout = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbreakout-20.04.3.tar.xz"; - sha256 = "4e9bd79060d826d99573e3db364005b32d70643b0fe0d7c5e427fb1c8a34896b"; - name = "kbreakout-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kbreakout-20.08.0.tar.xz"; + sha256 = "0aa63a16d45ca432065777352f69a7fc0993fd0077f14e05cb89b06a1b69ad69"; + name = "kbreakout-20.08.0.tar.xz"; }; }; kbruch = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kbruch-20.04.3.tar.xz"; - sha256 = "7381df5deb97580a0d60881d591b3d18715c8ad5692a580aebe82a836f1bb8df"; - name = "kbruch-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kbruch-20.08.0.tar.xz"; + sha256 = "9e0c51ec0e32a8b46b567c7d275acb3845e09aef446c27324d872fc3a096113e"; + name = "kbruch-20.08.0.tar.xz"; }; }; kcachegrind = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcachegrind-20.04.3.tar.xz"; - sha256 = "ef6e782540c254eada9e75049eb02919afd7adc9940ace79aa20dcad26240770"; - name = "kcachegrind-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcachegrind-20.08.0.tar.xz"; + sha256 = "94b3963e9eebc0bf67644de1666cf019649f5eaf924ac01c1af6e48619a11f87"; + name = "kcachegrind-20.08.0.tar.xz"; }; }; kcalc = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcalc-20.04.3.tar.xz"; - sha256 = "1ec38e3bf0c17df25a3367d4f3d5f7ef32b9a6fb5f081c20ad0091a968a2cf4a"; - name = "kcalc-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcalc-20.08.0.tar.xz"; + sha256 = "3b6dee02e43ddb85ae6748cd8aefb422112be411e778c56372e97de0046bfca2"; + name = "kcalc-20.08.0.tar.xz"; }; }; kcalutils = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcalutils-20.04.3.tar.xz"; - sha256 = "6604e0377c8955be7963853691aeaf689c00e2f78caab6b3472ffb4c822e07a3"; - name = "kcalutils-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcalutils-20.08.0.tar.xz"; + sha256 = "82504223fe3a0f6149204aa5f3b38dc7fb05a25048e4a0159ba6e1923c24c1f8"; + name = "kcalutils-20.08.0.tar.xz"; }; }; kcharselect = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcharselect-20.04.3.tar.xz"; - sha256 = "0da77b66efeab1ba7c17335853f3c3feab9b53b4c37cfa6a9f983327d13080f4"; - name = "kcharselect-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcharselect-20.08.0.tar.xz"; + sha256 = "91b17c42286c3a715dcde764057364bada6d07ae163f9b5cdc7daec338ee3a72"; + name = "kcharselect-20.08.0.tar.xz"; }; }; kcolorchooser = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcolorchooser-20.04.3.tar.xz"; - sha256 = "276cee46f92eeb5b47ec09366498b117c657fb2e618fc9fe34c797d4384549fd"; - name = "kcolorchooser-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcolorchooser-20.08.0.tar.xz"; + sha256 = "df1bfd346bfcdea7a585f489f62ab2f76993ce07f83c47cb8202be981b8a3829"; + name = "kcolorchooser-20.08.0.tar.xz"; }; }; kcron = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kcron-20.04.3.tar.xz"; - sha256 = "b1d7d36e5b9efe4fd5c5fedf0b9e267fd2aaf6423e6a18bb64112a0c8257e4fa"; - name = "kcron-20.04.3.tar.xz"; - }; - }; - kdav = { - version = "20.04.3"; - src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdav-20.04.3.tar.xz"; - sha256 = "b645d5d17c967fd09c3d7abdfc262740a95870dd66bd3e5f4c0382da097d8510"; - name = "kdav-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kcron-20.08.0.tar.xz"; + sha256 = "e45d06ed0665d8f1cad3d44cc43035d50fc533bf9ab6e10fe53ab23f2ed5e708"; + name = "kcron-20.08.0.tar.xz"; }; }; kdebugsettings = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdebugsettings-20.04.3.tar.xz"; - sha256 = "5f42891c0990216780fbe005521e423d922007c7ddeac97a05c3c99b6fe30344"; - name = "kdebugsettings-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdebugsettings-20.08.0.tar.xz"; + sha256 = "21914b67dfc654ed525118afeda74e6a0539af9a0f3be05c490e9edbf13b2328"; + name = "kdebugsettings-20.08.0.tar.xz"; }; }; kdeconnect-kde = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdeconnect-kde-20.04.3.tar.xz"; - sha256 = "412940a35dcd9f1491a54e4f9fd5ffdadc890bb9a45cfe2a0f8cb1ee7dc1ccbb"; - name = "kdeconnect-kde-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdeconnect-kde-20.08.0.tar.xz"; + sha256 = "3de16bf165b68635919e68fa2460a5d14139cd9a63cb27573a7b2b2a5b0044a1"; + name = "kdeconnect-kde-20.08.0.tar.xz"; }; }; kde-dev-scripts = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-scripts-20.04.3.tar.xz"; - sha256 = "0b321954ea79e829d81c9be0170babae87e5eab22c8d42b296746d5a0160fbae"; - name = "kde-dev-scripts-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-scripts-20.08.0.tar.xz"; + sha256 = "2c3120e63ebcd41e30acfd53063bad659e1982f79b81429e0541b0100bc25ad3"; + name = "kde-dev-scripts-20.08.0.tar.xz"; }; }; kde-dev-utils = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kde-dev-utils-20.04.3.tar.xz"; - sha256 = "8f004e47bbd5ee032d711673b3320e59663087c636c9c51d031dc563b5391c83"; - name = "kde-dev-utils-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kde-dev-utils-20.08.0.tar.xz"; + sha256 = "7998afa4ac1b293eb3ba8f48ea77cd0bc22d2c2eda84e291d8c9cf2a5e719547"; + name = "kde-dev-utils-20.08.0.tar.xz"; }; }; kdeedu-data = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdeedu-data-20.04.3.tar.xz"; - sha256 = "e717f82a1b4729f0a6df65221e9c2b01df17acf3d4eb8c2340cea23b6b65d969"; - name = "kdeedu-data-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdeedu-data-20.08.0.tar.xz"; + sha256 = "c863f72c8dacb47dc8c82f966f4b70d33f75c2b9f6d63c174e9f3a2c73241943"; + name = "kdeedu-data-20.08.0.tar.xz"; }; }; kdegraphics-mobipocket = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-mobipocket-20.04.3.tar.xz"; - sha256 = "24ce0c1565b8bc922ea08c3d6bb625ff4bba2e656545e09e410a0ff3bc84c80f"; - name = "kdegraphics-mobipocket-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-mobipocket-20.08.0.tar.xz"; + sha256 = "2c11b6efe2c5f7725341c861dd9ba8e919ba3734866e808225c13bb2f2d90a2d"; + name = "kdegraphics-mobipocket-20.08.0.tar.xz"; }; }; kdegraphics-thumbnailers = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdegraphics-thumbnailers-20.04.3.tar.xz"; - sha256 = "b72bdd67738391a10672cd20667555168382285a764bd9e712e1485e7860441f"; - name = "kdegraphics-thumbnailers-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdegraphics-thumbnailers-20.08.0.tar.xz"; + sha256 = "d466c08b4a5e4ccc36907dd38e82019f9060c2ea1931f336f9fbb2f79036566e"; + name = "kdegraphics-thumbnailers-20.08.0.tar.xz"; }; }; kdenetwork-filesharing = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdenetwork-filesharing-20.04.3.tar.xz"; - sha256 = "8cdbe70cd4263e8be6fdc0de987cb9255efae9b747018bc5098c0882a3d69c4d"; - name = "kdenetwork-filesharing-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdenetwork-filesharing-20.08.0.tar.xz"; + sha256 = "8fabf6b5eae8c32bf75db911ae76d35aa9fee66355964cf0ad8150f960b83256"; + name = "kdenetwork-filesharing-20.08.0.tar.xz"; }; }; kdenlive = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdenlive-20.04.3.tar.xz"; - sha256 = "29e5fa37f4680683cc6e244cee4d0b3a0e3e3290f15c0e0b6015ae4784d7315e"; - name = "kdenlive-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdenlive-20.08.0.tar.xz"; + sha256 = "89914ee37f5bbdd16051b0db4a6cfb6f8c3d748f47c9e28e5349920ca133c0bd"; + name = "kdenlive-20.08.0.tar.xz"; }; }; kdepim-addons = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdepim-addons-20.04.3.tar.xz"; - sha256 = "db0c70df94891bd6f90db533287269909e3442bfd0f546fa3f951d71f6268e9d"; - name = "kdepim-addons-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdepim-addons-20.08.0.tar.xz"; + sha256 = "4045f7879cc47829a82a4ada18a35cb3bdf89a489a15cd0bd48441c305b3cb06"; + name = "kdepim-addons-20.08.0.tar.xz"; }; }; kdepim-apps-libs = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdepim-apps-libs-20.04.3.tar.xz"; - sha256 = "7d69ac9cecfe0035e4806f0ff43fd41ac3755d788fffea9fd51427e1bc7027e3"; - name = "kdepim-apps-libs-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdepim-apps-libs-20.08.0.tar.xz"; + sha256 = "bf7ac0af294510e4127808f3f2c1e25368c97b78ff0a5405219abb67173598a0"; + name = "kdepim-apps-libs-20.08.0.tar.xz"; }; }; kdepim-runtime = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdepim-runtime-20.04.3.tar.xz"; - sha256 = "1e4cffed12098baf29d8acfc4e4e12848d36ad8f55bf75d8c089a57e6f906494"; - name = "kdepim-runtime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdepim-runtime-20.08.0.tar.xz"; + sha256 = "f6e4ff70b9cb85e8590ab8d7432abe1b6a2daa14d09a2974f8902b882b16409d"; + name = "kdepim-runtime-20.08.0.tar.xz"; }; }; kdesdk-kioslaves = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-kioslaves-20.04.3.tar.xz"; - sha256 = "7d55121100d048bdab5f045126261eaad55ed58a2de97b211ad6acf03e22344b"; - name = "kdesdk-kioslaves-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-kioslaves-20.08.0.tar.xz"; + sha256 = "0ab8188c1746ec5786d94e5988487b766a04a9df1c275b25778ab2948e302776"; + name = "kdesdk-kioslaves-20.08.0.tar.xz"; }; }; kdesdk-thumbnailers = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdesdk-thumbnailers-20.04.3.tar.xz"; - sha256 = "e526cbad484807e11e03d85e5fc706df118e8f3327846f396e8df024b770c566"; - name = "kdesdk-thumbnailers-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdesdk-thumbnailers-20.08.0.tar.xz"; + sha256 = "8f2adb38ca24b82119eb52ef879f5fd6a5d48b9c012956a518cefefd86fbd6d3"; + name = "kdesdk-thumbnailers-20.08.0.tar.xz"; }; }; kdf = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdf-20.04.3.tar.xz"; - sha256 = "f52e34c36cd924ae6f8fa1291d548abbf5e0bcf0c82d69a583f01dfe128332a8"; - name = "kdf-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdf-20.08.0.tar.xz"; + sha256 = "2f5fddbaf09d3cfdfb3e18b0a9292ecb6bcf14969e4d031a4215f22fecda0892"; + name = "kdf-20.08.0.tar.xz"; }; }; kdialog = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdialog-20.04.3.tar.xz"; - sha256 = "75b8214980f5043d23b0226827f049815147e1206ffd64c1fe9e091e63c27a62"; - name = "kdialog-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdialog-20.08.0.tar.xz"; + sha256 = "669da86bebf2cfac4cda7c873bb57417aac8d293cee8c5950968495520954ed5"; + name = "kdialog-20.08.0.tar.xz"; }; }; kdiamond = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kdiamond-20.04.3.tar.xz"; - sha256 = "f1bd1c5471224d4ab2269637bd89e11e5903bf4f15f1b2a3ae01c252adad7096"; - name = "kdiamond-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kdiamond-20.08.0.tar.xz"; + sha256 = "56efcb8b2bf81d62324911f404e918f7bcd62f6fa2ee9d4e513df54e37631889"; + name = "kdiamond-20.08.0.tar.xz"; }; }; keditbookmarks = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/keditbookmarks-20.04.3.tar.xz"; - sha256 = "ec25b40d0ab85e3f72eb334ea7d658d6fe19ae08d626d9fbf0ad71d57594ad88"; - name = "keditbookmarks-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/keditbookmarks-20.08.0.tar.xz"; + sha256 = "7fab031ae4d62e3c9d37dce671af4580afe01e6e3411ef199115568e893b7df5"; + name = "keditbookmarks-20.08.0.tar.xz"; }; }; kfind = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kfind-20.04.3.tar.xz"; - sha256 = "ff0d412dcd4b5812eb781618c4bf52d33f4691af2b9def4ba56644b5a668ef6e"; - name = "kfind-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kfind-20.08.0.tar.xz"; + sha256 = "f47f1ee0dc1c75b90d70027eb0ce2b470912aff9db2c18a0380eb65b16e6c842"; + name = "kfind-20.08.0.tar.xz"; }; }; kfloppy = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kfloppy-20.04.3.tar.xz"; - sha256 = "4e0d392471eddd23847129b5538846edd1a834f02119d312aed3698e6bfd9e1c"; - name = "kfloppy-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kfloppy-20.08.0.tar.xz"; + sha256 = "85732b804ee19c1a1db82845d7ab8c1ba1872d8d40737ee5b6beef8798c457f3"; + name = "kfloppy-20.08.0.tar.xz"; }; }; kfourinline = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kfourinline-20.04.3.tar.xz"; - sha256 = "c339009355dea086c28baa454aac1c15d601e15685ba8006100f50475518875f"; - name = "kfourinline-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kfourinline-20.08.0.tar.xz"; + sha256 = "9b1d520d61ddd98ce629a50355a190bded41d6abea100d87f3650e15e0c358b6"; + name = "kfourinline-20.08.0.tar.xz"; }; }; kgeography = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kgeography-20.04.3.tar.xz"; - sha256 = "69b4b06cfb1f6abb5c12bb0bf9334f178af2018288ee507678efe594e0392887"; - name = "kgeography-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kgeography-20.08.0.tar.xz"; + sha256 = "7fd2b7449309d6c42e01038c93ce8dda9c7a8acb806b27b9ff58d4556711ff5e"; + name = "kgeography-20.08.0.tar.xz"; }; }; kget = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kget-20.04.3.tar.xz"; - sha256 = "930b7ed50d19e41bfead8e6d71d8ec4024d688907489c17fb9274a73e4c7c0c2"; - name = "kget-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kget-20.08.0.tar.xz"; + sha256 = "de46cbe0a53c7246d1aeb4f15d24b90633eaf37e236d67882e1454b61fea1a09"; + name = "kget-20.08.0.tar.xz"; }; }; kgoldrunner = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kgoldrunner-20.04.3.tar.xz"; - sha256 = "ab535067a8991a94bd7cd5a990a6120538206d241c8e8149c7b774cbdd1d0941"; - name = "kgoldrunner-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kgoldrunner-20.08.0.tar.xz"; + sha256 = "29caf1637daea69013061d170a749411b18f543af7e2f8a0f295f1eb5cb62586"; + name = "kgoldrunner-20.08.0.tar.xz"; }; }; kgpg = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kgpg-20.04.3.tar.xz"; - sha256 = "bcd3211ab8112f070215e8e6451021859fefc57b813bdad1b421a1f129e17cbb"; - name = "kgpg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kgpg-20.08.0.tar.xz"; + sha256 = "102cc0d44b7621ebad1d5914bbb44a598689ebb95093e4a76713679996c2af0c"; + name = "kgpg-20.08.0.tar.xz"; }; }; khangman = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/khangman-20.04.3.tar.xz"; - sha256 = "db827d20ce5f0522675d75c18fd4c804047cc2e5a2ca2f7a7421b5fc91952831"; - name = "khangman-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/khangman-20.08.0.tar.xz"; + sha256 = "11f442e24f0a428c0338000f66687bc021f4290bcd8cc0acc3fd882ce3cf4b0b"; + name = "khangman-20.08.0.tar.xz"; }; }; khelpcenter = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/khelpcenter-20.04.3.tar.xz"; - sha256 = "3930c321388f27925a63add5f11fe65eb34b7301fb22d78f16f5f3de8467a9ed"; - name = "khelpcenter-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/khelpcenter-20.08.0.tar.xz"; + sha256 = "2c45fb76c5503441dcf9ab1cae386dd2e10a2ad1af08f60090d362e82364e98c"; + name = "khelpcenter-20.08.0.tar.xz"; }; }; kidentitymanagement = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kidentitymanagement-20.04.3.tar.xz"; - sha256 = "09e63cdb07bb38ba8c82d796212b1bd9d218dbe8adde215bff9c689c93b90917"; - name = "kidentitymanagement-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kidentitymanagement-20.08.0.tar.xz"; + sha256 = "4c7dca3e27f87203b27af219ebe07701e641a56dd7a8c1d7a3fa7cef2fe1c5af"; + name = "kidentitymanagement-20.08.0.tar.xz"; }; }; kig = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kig-20.04.3.tar.xz"; - sha256 = "ccbc8f10e79f420d8a97aa00616fc29ed771721bfe22eb74b160464ac6cc3023"; - name = "kig-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kig-20.08.0.tar.xz"; + sha256 = "fa9754f5a67e35fdfd8b836d423001fc48fe5c41fadbfceece834fb3f5b6cccd"; + name = "kig-20.08.0.tar.xz"; }; }; kigo = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kigo-20.04.3.tar.xz"; - sha256 = "ccc4f9638bfd3e1bf7f25621e10907f08cd0354858f9a174ab8f5c51c77e8a77"; - name = "kigo-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kigo-20.08.0.tar.xz"; + sha256 = "5e787cad2370b479feeae3be81b0972314429e0e896b9943445653731c9c6040"; + name = "kigo-20.08.0.tar.xz"; }; }; killbots = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/killbots-20.04.3.tar.xz"; - sha256 = "66c48ddeb49118ea8139422c0370256f88a4e3104dbe664bc25d2c63edfdf326"; - name = "killbots-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/killbots-20.08.0.tar.xz"; + sha256 = "3b647fd8af007619acdfc7c72d572a3184a8e8c5ecbeb472559c5e40e9d53257"; + name = "killbots-20.08.0.tar.xz"; }; }; kimagemapeditor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kimagemapeditor-20.04.3.tar.xz"; - sha256 = "d86f8a9e0a1aba71236f7af844076758774ab1c10b4b2fa1d244c9b5d24adf33"; - name = "kimagemapeditor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kimagemapeditor-20.08.0.tar.xz"; + sha256 = "17d3ccfc35aecd802729da6c78a78cb358cf68bd5079bcae6d83af0874e86a00"; + name = "kimagemapeditor-20.08.0.tar.xz"; }; }; kimap = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kimap-20.04.3.tar.xz"; - sha256 = "870d22a4f07080453ade2e1224acb563232211fe48e1beabe8c58d27730b4bfa"; - name = "kimap-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kimap-20.08.0.tar.xz"; + sha256 = "4ebb75312aac29274d8faa68f885c78a77c1173fc0200c08825670ac263cbec6"; + name = "kimap-20.08.0.tar.xz"; }; }; kio-extras = { - version = "20.04.3"; + version = "20.08.0"; + src = fetchurl { + url = "${mirror}/stable/release-service/20.08.0/src/kio-extras-20.08.0.tar.xz"; + sha256 = "6bfbb92dd56755ec0b2dee0cd889d6081ae00df339c05b4cb7a173a463275e2d"; + name = "kio-extras-20.08.0.tar.xz"; + }; + }; + kio-gdrive = { + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kio-extras-20.04.3.tar.xz"; - sha256 = "ff0edabe83ee4958ce7559e935f6b7ae3f76aee43ee5774543368ca334b21090"; - name = "kio-extras-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kio-gdrive-20.08.0.tar.xz"; + sha256 = "c08f809d575a24887aacd1a046b01cf2c3df7b77813fecf89cb6cdbec13ab299"; + name = "kio-gdrive-20.08.0.tar.xz"; }; }; kipi-plugins = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kipi-plugins-20.04.3.tar.xz"; - sha256 = "e128ba8a2194bb0ce6a5eac97d56479003f08c1d740a56a6c8d976df1a71632a"; - name = "kipi-plugins-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kipi-plugins-20.08.0.tar.xz"; + sha256 = "f8f03a9797b4855839693ffca93245460e78fd2f6eeb763d16dd159711f40683"; + name = "kipi-plugins-20.08.0.tar.xz"; }; }; kirigami-gallery = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kirigami-gallery-20.04.3.tar.xz"; - sha256 = "1868c4782c8a9c7a80eb6b465a27cb7fc46dc9a8e47d2530559ba3b2f1131461"; - name = "kirigami-gallery-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kirigami-gallery-20.08.0.tar.xz"; + sha256 = "8cabcee747152b41b558c0a9eb1fd0d55fb155b3b807a57d2176023806a59f2b"; + name = "kirigami-gallery-20.08.0.tar.xz"; }; }; kiriki = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kiriki-20.04.3.tar.xz"; - sha256 = "1df78a7b9e91f20841411fc2561d077dcd897211e5c20f1f526670c9f3b7a97d"; - name = "kiriki-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kiriki-20.08.0.tar.xz"; + sha256 = "56db705674a43c249f2374eb1ce2c20e4b3e22223348959b3f5db67c0f52db4f"; + name = "kiriki-20.08.0.tar.xz"; }; }; kiten = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kiten-20.04.3.tar.xz"; - sha256 = "3b0bdd2b711ee67bbc194b301da3ed99d4ee75bb6ff18ab50c0a1b4c1c4ef162"; - name = "kiten-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kiten-20.08.0.tar.xz"; + sha256 = "17cb8344d679040b5c7be99049f73b88517cf127e3d045d469cdae9602945263"; + name = "kiten-20.08.0.tar.xz"; }; }; kitinerary = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kitinerary-20.04.3.tar.xz"; - sha256 = "8c7dab2e28891af268d22884ecbb9cd7031c4b34352ed3b576dbb6dcb5977c7e"; - name = "kitinerary-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kitinerary-20.08.0.tar.xz"; + sha256 = "a87ce5dd8e978dad8bcac7d92d89c4a5eeaa847e8819c2aa84ebce51dfe95f50"; + name = "kitinerary-20.08.0.tar.xz"; }; }; kjumpingcube = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kjumpingcube-20.04.3.tar.xz"; - sha256 = "1716e1de95e8610dc80d991c4518beedbdf6d4c40a07f71a1dba0971e0a6cb9b"; - name = "kjumpingcube-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kjumpingcube-20.08.0.tar.xz"; + sha256 = "5ea4187326a0ff0a77c0aef774d9ba9c3c20b438def85abe9e4b0822a8350a70"; + name = "kjumpingcube-20.08.0.tar.xz"; }; }; kldap = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kldap-20.04.3.tar.xz"; - sha256 = "ab32ef61da11f1401f9d648f6831a946dd6964ffd4f35f6c84ad9ca19dd422f1"; - name = "kldap-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kldap-20.08.0.tar.xz"; + sha256 = "db358a6ec50f5d3988583096ccc5fe1389999b4dd3a3c787d7797f6e0b32ee53"; + name = "kldap-20.08.0.tar.xz"; }; }; kleopatra = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kleopatra-20.04.3.tar.xz"; - sha256 = "59c6eb6b626b502f6b194ac4bbde8ed95e613d6b6fd54818c0206dd84575a34d"; - name = "kleopatra-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kleopatra-20.08.0.tar.xz"; + sha256 = "776fbb8d06edc83834745a8af05b23297aeba89b8dce3410a2d48f37a91b5a87"; + name = "kleopatra-20.08.0.tar.xz"; }; }; klettres = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/klettres-20.04.3.tar.xz"; - sha256 = "ed943bce624a599f7759487d0ff3b16c340f2beadbad25dab30b6607dbd2695e"; - name = "klettres-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/klettres-20.08.0.tar.xz"; + sha256 = "55748999e29ecec5fb3ce206c74bc44f7e83f4f239edd61c161e4df4e597bca2"; + name = "klettres-20.08.0.tar.xz"; }; }; klickety = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/klickety-20.04.3.tar.xz"; - sha256 = "703158b1c1cafc16368fa09c4c58ea6d10942b90af693a851f9b5ec84add691d"; - name = "klickety-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/klickety-20.08.0.tar.xz"; + sha256 = "0b6d71d54a5521ae8cc66eca1d397289a35733af2fc686b82bc01dd6777fa926"; + name = "klickety-20.08.0.tar.xz"; }; }; klines = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/klines-20.04.3.tar.xz"; - sha256 = "83bebb2dbb7da8e325a378da3903246ff562c56dcf9ea4991dedb5b253c81f7d"; - name = "klines-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/klines-20.08.0.tar.xz"; + sha256 = "778928fc55fe551eb836beba3f74b0f20602a0fae7366c71fa84a95ad6ca803a"; + name = "klines-20.08.0.tar.xz"; }; }; kmag = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmag-20.04.3.tar.xz"; - sha256 = "f006b2e3b685accc343cdfc8b90d915e7c2647d983b66c2d38565d669ed6d464"; - name = "kmag-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmag-20.08.0.tar.xz"; + sha256 = "b1a8fe75a03dbeac8f2080808f580bea588bf39c97534ddfa0cbf7d0de20efb7"; + name = "kmag-20.08.0.tar.xz"; }; }; kmahjongg = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmahjongg-20.04.3.tar.xz"; - sha256 = "1f4fce58163323c23aa37f849e556ee4ed7fe33fb36e21754116e1d0e2c33673"; - name = "kmahjongg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmahjongg-20.08.0.tar.xz"; + sha256 = "05538c97613d6e3547161136b9d7aec9bb2918c9f4033a084e1576041b83d4e6"; + name = "kmahjongg-20.08.0.tar.xz"; }; }; kmail = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmail-20.04.3.tar.xz"; - sha256 = "5b653c680097a7be4ff53bc902bc3fcda9edac99f699a63a1375a1df81240d03"; - name = "kmail-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmail-20.08.0.tar.xz"; + sha256 = "0432ec1fd68868e9385dd3f6b9e2429feb5b5057317ef3940eb0e67a63e0c0f0"; + name = "kmail-20.08.0.tar.xz"; }; }; kmail-account-wizard = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmail-account-wizard-20.04.3.tar.xz"; - sha256 = "ba789c679664a390480808431510d7d6ee1591a5f7be3dfceb5951347e3cc9b1"; - name = "kmail-account-wizard-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmail-account-wizard-20.08.0.tar.xz"; + sha256 = "9f4eac46049acbc7452bbbf84569031d91f86c2577beecacb3a6200deefcc253"; + name = "kmail-account-wizard-20.08.0.tar.xz"; }; }; kmailtransport = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmailtransport-20.04.3.tar.xz"; - sha256 = "45685bf61f24c9c7070a9f5b982d48005a7bf0ef04f391df2959772b17857cc2"; - name = "kmailtransport-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmailtransport-20.08.0.tar.xz"; + sha256 = "af337017b884519065fea520fd66a8fc2e553d84ca3d8afc35739c18e67b4d73"; + name = "kmailtransport-20.08.0.tar.xz"; }; }; kmbox = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmbox-20.04.3.tar.xz"; - sha256 = "50b2a8ba98cf24117ba66ddb9b51d1db575998b36ad1aa15fec0135446cc7561"; - name = "kmbox-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmbox-20.08.0.tar.xz"; + sha256 = "58a2ecc7222a8ee5697102ca2bc871e7e30c823dcd906ac4160323fd1ba14d85"; + name = "kmbox-20.08.0.tar.xz"; }; }; kmime = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmime-20.04.3.tar.xz"; - sha256 = "a416e16f61a2dd4274b1abc54af71ffe73b01c93137bc1fa462642bb947d150c"; - name = "kmime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmime-20.08.0.tar.xz"; + sha256 = "55f2160fa78202cf45a4b08b9bb2fec1bc54a3700f6c9aceeec8d7fc3a64a317"; + name = "kmime-20.08.0.tar.xz"; }; }; kmines = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmines-20.04.3.tar.xz"; - sha256 = "8a729ffd6406d7d6173fbd050e40a566b5ce4e7b960f3971fff82fef9c18c4d3"; - name = "kmines-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmines-20.08.0.tar.xz"; + sha256 = "d8d0f1a82fe279ed208a9005e8ffbe1277e25b33e9e0a1301013820e559ba750"; + name = "kmines-20.08.0.tar.xz"; }; }; kmix = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmix-20.04.3.tar.xz"; - sha256 = "1830bc59d836d2155fd7a24c5afe3c7f5682a96217c159a062fd28b851414dc6"; - name = "kmix-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmix-20.08.0.tar.xz"; + sha256 = "4553362d4d14fdaf019b1fc55b98aac16c2db56542996a3c2f87603c41bc2859"; + name = "kmix-20.08.0.tar.xz"; }; }; kmousetool = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmousetool-20.04.3.tar.xz"; - sha256 = "acf710dcdc53e58d3a833345f88214b22dfbd5ab9fd26d9e26c883c18441c715"; - name = "kmousetool-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmousetool-20.08.0.tar.xz"; + sha256 = "285d947548ee863de6274888b097e19aff39ed2bb8cdd33e37707c39c8417863"; + name = "kmousetool-20.08.0.tar.xz"; }; }; kmouth = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmouth-20.04.3.tar.xz"; - sha256 = "edc1aab8edd13f3f10f99b79a27dabaffe22ac7048868dd7b66b33a662cc46b2"; - name = "kmouth-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmouth-20.08.0.tar.xz"; + sha256 = "a783e73e8087d090cf4eba89fabcb9aee8c6b0858a6dea8a137323c1bbc110b1"; + name = "kmouth-20.08.0.tar.xz"; }; }; kmplot = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kmplot-20.04.3.tar.xz"; - sha256 = "57389abae04c204d0c2462709b70a919e0050b20867bcb23f3ab72788051e501"; - name = "kmplot-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kmplot-20.08.0.tar.xz"; + sha256 = "f2d31d8c9091c74c6d0e65a0cba77bac23eb6f78913b31d049a0e2c9ca4ec8c0"; + name = "kmplot-20.08.0.tar.xz"; }; }; knavalbattle = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knavalbattle-20.04.3.tar.xz"; - sha256 = "78feb74eb2e52d4738e5aa8969dc4db00307bb758623cbf34d7f245242f07279"; - name = "knavalbattle-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/knavalbattle-20.08.0.tar.xz"; + sha256 = "887d2f4e24d522ab66c2a4e183b9d5359213d67382fa2350f2edff6478666aa8"; + name = "knavalbattle-20.08.0.tar.xz"; }; }; knetwalk = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knetwalk-20.04.3.tar.xz"; - sha256 = "6bc61fb70eb0cde3f312aa672f848447ed5eb5bbc2d48d65c6a010c12e154054"; - name = "knetwalk-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/knetwalk-20.08.0.tar.xz"; + sha256 = "83fdf150c1c14f7c1807b73ce1d4bacfd10469f565541a379daa828755ddf5c6"; + name = "knetwalk-20.08.0.tar.xz"; }; }; knights = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knights-20.04.3.tar.xz"; - sha256 = "b695e1f141dc3fd1a5deca6179bddb0f3d4aa9103c5cc539c01a2a789adade4f"; - name = "knights-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/knights-20.08.0.tar.xz"; + sha256 = "b754af5da0ee922834644c578f2133695cc446dfb8ac327fae357e7a6c027bf7"; + name = "knights-20.08.0.tar.xz"; }; }; knotes = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/knotes-20.04.3.tar.xz"; - sha256 = "90c47b902f738492286d9b3e0acb26e6a10504e1c933f921213cd1784309b796"; - name = "knotes-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/knotes-20.08.0.tar.xz"; + sha256 = "35454e609c6ea2f805c8976d2897d2b2b9137a61ad8d396be2b510881bbd7cf3"; + name = "knotes-20.08.0.tar.xz"; }; }; kolf = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kolf-20.04.3.tar.xz"; - sha256 = "dc2fd28fbfaa21d75ad6482513adddb9bd04ac0432d2d72419f85d65140ee186"; - name = "kolf-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kolf-20.08.0.tar.xz"; + sha256 = "dbc0d129e1d1fc8c597979c5ec96d612014aa56b0b0825be653b410995987305"; + name = "kolf-20.08.0.tar.xz"; }; }; kollision = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kollision-20.04.3.tar.xz"; - sha256 = "49365efc2cfc4c9406cbedf84ad8a135df79536cba166cd77402955803a56207"; - name = "kollision-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kollision-20.08.0.tar.xz"; + sha256 = "a7d59d6f4132a669ce4fe74b3b58168ce6f2036a27d37cc6362b471b58a70fe4"; + name = "kollision-20.08.0.tar.xz"; }; }; kolourpaint = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kolourpaint-20.04.3.tar.xz"; - sha256 = "55ec6d42fcf10b15b80b6fdabacdf189d1cda283a19a1c04b6a4a58abb56bee8"; - name = "kolourpaint-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kolourpaint-20.08.0.tar.xz"; + sha256 = "f2b5dee4e8c2b8245b2fd652c5ead015f637f62bc4b799735af255e2c5831629"; + name = "kolourpaint-20.08.0.tar.xz"; }; }; kompare = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kompare-20.04.3.tar.xz"; - sha256 = "6c49547c3adbe96c184bae6eda47963ce42ede2808e5588ec3f8ea924853a941"; - name = "kompare-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kompare-20.08.0.tar.xz"; + sha256 = "712d248edc6eae8dd94d41efccde94ccbc5753ecd01eb69cb3d80757a63805a3"; + name = "kompare-20.08.0.tar.xz"; }; }; konqueror = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/konqueror-20.04.3.tar.xz"; - sha256 = "d2f81f697e88eb4fe962aaa43942ef35e7a03df10f811a46ae6805a27e637e35"; - name = "konqueror-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/konqueror-20.08.0.tar.xz"; + sha256 = "4db172cff4bd3fd06ee1905dcf87013059e02902808e77acfc4bf2734d6ff73f"; + name = "konqueror-20.08.0.tar.xz"; }; }; konquest = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/konquest-20.04.3.tar.xz"; - sha256 = "004b3d8d38acecb0d5e78d037a47d137f0517d74768da461ce51fbd2a549578d"; - name = "konquest-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/konquest-20.08.0.tar.xz"; + sha256 = "e6938230c2fdd94903d13ed34f8d1e8db8221c9ceb571c5737f429291d4cca04"; + name = "konquest-20.08.0.tar.xz"; }; }; konsole = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/konsole-20.04.3.tar.xz"; - sha256 = "7874b6117d31eecd9fc475536c9bfc73c78d66d57b128cffb0bb931881564f15"; - name = "konsole-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/konsole-20.08.0.tar.xz"; + sha256 = "b641bc2f66195887a25ec588b638a78a0d00e6d2d41c126bca9a45f30f70aee9"; + name = "konsole-20.08.0.tar.xz"; }; }; kontact = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kontact-20.04.3.tar.xz"; - sha256 = "c35a68a0a99195d1d9b63f7c8edaadb9e4f1dd6957e3823e2e44c8225ccafde7"; - name = "kontact-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kontact-20.08.0.tar.xz"; + sha256 = "d759b475938079f87d5042d4fc6608c0263800cfc2156e83c874faa77c488646"; + name = "kontact-20.08.0.tar.xz"; }; }; kontactinterface = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kontactinterface-20.04.3.tar.xz"; - sha256 = "9c0587df91b9de55218d7313c445c68d13b22aeb09dc142caf8d8036574e3b09"; - name = "kontactinterface-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kontactinterface-20.08.0.tar.xz"; + sha256 = "6b20e160642063b966f359ecf2e1946db161728d42f4e6b15a77f6a19f151048"; + name = "kontactinterface-20.08.0.tar.xz"; }; }; kopete = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kopete-20.04.3.tar.xz"; - sha256 = "b37a120e3239ee4e53aedf5756c63f62a737c0774021ec27b120b054e57f886b"; - name = "kopete-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kopete-20.08.0.tar.xz"; + sha256 = "44805238ed04620101d3921e3eab0bb89d329c4d216b9cb49589459a3e4ea7e6"; + name = "kopete-20.08.0.tar.xz"; }; }; korganizer = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/korganizer-20.04.3.tar.xz"; - sha256 = "bf2ee5a3e50dca9ab0cde0b5b0d67dc561788527a216d4ef159144da5bf192a3"; - name = "korganizer-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/korganizer-20.08.0.tar.xz"; + sha256 = "c99470c92327e9e6c91276b4141bb36b08e3a9726e40edba6656d1014ee46b82"; + name = "korganizer-20.08.0.tar.xz"; }; }; kpat = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kpat-20.04.3.tar.xz"; - sha256 = "2a207c9efa1a62c99f8b33cf44782c563ee032b706ef63548239a4c303ec9a66"; - name = "kpat-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kpat-20.08.0.tar.xz"; + sha256 = "feaca3a018a8b2a94a183915b29ff671474911b1da3a149bf3ba70fdcd0a6f53"; + name = "kpat-20.08.0.tar.xz"; }; }; kpimtextedit = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kpimtextedit-20.04.3.tar.xz"; - sha256 = "f6cc5cf0ca2e598ba0c98590f16a8fabf87e1592ad62e6832c787cf2c3616cb8"; - name = "kpimtextedit-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kpimtextedit-20.08.0.tar.xz"; + sha256 = "3ae3b9f8a980d10e366351efaf2b186fd911402da5b5ee634f4687d43586ce34"; + name = "kpimtextedit-20.08.0.tar.xz"; }; }; kpkpass = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kpkpass-20.04.3.tar.xz"; - sha256 = "1f8b9bd587c278773fb016bc9fb774b03f82bcdf3c95fdca8bfc070f9a3ff322"; - name = "kpkpass-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kpkpass-20.08.0.tar.xz"; + sha256 = "553b841cf3fdf4809251941997f7dee8e09360a5b7df386e3540c73d176ba055"; + name = "kpkpass-20.08.0.tar.xz"; }; }; kqtquickcharts = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kqtquickcharts-20.04.3.tar.xz"; - sha256 = "69ff44ceb85779f7d4f52e092a8a5d18231ea0704d67d34d15ef94acf0d668c7"; - name = "kqtquickcharts-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kqtquickcharts-20.08.0.tar.xz"; + sha256 = "f17807dfa20de202615c56779ef6e4d355a275b576d6e0969357fdb359b1b235"; + name = "kqtquickcharts-20.08.0.tar.xz"; }; }; krdc = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/krdc-20.04.3.tar.xz"; - sha256 = "4e8f60b4abd05d45e59a773a63cc185529e9fbabb295524a59c835af547d4bc8"; - name = "krdc-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/krdc-20.08.0.tar.xz"; + sha256 = "96f4411dc80e746142796745c3b7fca4663aa37878391a00d1e70f2ba3be652c"; + name = "krdc-20.08.0.tar.xz"; }; }; kreversi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kreversi-20.04.3.tar.xz"; - sha256 = "b2d9220f5919361ff81473c8b597585cc4c004b16ee459691e26feeb2e0c3114"; - name = "kreversi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kreversi-20.08.0.tar.xz"; + sha256 = "341603d23ffaf94af6c246540bbe7ba86aca3e5afe3135a0511aca22cd6a4d7f"; + name = "kreversi-20.08.0.tar.xz"; }; }; krfb = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/krfb-20.04.3.tar.xz"; - sha256 = "44532435ef824ff09d877d6984dbdfdcc5fd941f9e2abed65829dba89afeee0d"; - name = "krfb-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/krfb-20.08.0.tar.xz"; + sha256 = "f7ca46cc216ecd3790d045a36a642c834a9af4024409075e7a5bf8b498c67e4b"; + name = "krfb-20.08.0.tar.xz"; }; }; kross-interpreters = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kross-interpreters-20.04.3.tar.xz"; - sha256 = "7e5d1f771477831f42dc209c0333977af17a143ec8c7f60acbab9f5390818457"; - name = "kross-interpreters-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kross-interpreters-20.08.0.tar.xz"; + sha256 = "7a27547b150d686524578fc256e1282f64554513d2724994020caf89e7a60b10"; + name = "kross-interpreters-20.08.0.tar.xz"; }; }; kruler = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kruler-20.04.3.tar.xz"; - sha256 = "66a02829d860777184e281747dd696c6bd326d874a96173d9c47759b9e7243fe"; - name = "kruler-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kruler-20.08.0.tar.xz"; + sha256 = "71ca2308b8cee2fdd01faac526d20c813cab3664443b78e751f9d7d024e4e2c0"; + name = "kruler-20.08.0.tar.xz"; }; }; kshisen = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kshisen-20.04.3.tar.xz"; - sha256 = "ee91821b13dc13d54a0cdf64582eff820faf934df3654135c55bd3210b98bd52"; - name = "kshisen-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kshisen-20.08.0.tar.xz"; + sha256 = "5b3cc83d3cd427dcbaa98e2536f58deb36ee4eefe0a35e6d5c9613a64abad0d8"; + name = "kshisen-20.08.0.tar.xz"; }; }; ksirk = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksirk-20.04.3.tar.xz"; - sha256 = "c3c86db84b2603a0cd11e7b0da5e3c66b81c26983ace113b836ec3579dce736a"; - name = "ksirk-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksirk-20.08.0.tar.xz"; + sha256 = "7e4acd8586a2c8619c3ca08138ca22cee46b4c46d5972a571665b09c6468cd06"; + name = "ksirk-20.08.0.tar.xz"; }; }; ksmtp = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksmtp-20.04.3.tar.xz"; - sha256 = "107d135e9337dfec6f16095c75dd0cf81bdc86cee6eeb6d212954a08a9c2e3ce"; - name = "ksmtp-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksmtp-20.08.0.tar.xz"; + sha256 = "3fe08534bdb7037a8fd9a8c1a37456abe80252994232cfe31c368dcdc3c328c2"; + name = "ksmtp-20.08.0.tar.xz"; }; }; ksnakeduel = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksnakeduel-20.04.3.tar.xz"; - sha256 = "99a033313a3093489d39e7d537d064287aeebbfea05accfe8a189f0296664bf2"; - name = "ksnakeduel-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksnakeduel-20.08.0.tar.xz"; + sha256 = "ebc5353ea2e5d16f2d966859b0ea081c81ed7d10c1975054e441545b79f60e5e"; + name = "ksnakeduel-20.08.0.tar.xz"; }; }; kspaceduel = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kspaceduel-20.04.3.tar.xz"; - sha256 = "dda32d2a89645129c7ee83aca7b21bc01d5120e0d58e8f39516c0837be531e38"; - name = "kspaceduel-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kspaceduel-20.08.0.tar.xz"; + sha256 = "6cd633521091ac8a1eed28b234657ba2db287c3b29ee2d071005f3438bbb1b07"; + name = "kspaceduel-20.08.0.tar.xz"; }; }; ksquares = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksquares-20.04.3.tar.xz"; - sha256 = "eb72d929cd59b076d20483ee03548d72df3dc894b631947ce3440aff0ecad730"; - name = "ksquares-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksquares-20.08.0.tar.xz"; + sha256 = "84b459e6c1058f637b4894a4f97dfd95b0c9bb70954059d24538f80918b45ed3"; + name = "ksquares-20.08.0.tar.xz"; }; }; ksudoku = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksudoku-20.04.3.tar.xz"; - sha256 = "2df6e5cf78eee919624aa71716ef35baa9215e44662cdd7b315cfbc328c6ac19"; - name = "ksudoku-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksudoku-20.08.0.tar.xz"; + sha256 = "0dbe6e03ca8b7203a307f97dad4a8035c20f3172d3e005b047557c2334c04a92"; + name = "ksudoku-20.08.0.tar.xz"; }; }; ksystemlog = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ksystemlog-20.04.3.tar.xz"; - sha256 = "03a6f81d1b4aa8557f7da6777ef909a02fbd811b3a39df81312dc0a70bbb8f77"; - name = "ksystemlog-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ksystemlog-20.08.0.tar.xz"; + sha256 = "359eaa1cc34fa06b2ef3788c249c2b3355d6d39cddbf809df07179c10630e9a4"; + name = "ksystemlog-20.08.0.tar.xz"; }; }; kteatime = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kteatime-20.04.3.tar.xz"; - sha256 = "2ddc0df953a66376e5b0c11544a6a2ec9f173e4481a44a290aada20402c7d686"; - name = "kteatime-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kteatime-20.08.0.tar.xz"; + sha256 = "c7142cd0329cf23fdb79d3c2d508cb00cb70c517db1f832d2a39ba7c4e103fd3"; + name = "kteatime-20.08.0.tar.xz"; }; }; ktimer = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktimer-20.04.3.tar.xz"; - sha256 = "e9881d68ed4fbbff5900d615f81145cd73e70a08092a83b87d71705ee5904395"; - name = "ktimer-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktimer-20.08.0.tar.xz"; + sha256 = "4a3722945f26df087158a5af69cc81ba10054a778f04fecd32ff816732dff0dd"; + name = "ktimer-20.08.0.tar.xz"; }; }; ktnef = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktnef-20.04.3.tar.xz"; - sha256 = "31f5f15ab27112f99ab7b2575a4f90bf612b99a3816544e6919ad4c5a2dc7145"; - name = "ktnef-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktnef-20.08.0.tar.xz"; + sha256 = "69d18a052cc522161821f98fb4103d38e1ff566622915b7138866e7737ffa62f"; + name = "ktnef-20.08.0.tar.xz"; }; }; ktouch = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktouch-20.04.3.tar.xz"; - sha256 = "7f1c456ae758a6e7eb58e83120289fa8eb5c56c3c98cd9c9f974cea5dd156ea8"; - name = "ktouch-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktouch-20.08.0.tar.xz"; + sha256 = "c4b218f672c0cb86930cdadf622d758a42b54732319e8ea86405b7f9b3281802"; + name = "ktouch-20.08.0.tar.xz"; }; }; ktp-accounts-kcm = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-accounts-kcm-20.04.3.tar.xz"; - sha256 = "d45588dbd1441ccb0576e7f76489217351bad5fd25d4636ae9da6f81654f5f4b"; - name = "ktp-accounts-kcm-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-accounts-kcm-20.08.0.tar.xz"; + sha256 = "912552aa0df62298323c5eaaf36975b71ef50be56a5b69ceddcd5f00d4acb4f9"; + name = "ktp-accounts-kcm-20.08.0.tar.xz"; }; }; ktp-approver = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-approver-20.04.3.tar.xz"; - sha256 = "9c91d44476151f39ef02e2eeede7dee7f24689643a07d51d44ca8d98577d24a2"; - name = "ktp-approver-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-approver-20.08.0.tar.xz"; + sha256 = "463a9009599b6e18b2e30793b6bce408e4c9a0edb2de458fb588204eb0aa2f3a"; + name = "ktp-approver-20.08.0.tar.xz"; }; }; ktp-auth-handler = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-auth-handler-20.04.3.tar.xz"; - sha256 = "6c73960c44ff42e8c0b6be54b308fc992ab8177f90954ebd960ea6d610e14568"; - name = "ktp-auth-handler-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-auth-handler-20.08.0.tar.xz"; + sha256 = "d2f1dd4c5f4043eebeb178dd20eedc95dea47a4c75f2df13cd1d9cd0288b699a"; + name = "ktp-auth-handler-20.08.0.tar.xz"; }; }; ktp-call-ui = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-call-ui-20.04.3.tar.xz"; - sha256 = "b997c6252c35f7e295f2389ac76c5dc12227e8a6bbfd1b42d72b622d488bcf98"; - name = "ktp-call-ui-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-call-ui-20.08.0.tar.xz"; + sha256 = "2744e739456fd3aba322eb3c47be84511450dd713838e133be4f1957a3b9a0bf"; + name = "ktp-call-ui-20.08.0.tar.xz"; }; }; ktp-common-internals = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-common-internals-20.04.3.tar.xz"; - sha256 = "0e7a1c61869d297831615c719e5c79f2b00a6572479d2c2eaca642de6d376efd"; - name = "ktp-common-internals-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-common-internals-20.08.0.tar.xz"; + sha256 = "9ee962e2afd5db0fc23da69468f008ff239e97ef77d8930f7e5960d732d8a4b2"; + name = "ktp-common-internals-20.08.0.tar.xz"; }; }; ktp-contact-list = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-list-20.04.3.tar.xz"; - sha256 = "c909e21fb168c14c61d1d617b6854ff505eaf4693479d8d0bba746fde0ee11af"; - name = "ktp-contact-list-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-list-20.08.0.tar.xz"; + sha256 = "ec00bf525450c972634e60dfb423f9cd2be7caa4181e84efa7d88fc6f079a995"; + name = "ktp-contact-list-20.08.0.tar.xz"; }; }; ktp-contact-runner = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-contact-runner-20.04.3.tar.xz"; - sha256 = "cb3313ca916a7e3fff78529ccc4a499763766957d22f65dee9663cd950c2b4a6"; - name = "ktp-contact-runner-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-contact-runner-20.08.0.tar.xz"; + sha256 = "1123adbdfdbdb8bb524ba39ab175f39964cef2ecf5eed9a0a1d0129d7ae8ecbc"; + name = "ktp-contact-runner-20.08.0.tar.xz"; }; }; ktp-desktop-applets = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-desktop-applets-20.04.3.tar.xz"; - sha256 = "40f1125d4d91e2586d06d45b59d12ac19ee93aaae8c3d4df75db196f7e91e875"; - name = "ktp-desktop-applets-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-desktop-applets-20.08.0.tar.xz"; + sha256 = "6a6eb5090f6273abb9ff1b70777c32bd4ba5fd0d270dfa0490ac370c31d0cab5"; + name = "ktp-desktop-applets-20.08.0.tar.xz"; }; }; ktp-filetransfer-handler = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-filetransfer-handler-20.04.3.tar.xz"; - sha256 = "74df7140bac0b87e3ff39e8ab692bb4c65a10612f328c8d60a84433ae865de52"; - name = "ktp-filetransfer-handler-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-filetransfer-handler-20.08.0.tar.xz"; + sha256 = "df16a920a233eaec25c73514e951f5f569a0f0f6d4ba46b60a0c2bc3da4ab6cd"; + name = "ktp-filetransfer-handler-20.08.0.tar.xz"; }; }; ktp-kded-module = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-kded-module-20.04.3.tar.xz"; - sha256 = "972a4a5d7108351a07be670654b4e78dfe9fb7657336c563040e1e831134aad2"; - name = "ktp-kded-module-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-kded-module-20.08.0.tar.xz"; + sha256 = "f321a7db60b0fcd9dd207c38c8097e6cdb3a22aba6730bc03f9ea67bc8d9bb2e"; + name = "ktp-kded-module-20.08.0.tar.xz"; }; }; ktp-send-file = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-send-file-20.04.3.tar.xz"; - sha256 = "fa67edd7ec516ed727d5df0d30ccf6b990cee40f8062a9966a8643d6f26c8344"; - name = "ktp-send-file-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-send-file-20.08.0.tar.xz"; + sha256 = "86d3ca20eb3c3fbfa169a355c0e64d1574433c6985d5188697ef18e521d82104"; + name = "ktp-send-file-20.08.0.tar.xz"; }; }; ktp-text-ui = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktp-text-ui-20.04.3.tar.xz"; - sha256 = "be6253246134aa6513b0ff36d25a833d469e6850da1f5c8c05666a555bbfd9b2"; - name = "ktp-text-ui-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktp-text-ui-20.08.0.tar.xz"; + sha256 = "a1f5c4c98761f61abd62b6e788a8ec5c4e2b4020e92f3c0c75770c0f01386676"; + name = "ktp-text-ui-20.08.0.tar.xz"; }; }; ktuberling = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/ktuberling-20.04.3.tar.xz"; - sha256 = "0fb7ef29c5bf02de56243e608a050fce992df56586d305a157ed3ac70f002a44"; - name = "ktuberling-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/ktuberling-20.08.0.tar.xz"; + sha256 = "8d56e4330b68d8597d502db311282a9d59f8ad91f8acfa7f029d354ac399b702"; + name = "ktuberling-20.08.0.tar.xz"; }; }; kturtle = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kturtle-20.04.3.tar.xz"; - sha256 = "e04034812c62e22be0ee7eb91d89a9e0e0c73bb5cba8e914373f407c99e8c0cb"; - name = "kturtle-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kturtle-20.08.0.tar.xz"; + sha256 = "9c086a0aec74d9d5aa5792f026e6b44b8fdc613cfdeba060fb4694fb3e9b27f9"; + name = "kturtle-20.08.0.tar.xz"; }; }; kubrick = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kubrick-20.04.3.tar.xz"; - sha256 = "983310938ad0437902d886f433b0693a3a08faaca0f5553a3aa24e89e3215fb9"; - name = "kubrick-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kubrick-20.08.0.tar.xz"; + sha256 = "2cf725a96d52d7be157690fb9ce6fe0dcc2cb853fe6e1f9d56ae6c23c09974cc"; + name = "kubrick-20.08.0.tar.xz"; }; }; kwalletmanager = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kwalletmanager-20.04.3.tar.xz"; - sha256 = "3821d17f5238bd51b9d19ef5974e063aa6426f35afcd0cffa89af109c770151e"; - name = "kwalletmanager-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kwalletmanager-20.08.0.tar.xz"; + sha256 = "4dea2e1b08cc996d6d4961393d9c8f24051b0a7f6373c4cf575ddf8324804b7a"; + name = "kwalletmanager-20.08.0.tar.xz"; }; }; kwave = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kwave-20.04.3.tar.xz"; - sha256 = "111ea78c90371f566500e88d746812b17875e154e431b3694e3d226f3f19e988"; - name = "kwave-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kwave-20.08.0.tar.xz"; + sha256 = "7291122e5112eea9b8026937682f77d78e43153c4dc38005ac31fd7235a18e69"; + name = "kwave-20.08.0.tar.xz"; }; }; kwordquiz = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/kwordquiz-20.04.3.tar.xz"; - sha256 = "464684309e098c4e8663d39cd98f53a640a93e1d8ac169a2a0ac3cc98d7f8e12"; - name = "kwordquiz-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/kwordquiz-20.08.0.tar.xz"; + sha256 = "c8350fcf5b4ed61a43d3d72aabfef645e7d1908ef753df36c0124601873b4951"; + name = "kwordquiz-20.08.0.tar.xz"; }; }; libgravatar = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libgravatar-20.04.3.tar.xz"; - sha256 = "0a5eadd5c8492eb17225e0ff2d221f69231e72ca9b8a78080301639662a18acf"; - name = "libgravatar-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libgravatar-20.08.0.tar.xz"; + sha256 = "9faf1ab53cebf2f54fb851ec5bcffc65b18a846a50e3d890b66b947ab93d6397"; + name = "libgravatar-20.08.0.tar.xz"; }; }; libkcddb = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkcddb-20.04.3.tar.xz"; - sha256 = "d205d3a458c0d54d7118e36006710fe2d2993de5b417c9d8936762fa710634b4"; - name = "libkcddb-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkcddb-20.08.0.tar.xz"; + sha256 = "516723e29ae37c84865eaf86f82481c4275ea8507e172fc8a0279572705fbc6a"; + name = "libkcddb-20.08.0.tar.xz"; }; }; libkcompactdisc = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkcompactdisc-20.04.3.tar.xz"; - sha256 = "5bc98eba521f66cb52645786cf875037397e4dbd3ec4c9a23687d936d1505d24"; - name = "libkcompactdisc-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkcompactdisc-20.08.0.tar.xz"; + sha256 = "043a0ca6dd5d85b4313495d0ae530fe96448da2f472a8af2a633d646be0c065c"; + name = "libkcompactdisc-20.08.0.tar.xz"; }; }; libkdcraw = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkdcraw-20.04.3.tar.xz"; - sha256 = "e37e9210a250955d1fe63d2d96571d0630572633e567eb047af9f24db2b86cb5"; - name = "libkdcraw-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkdcraw-20.08.0.tar.xz"; + sha256 = "8e2e1577a751eb0c570e5f6ad394d459ef3d127ee8950eee25a4ebf62a2eece7"; + name = "libkdcraw-20.08.0.tar.xz"; }; }; libkdegames = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkdegames-20.04.3.tar.xz"; - sha256 = "fda965e2ff166abe89cf008a5160262f061a6c3aeda4a71a834b5ed66ea6d0be"; - name = "libkdegames-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkdegames-20.08.0.tar.xz"; + sha256 = "d77f5e2d913c68286014fe1438b9909826931aaa944a0ce1753d1a449766d99c"; + name = "libkdegames-20.08.0.tar.xz"; }; }; libkdepim = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkdepim-20.04.3.tar.xz"; - sha256 = "f4ecc6d33aace0a0025afe390a113f79bb052b816c567ea31996aaf08fe873ea"; - name = "libkdepim-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkdepim-20.08.0.tar.xz"; + sha256 = "4f5f0688529d13c10c1c3509f64874a069a5d6cae84f81b258b1d081e86771e0"; + name = "libkdepim-20.08.0.tar.xz"; }; }; libkeduvocdocument = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkeduvocdocument-20.04.3.tar.xz"; - sha256 = "a53e17a84420fca8f9572d8439da2c63d1241a607952454003a4020104a25558"; - name = "libkeduvocdocument-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkeduvocdocument-20.08.0.tar.xz"; + sha256 = "21ee64628a012478eb8c53ce2374a57d587f6160f32f09231c78e9fac7600d5d"; + name = "libkeduvocdocument-20.08.0.tar.xz"; }; }; libkexiv2 = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkexiv2-20.04.3.tar.xz"; - sha256 = "12fa569aca07269e880bd976a6cc37b4f585fe2aac8837d437bc29999d95f6be"; - name = "libkexiv2-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkexiv2-20.08.0.tar.xz"; + sha256 = "d4e3fcdaf160c70165b1217931484d544d56ca7630d5f2c85484caebb2afe399"; + name = "libkexiv2-20.08.0.tar.xz"; }; }; libkgapi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkgapi-20.04.3.tar.xz"; - sha256 = "9b689d8c4a1df0b792604cf5951b30d8343e984d890f4a3fb946a449723e520d"; - name = "libkgapi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkgapi-20.08.0.tar.xz"; + sha256 = "215d21a89887522bbac09774723098dac1602bfc39e4ca23306d08b11d0cd89d"; + name = "libkgapi-20.08.0.tar.xz"; }; }; libkgeomap = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkgeomap-20.04.3.tar.xz"; - sha256 = "34e41b2505a34355a31a548bb8f94955b3dc4391c71201164574ff45b532818d"; - name = "libkgeomap-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkgeomap-20.08.0.tar.xz"; + sha256 = "bf39da71ec7cc40e536bf071abda61569acec4ae027d896738ae1ace74eaddf7"; + name = "libkgeomap-20.08.0.tar.xz"; }; }; libkipi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkipi-20.04.3.tar.xz"; - sha256 = "4a72f0d1423a6a6f7017bf0598c99261575feb4d9af73520074f6f0b7f9e4c25"; - name = "libkipi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkipi-20.08.0.tar.xz"; + sha256 = "2a66512b9c840e7e19f943066197a4ef68aea8cd059427732dec9cf5de84294e"; + name = "libkipi-20.08.0.tar.xz"; }; }; libkleo = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkleo-20.04.3.tar.xz"; - sha256 = "ef2a37a1c8793e4c89dcf49bc330044a617b4b04472679b179992b188e412c50"; - name = "libkleo-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkleo-20.08.0.tar.xz"; + sha256 = "44100f7a001ca7eb8cc4b2b9eeab5e8806a5d4eb2a01a69eeaf1843f4e023f85"; + name = "libkleo-20.08.0.tar.xz"; }; }; libkmahjongg = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkmahjongg-20.04.3.tar.xz"; - sha256 = "24fcff9d91c5143c7275c5c97c2be32e85f5c788749df3acc841fd28bee450a0"; - name = "libkmahjongg-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkmahjongg-20.08.0.tar.xz"; + sha256 = "1792a04f59fe188a7707c0f77e9ef598e9dfb6444c7aba574a4a46760aeaf63a"; + name = "libkmahjongg-20.08.0.tar.xz"; }; }; libkomparediff2 = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libkomparediff2-20.04.3.tar.xz"; - sha256 = "e27a5fd3dd80a9c7c052ec3c824acc529073464788d1c6950d4d2c407b74c0b0"; - name = "libkomparediff2-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libkomparediff2-20.08.0.tar.xz"; + sha256 = "0571d016675496341d6e841d88b2ff8682b2958d91a38a69a6130a0766ff6a1b"; + name = "libkomparediff2-20.08.0.tar.xz"; }; }; libksane = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libksane-20.04.3.tar.xz"; - sha256 = "34827bcc5b9277292dd4434f2bf7610a28d54c86565f0410d4470c61f374c46e"; - name = "libksane-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libksane-20.08.0.tar.xz"; + sha256 = "536e0f914095ddfeee132e227d9d2a840186da512b82d95fc9a7262a3a912ea6"; + name = "libksane-20.08.0.tar.xz"; }; }; libksieve = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/libksieve-20.04.3.tar.xz"; - sha256 = "8aacc0c41ac2b7bf48c8479c8fba581a325828b907053eba6b9b5ff4c63d0529"; - name = "libksieve-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/libksieve-20.08.0.tar.xz"; + sha256 = "af6b4a1b787efdf20792a8ded6ae4d8f49d4cef129b4b3fd7048441bb879b586"; + name = "libksieve-20.08.0.tar.xz"; }; }; lokalize = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/lokalize-20.04.3.tar.xz"; - sha256 = "fccba64af9faa5cbb5dfdb303009504993fe71282f0dbc9c748c5a28a327c379"; - name = "lokalize-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/lokalize-20.08.0.tar.xz"; + sha256 = "dd05509386b816aeb02797769c28e12cf8b3f38d88f722a699a77db94c9ab71e"; + name = "lokalize-20.08.0.tar.xz"; }; }; lskat = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/lskat-20.04.3.tar.xz"; - sha256 = "b7e33cc8097ee4bf4e5182a2a5db1e142c65b119424079f5e7f179720092815b"; - name = "lskat-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/lskat-20.08.0.tar.xz"; + sha256 = "9a6af851f0fb0b7e6f6d1983bf3c7f12a74022977e879a525424d2867762b471"; + name = "lskat-20.08.0.tar.xz"; }; }; mailcommon = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/mailcommon-20.04.3.tar.xz"; - sha256 = "80b6285c8152a64362f5f406b4a766b0937ff29acf87133b0326b6e7ce66809f"; - name = "mailcommon-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/mailcommon-20.08.0.tar.xz"; + sha256 = "fa110a41d5e4848d203d3c17fe18c584d892bf78f750c36a5e88a80c80dcd04a"; + name = "mailcommon-20.08.0.tar.xz"; }; }; mailimporter = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/mailimporter-20.04.3.tar.xz"; - sha256 = "13a95ee3d89d658222dcdc905311c72b1ba04e6b8aac863dee767a4d72d3d54e"; - name = "mailimporter-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/mailimporter-20.08.0.tar.xz"; + sha256 = "5263fdc50b772458cb584f799f80da765e0ac3c4f2e0fecee15305db829cd851"; + name = "mailimporter-20.08.0.tar.xz"; }; }; marble = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/marble-20.04.3.tar.xz"; - sha256 = "9c0b6fb13d53e1748de081c43e06cc132d5b07d46e594443b207fbaf74e1f95b"; - name = "marble-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/marble-20.08.0.tar.xz"; + sha256 = "0f61c29acc3f88a0eeb0e0923f8c5138188712aad6aa4d9445add186d5962381"; + name = "marble-20.08.0.tar.xz"; }; }; mbox-importer = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/mbox-importer-20.04.3.tar.xz"; - sha256 = "ce208091272052a909521cda31a74b2f4c8e8fabcb2937c24639673d1f43981d"; - name = "mbox-importer-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/mbox-importer-20.08.0.tar.xz"; + sha256 = "075afd543bec9c8c2d056b96704fbfd2fbc4498b289596d4fbb0cd49ff5c720b"; + name = "mbox-importer-20.08.0.tar.xz"; }; }; messagelib = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/messagelib-20.04.3.tar.xz"; - sha256 = "aa2c254f50ed4664b67df5857bba063d1400fe280f3a58658cfa59d3155b2adf"; - name = "messagelib-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/messagelib-20.08.0.tar.xz"; + sha256 = "13aa522b8ff8cf2d7ac7ca6ae4c92e1bd2379d13fc23cabaa36fd6d6bda261cd"; + name = "messagelib-20.08.0.tar.xz"; }; }; minuet = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/minuet-20.04.3.tar.xz"; - sha256 = "9afb598280a9b90013833005299fb0c33c3c7cc02b687f65616e04dc12e21d41"; - name = "minuet-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/minuet-20.08.0.tar.xz"; + sha256 = "f3e57e225ec6a0515d39bf868cdd934a6823071527f6da9910b839abc96c8fdb"; + name = "minuet-20.08.0.tar.xz"; }; }; okular = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/okular-20.04.3.tar.xz"; - sha256 = "60865a5d09f41d30572b72224fb61baf9dde18cf6e246565d852e672e7bc4cfe"; - name = "okular-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/okular-20.08.0.tar.xz"; + sha256 = "8d775292cc6b2cb703e5ff716337a49352cd6d3faa90d6d7ac2f4e9d006a4047"; + name = "okular-20.08.0.tar.xz"; }; }; palapeli = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/palapeli-20.04.3.tar.xz"; - sha256 = "8ae05cce4a1ccb5226c9895195c47825054363a127905dacd5b25fc2a4df3828"; - name = "palapeli-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/palapeli-20.08.0.tar.xz"; + sha256 = "bbbf4d6c0a2048e2bb5e2483acf1970748d9f109e25f3c5cbf6f04709a61aeab"; + name = "palapeli-20.08.0.tar.xz"; }; }; parley = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/parley-20.04.3.tar.xz"; - sha256 = "b5e74fbd458824d26c0ea7cb8ed5510e3f6e849c9dbda4bc7804b9b95a64da03"; - name = "parley-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/parley-20.08.0.tar.xz"; + sha256 = "b1c8d5f39a563ddcc6a00a7e1008608bd58bdcdfc23c11c822b15625f5a48d60"; + name = "parley-20.08.0.tar.xz"; }; }; picmi = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/picmi-20.04.3.tar.xz"; - sha256 = "57406f820d58132602b3e6524bad2d7aba3466f7c1a78a623077e7df5faf6838"; - name = "picmi-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/picmi-20.08.0.tar.xz"; + sha256 = "5003bcf33c08eebe24fb689790aef56eb418990a7c6588e2bd1c94ec6f398a5a"; + name = "picmi-20.08.0.tar.xz"; }; }; pimcommon = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/pimcommon-20.04.3.tar.xz"; - sha256 = "a5d295f7174cafeb27bc1aed03a715525b132f9dca734a183dd705a2c7ffa40b"; - name = "pimcommon-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/pimcommon-20.08.0.tar.xz"; + sha256 = "4280d7116d392dff4febbadbca6fa20c38b787da7af537ce4e64af28509bd82e"; + name = "pimcommon-20.08.0.tar.xz"; }; }; pim-data-exporter = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/pim-data-exporter-20.04.3.tar.xz"; - sha256 = "742727f09c984ff86f0406fa756b8ab50e695d6bd8a10abd7d55950c1c2c10de"; - name = "pim-data-exporter-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/pim-data-exporter-20.08.0.tar.xz"; + sha256 = "42f070d3aea3871004bea3fa712f01ef307ba12328495ded06d3115e7e8ed894"; + name = "pim-data-exporter-20.08.0.tar.xz"; }; }; pim-sieve-editor = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/pim-sieve-editor-20.04.3.tar.xz"; - sha256 = "e59c4eee3f7548fc724f7b79cbff2f90c10be92eb0cab7259dd57fd221f2b7dc"; - name = "pim-sieve-editor-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/pim-sieve-editor-20.08.0.tar.xz"; + sha256 = "65167f716ce2cc70a4ccbf7f9a5b2a873f36df54984dcc46af1d5694973e709a"; + name = "pim-sieve-editor-20.08.0.tar.xz"; }; }; poxml = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/poxml-20.04.3.tar.xz"; - sha256 = "a070eb5c12e14df691648a9a3e482c021c484f59dfaac413eeacc002cdc1833a"; - name = "poxml-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/poxml-20.08.0.tar.xz"; + sha256 = "07f5e8f0b215d864d48523c9a1b689f7434dfc0a561d5cf253ad69698770e096"; + name = "poxml-20.08.0.tar.xz"; }; }; print-manager = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/print-manager-20.04.3.tar.xz"; - sha256 = "9d877925cafdf7dfa0dcce5694f849b13ca8bb7c4552a800eebd26a3fc42d376"; - name = "print-manager-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/print-manager-20.08.0.tar.xz"; + sha256 = "6fe74bc4555f92b7d372d01878cbf25b4339f3f0047b52bd0c92571a2b835271"; + name = "print-manager-20.08.0.tar.xz"; }; }; rocs = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/rocs-20.04.3.tar.xz"; - sha256 = "1620ff8360568ab4201d526ea4489bd672f6715b6d200251d63ed139dcc58a94"; - name = "rocs-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/rocs-20.08.0.tar.xz"; + sha256 = "447fecd5e87171cae444e70146b5ce99ac94a558db5f7e1ff9053c31953ba48e"; + name = "rocs-20.08.0.tar.xz"; }; }; signon-kwallet-extension = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/signon-kwallet-extension-20.04.3.tar.xz"; - sha256 = "a391ceff9c86f2e3d8a74a26ffb4143d0adffc8669a51a019d39f16a8e207c1c"; - name = "signon-kwallet-extension-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/signon-kwallet-extension-20.08.0.tar.xz"; + sha256 = "ec65a9b05dd014ec541ba87e39b6ae8a7af8bf4017f58c7b566960e452f99493"; + name = "signon-kwallet-extension-20.08.0.tar.xz"; }; }; spectacle = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/spectacle-20.04.3.tar.xz"; - sha256 = "71e852aceaac1dc76cd9aa4aa8284ced1c149d7374d9e06f996f4259a72ccbd6"; - name = "spectacle-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/spectacle-20.08.0.tar.xz"; + sha256 = "8712c8fc19bc2cc39c5e51cf62dedfba423ad53225b629d667d7ffb8d3900692"; + name = "spectacle-20.08.0.tar.xz"; }; }; step = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/step-20.04.3.tar.xz"; - sha256 = "89d7e29b6e5f888886022701cbfd628c322daa3da43dda4c3fd90d1a137aa29d"; - name = "step-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/step-20.08.0.tar.xz"; + sha256 = "8415f807de351b85bc3c4feb9ac45b01300210b9517987c617cd49ba6d472418"; + name = "step-20.08.0.tar.xz"; }; }; svgpart = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/svgpart-20.04.3.tar.xz"; - sha256 = "2ffb67858ac5c01f5bb5d4728526786c5b6b6a8b70d688123c52efa084fae1b4"; - name = "svgpart-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/svgpart-20.08.0.tar.xz"; + sha256 = "3ebb9140ac13c7ece171622ead8c7fd1b1128cccde9635cbc912ca7f8da767a7"; + name = "svgpart-20.08.0.tar.xz"; }; }; sweeper = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/sweeper-20.04.3.tar.xz"; - sha256 = "16b247b9e3f3d3497f31f9dcb91ff06725a07f0f56a934fdf1ecf1af1ab1b426"; - name = "sweeper-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/sweeper-20.08.0.tar.xz"; + sha256 = "b0d7b983a5bb8ceb2454863181c6a2d55c42114f58f66241f46c3365d90a52ec"; + name = "sweeper-20.08.0.tar.xz"; }; }; umbrello = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/umbrello-20.04.3.tar.xz"; - sha256 = "c34a5f6ca945dd409921903abd2e0078b6a056a0d221d59674980ce424cf1e62"; - name = "umbrello-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/umbrello-20.08.0.tar.xz"; + sha256 = "49e9f7e0748b8f103f72bbc3fbe0ab7b3605646b5024512118dd9beafd64a041"; + name = "umbrello-20.08.0.tar.xz"; }; }; yakuake = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/yakuake-20.04.3.tar.xz"; - sha256 = "62466165becc848d05461f7b12b67615a517d2919b6fccd8441dfeed9a0a04fa"; - name = "yakuake-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/yakuake-20.08.0.tar.xz"; + sha256 = "1c13334e0e4c1a6a3f8e11ed6cd05b2cecdd0eb29201c41bd26ca62e22cc084a"; + name = "yakuake-20.08.0.tar.xz"; }; }; zeroconf-ioslave = { - version = "20.04.3"; + version = "20.08.0"; src = fetchurl { - url = "${mirror}/stable/release-service/20.04.3/src/zeroconf-ioslave-20.04.3.tar.xz"; - sha256 = "3b2ac8833499a53a78547ae34be4a29a6cb79d54601a8c638b225f1c2059d9f0"; - name = "zeroconf-ioslave-20.04.3.tar.xz"; + url = "${mirror}/stable/release-service/20.08.0/src/zeroconf-ioslave-20.08.0.tar.xz"; + sha256 = "78bdd0b377132abf30f1ed40c15eae3f0726d7075b311c3b23c71ad59725dc22"; + name = "zeroconf-ioslave-20.08.0.tar.xz"; }; }; } diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index b67e514ce54..ecd130426de 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -28,5 +28,9 @@ stdenv.mkDerivation { description = "Adobe Reader, a viewer for PDF documents"; homepage = "http://www.adobe.com/products/reader"; license = stdenv.lib.licenses.unfree; + knownVulnerabilities = [ + "Numerous unresolved vulnerabilities" + "See: https://www.cvedetails.com/product/497/Adobe-Acrobat-Reader.html?vendor_id=53" + ]; }; } diff --git a/pkgs/applications/misc/bemenu/default.nix b/pkgs/applications/misc/bemenu/default.nix index 8b17ecea3cb..43362b0394e 100644 --- a/pkgs/applications/misc/bemenu/default.nix +++ b/pkgs/applications/misc/bemenu/default.nix @@ -11,13 +11,13 @@ assert x11Support -> xlibs != null && xorg != null; stdenv.mkDerivation rec { pname = "bemenu"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "Cloudef"; repo = pname; rev = version; - sha256 = "1fjcs9d3533ay3nz79cx3c0lmy2chgragr2lhsy0xl2ckr0iins0"; + sha256 = "1ifq5bk7782b9m6bl111x33fn38rpppdrww7hfavqia9a9gi2sl5"; }; nativeBuildInputs = [ pkgconfig pcre ]; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 2e6981490ce..2190307fbb5 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -17,11 +17,11 @@ let python = python3Packages.python; in stdenv.mkDerivation rec { pname = "blender"; - version = "2.83.4"; + version = "2.83.5"; src = fetchurl { url = "https://download.blender.org/source/${pname}-${version}.tar.xz"; - sha256 = "1y4phkzrxy17kpjbg0jbz1236nw8w8p006x1crbqmvwz8wd3dm46"; + sha256 = "0xyawly00a59hfdb6b7va84k5fhcv2mxnzd77vs22bzi9y7sap43"; }; patches = lib.optional stdenv.isDarwin ./darwin.patch; diff --git a/pkgs/applications/misc/cheat/default.nix b/pkgs/applications/misc/cheat/default.nix index 6fa8e0cf7bd..e3ffdef44d0 100644 --- a/pkgs/applications/misc/cheat/default.nix +++ b/pkgs/applications/misc/cheat/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "cheat"; - version = "4.0.3"; + version = "4.0.4"; src = fetchFromGitHub { owner = "cheat"; repo = "cheat"; rev = version; - sha256 = "1bzlbd8lvagpipyv553icv17bafhaydscrrlly8jz7kfi4d9xvkk"; + sha256 = "0cracw6pja3d7z6ip6lbmpvfxlxcnh3fbgh5ba8c87bhfz99idqn"; }; subPackages = [ "cmd/cheat" ]; diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 4d078f39224..ac296c1224a 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , wrapQtAppsHook , python3 -, python3Packages , zbar , secp256k1 , enableQt ? true @@ -22,6 +21,20 @@ let version = "4.0.2"; + # electrum is not compatible with dnspython 2.0.0 yet + # use the latest 1.x release instead + py = python3.override { + packageOverrides = self: super: { + dnspython = super.dnspython.overridePythonAttrs (oldAttrs: rec { + version = "1.16.0"; + src = oldAttrs.src.override { + inherit version; + sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; + }; + }); + }; + }; + libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" else if stdenv.isDarwin then "libsecp256k1.0.dylib" @@ -45,7 +58,7 @@ let }; in -python3Packages.buildPythonApplication { +py.pkgs.buildPythonApplication { pname = "electrum"; inherit version; @@ -61,7 +74,7 @@ python3Packages.buildPythonApplication { nativeBuildInputs = stdenv.lib.optionals enableQt [ wrapQtAppsHook ]; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = with py.pkgs; [ aiohttp aiohttp-socks aiorpcx @@ -116,7 +129,7 @@ python3Packages.buildPythonApplication { wrapQtApp $out/bin/electrum ''; - checkInputs = with python3Packages; [ pytest ]; + checkInputs = with py.pkgs; [ pytest ]; checkPhase = '' py.test electrum/tests diff --git a/pkgs/applications/misc/havoc/default.nix b/pkgs/applications/misc/havoc/default.nix index fc4cc680ca4..a6d5278fc3c 100644 --- a/pkgs/applications/misc/havoc/default.nix +++ b/pkgs/applications/misc/havoc/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "havoc"; - version = "2019-12-08"; + version = "0.3.1"; src = fetchFromGitHub { owner = "ii8"; repo = pname; - rev = "507446c92ed7bf8380a58c5ba2b14aba5cdf412c"; - sha256 = "13nfnan1gmy4cqxmqv0rc8a4mcb1g62v73d56hy7z2psv4am7a09"; + rev = version; + sha256 = "1g05r9j6srwz1krqvzckx80jn8fm48rkb4xp68953gy9yp2skg3k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/applications/misc/html5validator/default.nix b/pkgs/applications/misc/html5validator/default.nix new file mode 100644 index 00000000000..657996d1da9 --- /dev/null +++ b/pkgs/applications/misc/html5validator/default.nix @@ -0,0 +1,25 @@ +{ buildPythonApplication, fetchFromGitHub, nose, openjdk, lib }: + +buildPythonApplication rec { + pname = "html5validator"; + version = "0.3.3"; + + src = fetchFromGitHub { + owner = "svenkreiss"; + repo = "html5validator"; + rev = "v${version}"; + sha256 = "130acqi0dsy3midg7hwslykzry6crr4ln6ia0f0avyywkz4bplsv"; + }; + + propagatedBuildInputs = [ openjdk ]; + + checkInputs = [ nose ]; + checkPhase = "PATH=$PATH:$out/bin nosetests"; + + meta = with lib; { + homepage = "https://github.com/svenkreiss/html5validator"; + description = "Command line tool that tests files for HTML5 validity"; + license = licenses.mit; + maintainers = [ maintainers.phunehehe ]; + }; +} diff --git a/pkgs/applications/misc/krename/default.nix b/pkgs/applications/misc/krename/default.nix index 816b352460b..578c56a748a 100644 --- a/pkgs/applications/misc/krename/default.nix +++ b/pkgs/applications/misc/krename/default.nix @@ -23,6 +23,8 @@ in mkDerivation rec { propagatedBuildInputs = [ kconfig kcrash kinit kjsembed ]; + NIX_LDFLAGS = "-ltag"; + meta = with lib; { description = "A powerful batch renamer for KDE"; homepage = "https://kde.org/applications/utilities/krename/"; diff --git a/pkgs/applications/misc/lutris/fhsenv.nix b/pkgs/applications/misc/lutris/fhsenv.nix index 6fad8b23d33..2b656775ab5 100644 --- a/pkgs/applications/misc/lutris/fhsenv.nix +++ b/pkgs/applications/misc/lutris/fhsenv.nix @@ -97,7 +97,7 @@ in buildFHSUserEnv { libcap libtiff libva libgphoto2 libxslt libsndfile giflib zlib glib alsaLib zziplib bash dbus keyutils zip cabextract freetype unzip coreutils readline gcc SDL SDL2 curl graphite2 gtk2 gtk3 udev ncurses wayland libglvnd - vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd + vulkan-loader xdg_utils sqlite gnutls p11-kit libbsd harfbuzz # PCSX2 // TODO: "libgobject-2.0.so.0: wrong ELF class: ELFCLASS64" diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix index d38113981aa..96833bb25d3 100644 --- a/pkgs/applications/misc/mediainfo-gui/default.nix +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -2,11 +2,11 @@ , desktop-file-utils, libSM, imagemagick }: stdenv.mkDerivation rec { - version = "20.03"; + version = "20.08"; pname = "mediainfo-gui"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz"; - sha256 = "1f1shnycf0f1fwka9k9s250l228xjkg0k4k73h8bpld8msighgnw"; + sha256 = "1baf2dj5s3g1x4ssqli1b2r1203syk42m09zhp36qcinmfixv11l"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index 52db4d0c6cc..14b9ebfe4c7 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "minder"; - version = "1.9.1"; + version = "1.9.2"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "1823nl9hgsa9l04ra1drj3c7r8s5ybx6c06d9ijpwqz191sz2jg2"; + sha256 = "0lhwwx515f0ycpinkhgbjnik7dj2c7fckikbgzwkzzs25xqp9ayj"; }; nativeBuildInputs = [ pkgconfig meson ninja python3 wrapGAppsHook vala shared-mime-info ]; diff --git a/pkgs/applications/misc/navi/default.nix b/pkgs/applications/misc/navi/default.nix index e403ccea0da..008d19576da 100644 --- a/pkgs/applications/misc/navi/default.nix +++ b/pkgs/applications/misc/navi/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "navi"; - version = "2.7.1"; + version = "2.9.0"; src = fetchFromGitHub { owner = "denisidoro"; repo = "navi"; rev = "v${version}"; - sha256 = "12p9l41k7isaapr0xbsm7brkjrv7i8826y029i12psz92nsynk29"; + sha256 = "16rwhpyk0zqks9z9bv2a1a8vww2m6867kg33bjbr29hawjg68jql"; }; - cargoSha256 = "11dc3gc7fyikbbgacmljhysr2sl7lmq6w3bsfcf2cqny39r25yp0"; + cargoSha256 = "19w9gm389lj1zwhyjifhc2fzkvrvqvyc80lwxz070cnj11ir2l9m"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/obinskit/default.nix b/pkgs/applications/misc/obinskit/default.nix index bb85c84f7ee..dc03b9b4f93 100644 --- a/pkgs/applications/misc/obinskit/default.nix +++ b/pkgs/applications/misc/obinskit/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , libxkbcommon , systemd @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' makeWrapper ${electron}/bin/electron $out/bin/${pname} \ --add-flags $out/opt/obinskit/resources/app.asar \ - --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon systemd.lib xorg.libXt ]}" + --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib libxkbcommon (lib.getLib systemd) xorg.libXt ]}" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix index 793ea927a01..4434bc6d113 100644 --- a/pkgs/applications/misc/octoprint/default.nix +++ b/pkgs/applications/misc/octoprint/default.nix @@ -1,114 +1,171 @@ -{ pkgs, stdenv, lib, fetchFromGitHub, python3 -# To include additional plugins, pass them here as an overlay. +{ pkgs +, stdenv +, lib +, fetchFromGitHub +, python3 + # To include additional plugins, pass them here as an overlay. , packageOverrides ? self: super: {} }: let mkOverride = attrname: version: sha256: - self: super: { - ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + self: super: { + ${attrname} = super.${attrname}.overridePythonAttrs ( + oldAttrs: { inherit version; src = oldAttrs.src.override { inherit version sha256; }; - }); - }; + } + ); + }; py = python3.override { self = py; - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ - (mkOverride "flask" "0.12.5" "fac2b9d443e49f7e7358a444a3db5950bdd0324674d92ba67f8f1f15f876b14f") - (mkOverride "flask_assets" "0.12" "0ivqsihk994rxw58vdgzrx4d77d7lpzjm4qxb38hjdgvi5xm4cb0") - (mkOverride "flaskbabel" "0.12.2" "11jwp8vvq1gnm31qh6ihy2h393hy18yn9yjp569g60r0wj1x2sii") - (mkOverride "flask_login" "0.4.1" "1v2j8zd558xfmgn3rfbw0xz4vizjcnk8kqw52q4f4d9ygfnc25f8") - (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") - (mkOverride "tornado" "4.5.3" "02jzd23l4r6fswmwxaica9ldlyc2p6q8dk6dyff7j58fmdzf853d") - (mkOverride "psutil" "5.6.7" "ffad8eb2ac614518bbe3c0b8eb9dffdb3a8d2e3a7d5da51c5b974fb723a5c5aa") - (mkOverride "watchdog" "0.9.0" "07cnvvlpif7a6cg4rav39zq8fxa5pfqawchr46433pij0y6napwn") - (mkOverride "werkzeug" "0.16.1" "010zmhyfbp4d56c1rgalwi188imjlkv9g7rm25jrvify6xnqalxk") - (mkOverride "websocket_client" "0.56.0" "0fpxjyr74klnyis3yf6m54askl0h5dchxcwbfjsq92xng0455m8z") - (mkOverride "wrapt" "1.11.2" "1q81762dgsgrd12f8qc39zk8s5wll3m5xc32jdmlf6cls4gh4njn") + packageOverrides = lib.foldr lib.composeExtensions (self: super: {}) ( + [ + # the following dependencies are non trivial to update since later versions introduce backwards incompatible + # changes that might affect plugins, or due to other observed problems + (mkOverride "markupsafe" "1.1.1" "29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b") + (mkOverride "rsa" "4.0" "1a836406405730121ae9823e19c6e806c62bbad73f890574fff50efa4122c487") + (mkOverride "markdown" "3.1.1" "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a") + (mkOverride "tornado" "5.1.1" "4e5158d97583502a7e2739951553cbd88a72076f152b4b11b64b9a10c4c49409") + (mkOverride "unidecode" "0.04.21" "280a6ab88e1f2eb5af79edff450021a0d3f0448952847cd79677e55e58bad051") - # Octoprint holds back jinja2 to 2.8.1 due to breaking changes. - # This old version does not have updated test config for pytest 4, - # and pypi tarball doesn't contain tests dir anyways. - (self: super: { - jinja2 = super.jinja2.overridePythonAttrs (oldAttrs: rec { - version = "2.8.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "14aqmhkc9rw5w0v311jhixdm6ym8vsm29dhyxyrjfqxljwx1yd1m"; - }; - doCheck = false; - }); + # Built-in dependency + ( + self: super: { + octoprint-filecheck = self.buildPythonPackage rec { + pname = "OctoPrint-FileCheck"; + version = "2020.08.07"; - httpretty = super.httpretty.overridePythonAttrs (oldAttrs: rec { - doCheck = false; - }); + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-FileCheck"; + rev = version; + sha256 = "05ys05l5x7d2bkg3yqrga6m65v3g5fcnnzbfab7j9w2pzjdapx5b"; + }; + doCheck = false; + }; + } + ) - celery = super.celery.overridePythonAttrs (oldAttrs: rec { - doCheck = false; - }); - }) - (self: super: { - octoprint = self.buildPythonPackage rec { - pname = "OctoPrint"; - version = "1.4.0"; + # Built-in dependency + ( + self: super: { + octoprint-firmwarecheck = self.buildPythonPackage rec { + pname = "OctoPrint-FirmwareCheck"; + version = "2020.06.22"; - src = fetchFromGitHub { - owner = "foosel"; - repo = "OctoPrint"; - rev = version; - sha256 = "0387228544v28d69dcdg2zr5gp6qavkfr6dydpjgj5awxv3w25d5"; - }; + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint-FirmwareCheck"; + rev = version; + sha256 = "19y7hrgg9z8hl7cwqkvg8nc8bk0wwrsfvjd1wawy33wn60psqv1h"; + }; + doCheck = false; + }; + } + ) - propagatedBuildInputs = with super; [ - awesome-slugify flask flask_assets rsa requests pkginfo watchdog - semantic-version werkzeug flaskbabel tornado - psutil pyserial flask_login netaddr markdown - pylru pyyaml sarge feedparser netifaces click websocket_client - scandir chainmap future wrapt monotonic emoji jinja2 - frozendict cachelib sentry-sdk filetype markupsafe - ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; + ( + self: super: { + octoprint = self.buildPythonPackage rec { + pname = "OctoPrint"; + version = "1.4.2"; - checkInputs = with super; [ pytestCheckHook mock ddt ]; + src = fetchFromGitHub { + owner = "OctoPrint"; + repo = "OctoPrint"; + rev = version; + sha256 = "1bblrjwkccy1ifw7lf55g3k9lq1sqzwd49vj8bfzj2w07a7qda62"; + }; - postPatch = let - ignoreVersionConstraints = [ - "sentry-sdk" - ]; - in '' - sed -r -i \ - ${lib.concatStringsSep "\n" (map (e: - ''-e 's@${e}[<>=]+.*@${e}",@g' \'' - ) ignoreVersionConstraints)} - setup.py - ''; + propagatedBuildInputs = with super; [ + octoprint-firmwarecheck + octoprint-filecheck + markupsafe + tornado + markdown + rsa + regex + flask + jinja2 + flask_login + flask-babel + flask_assets + werkzeug + itsdangerous + cachelib + pyyaml + pyserial + netaddr + watchdog + sarge + netifaces + pylru + pkginfo + requests + semantic-version + psutil + click + feedparser + future + websocket_client + wrapt + emoji + frozendict + sentry-sdk + filetype + unidecode + blinker + ] ++ lib.optionals stdenv.isDarwin [ py.pkgs.appdirs ]; - dontUseSetuptoolsCheck = true; + checkInputs = with super; [ pytestCheckHook mock ddt ]; - preCheck = '' - export HOME=$(mktemp -d) - rm pytest.ini - ''; + postPatch = let + ignoreVersionConstraints = [ + "sentry-sdk" + ]; + in + '' + sed -r -i \ + ${lib.concatStringsSep "\n" ( + map ( + e: + ''-e 's@${e}[<>=]+.*@${e}",@g' \'' + ) ignoreVersionConstraints + )} + setup.py + ''; - disabledTests = [ - "test_check_setup" # Why should it be able to call pip? - ] ++ lib.optionals stdenv.isDarwin [ - "test_set_external_modification" - ]; + dontUseSetuptoolsCheck = true; - passthru.python = self.python; + preCheck = '' + export HOME=$(mktemp -d) + rm pytest.ini + ''; - meta = with stdenv.lib; { - homepage = "https://octoprint.org/"; - description = "The snappy web interface for your 3D printer"; - license = licenses.agpl3; - maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; - }; - }; - }) - (import ./plugins.nix {inherit pkgs;}) - packageOverrides - ]); + disabledTests = [ + "test_check_setup" # Why should it be able to call pip? + ] ++ lib.optionals stdenv.isDarwin [ + "test_set_external_modification" + ]; + + passthru.python = self.python; + + meta = with stdenv.lib; { + homepage = "https://octoprint.org/"; + description = "The snappy web interface for your 3D printer"; + license = licenses.agpl3; + maintainers = with maintainers; [ abbradar gebner WhittlesJr ]; + }; + }; + } + ) + (import ./plugins.nix { inherit pkgs; }) + packageOverrides + ] + ); }; -in with py.pkgs; toPythonApplication octoprint +in + with py.pkgs; toPythonApplication octoprint diff --git a/pkgs/applications/misc/orca/default.nix b/pkgs/applications/misc/orca/default.nix index 77c1f67ecf0..ccb7f3e47c8 100644 --- a/pkgs/applications/misc/orca/default.nix +++ b/pkgs/applications/misc/orca/default.nix @@ -35,13 +35,13 @@ buildPythonApplication rec { pname = "orca"; - version = "3.36.4"; + version = "3.36.5"; format = "other"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1s6qrmbn3pywidwwfa24ly21c1cz6fnnsipi9vlp3sxswbdcwiwz"; + sha256 = "0nyb33p4y6nmln41pi70c8hiyjyasaryy10mazi7b2s6fy9pk25x"; }; patches = [ diff --git a/pkgs/applications/misc/qdirstat/default.nix b/pkgs/applications/misc/qdirstat/default.nix index c57153fe0e0..e9f049159bf 100644 --- a/pkgs/applications/misc/qdirstat/default.nix +++ b/pkgs/applications/misc/qdirstat/default.nix @@ -3,17 +3,19 @@ , makeWrapper, perlPackages, mkDerivation }: let - version = "1.6.1"; -in mkDerivation rec { pname = "qdirstat"; - inherit version; + version = "1.7"; src = fetchFromGitHub { owner = "shundhammer"; - repo = "qdirstat"; + repo = pname; rev = version; - sha256 = "0q77a347qv1aka6sni6l03zh5jzyy9s74aygg554r73g01kxczpb"; + sha256 = "163x3fxra0l3vvrzm25mh7jvcwjbmwsqlpppkxx76mkz9a1769fy"; }; +in + +mkDerivation { + inherit pname version src; nativeBuildInputs = [ qmake makeWrapper ]; diff --git a/pkgs/applications/misc/sdcv/default.nix b/pkgs/applications/misc/sdcv/default.nix index 997786fc107..d220047a0a3 100644 --- a/pkgs/applications/misc/sdcv/default.nix +++ b/pkgs/applications/misc/sdcv/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sdcv"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "Dushistov"; repo = "sdcv"; rev = "v${version}"; - sha256 = "1b67s4nj0s5fh3cjk7858qvhiisc557xx72xwzrb8hq6ijpwx5k0"; + sha256 = "144qpl9b8r2php0zhi9b7vg6flpvdgjy6yfaipydwwhxi4wy9600"; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/misc/simplenote/default.nix b/pkgs/applications/misc/simplenote/default.nix index 6c66987ddb5..05cf15b8acc 100644 --- a/pkgs/applications/misc/simplenote/default.nix +++ b/pkgs/applications/misc/simplenote/default.nix @@ -4,6 +4,7 @@ , fetchurl , makeDesktopItem , makeWrapper +, lib , stdenv , udev , wrapGAppsHook @@ -16,10 +17,10 @@ let pname = "simplenote"; - version = "1.21.0"; + version = "1.21.1"; sha256 = { - x86_64-linux = "073dg4agqgimsgs3ia7g0pjv4vxkh24bj7vpmssiysdxhm4li1j1"; + x86_64-linux = "00qx82d17yrrg2mxwhm40av0mpf5hy14j338i5ijhwp79yc8fk8x"; }.${system} or throwSystem; meta = with stdenv.lib; { @@ -82,7 +83,7 @@ let ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' diff --git a/pkgs/applications/misc/snowsql/default.nix b/pkgs/applications/misc/snowsql/default.nix new file mode 100644 index 00000000000..a860b555b59 --- /dev/null +++ b/pkgs/applications/misc/snowsql/default.nix @@ -0,0 +1,50 @@ +{ stdenv +, fetchurl +, rpmextract +, patchelf +, makeWrapper +, openssl +}: + +stdenv.mkDerivation rec { + pname = "snowsql"; + version = "1.2.5"; + + src = fetchurl { + url = "https://sfc-repo.snowflakecomputing.com/snowsql/bootstrap/1.2/linux_x86_64/snowflake-snowsql-1.2.5-1.x86_64.rpm"; + sha256 = "c66e2044640197f4a5b5a16b89e8e7c6a816aa539004a0fb016aab185795f2d5"; + }; + + nativeBuildInputs = [ rpmextract makeWrapper ]; + + libPath = + stdenv.lib.makeLibraryPath + [ + openssl + ]; + + buildCommand = '' + mkdir -p $out/bin/ + cd $out + rpmextract $src + rm -R usr/bin + mv usr/* $out + rmdir usr + + ${patchelf}/bin/patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + lib64/snowflake/snowsql/snowsql + + makeWrapper $out/lib64/snowflake/snowsql/snowsql $out/bin/snowsql \ + --set LD_LIBRARY_PATH "${libPath}":"${placeholder "out"}"/lib64/snowflake/snowsql \ + + ''; + + meta = with stdenv.lib; { + description = "Command line client for the Snowflake database"; + homepage = "https://www.snowflake.com"; + license = licenses.unfree; + maintainers = with maintainers; [ andehen ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/misc/super_user_spark/default.nix b/pkgs/applications/misc/super_user_spark/default.nix deleted file mode 100644 index dd1218282d8..00000000000 --- a/pkgs/applications/misc/super_user_spark/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ mkDerivation, fetchgit, aeson, aeson-pretty, base, bytestring, directory -, filepath, hspec, hspec-core, HUnit, mtl, optparse-applicative -, parsec, process, pureMD5, QuickCheck, shelly, stdenv, text -, transformers, unix -}: -mkDerivation { - pname = "super-user-spark"; - version = "0.3.2.0-dev"; - src = fetchgit { - url = "https://github.com/NorfairKing/super-user-spark"; - sha256 = "0akyc51bghzkk8j75n0i8v8rrsklidwvljhx3aibxfbkqp33372g"; - rev = "ab8635682d67842b9e6d909cf3c618014e4157f2"; - }; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath mtl - optparse-applicative parsec process pureMD5 shelly text - transformers unix - ]; - executableHaskellDepends = [ base ]; - testHaskellDepends = [ - aeson aeson-pretty base bytestring directory filepath hspec - hspec-core HUnit mtl optparse-applicative parsec process pureMD5 - QuickCheck shelly text transformers unix - ]; - jailbreak = true; - description = "Configure your dotfile deployment with a DSL"; - license = stdenv.lib.licenses.mit; - homepage = "https://github.com/NorfairKing/super-user-spark"; - maintainers = [ stdenv.lib.maintainers.badi ]; -} diff --git a/pkgs/applications/misc/systembus-notify/default.nix b/pkgs/applications/misc/systembus-notify/default.nix index 28c1be4219d..374adc6c89b 100644 --- a/pkgs/applications/misc/systembus-notify/default.nix +++ b/pkgs/applications/misc/systembus-notify/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "systembus-notify"; - version = "1.0"; + version = "1.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = "systembus-notify"; rev = "v${version}"; - sha256 = "11zq84qfmbyl51d3r6294l2bjhlgwa9bx7d263g9fkqrwsg0si0y"; + sha256 = "1pdn45rfpwhrf20hs87qmk2j8sr7ab8161f81019wnypnb1q2fsv"; }; buildInputs = [ systemd ]; diff --git a/pkgs/applications/misc/tty-solitaire/default.nix b/pkgs/applications/misc/tty-solitaire/default.nix new file mode 100644 index 00000000000..00e6efb713e --- /dev/null +++ b/pkgs/applications/misc/tty-solitaire/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, ncurses }: + +stdenv.mkDerivation rec { + pname = "tty-solitaire"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "mpereira"; + repo = pname; + rev = "v${version}"; + sha256 = "0kix7wfy2bda8cw5kfm7bm5acd5fqmdl9g52ms9bza4kf2jnb754"; + }; + + buildInputs = [ ncurses ]; + + patchPhase = "sed -i -e '/^CFLAGS *?= *-g *$/d' Makefile"; + + makeFlags = [ "CC=cc" "PREFIX=${placeholder "out"}" ]; + + meta = with stdenv.lib; { + description = "Klondike Solitaire in your ncurses terminal"; + license = licenses.mit; + homepage = "https://github.com/mpereira/tty-solitaire"; + platforms = ncurses.meta.platforms; + maintainers = [ maintainers.AndersonTorres ]; + }; +} diff --git a/pkgs/applications/misc/worker/default.nix b/pkgs/applications/misc/worker/default.nix index 9e3022457a0..b19b1b86cf5 100644 --- a/pkgs/applications/misc/worker/default.nix +++ b/pkgs/applications/misc/worker/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "worker"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz"; - sha256 = "1k2svpzq01n1h9365nhi7r2k7dmsviczxi9m6fb80ccccdz7i530"; + sha256 = "02xrdg1v784p4gfqjm1mlxqwi40qlbzhp68p5ksj96cjv6av5b5s"; }; buildInputs = [ libX11 ]; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 51e3fb032f2..7c0609730c2 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -90,6 +90,5 @@ mkChromiumDerivation (base: rec { platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours - broken = channel == "dev"; # Requires LLVM 11 }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index e538fb66bf9..d0937a9c6d4 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar +{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -144,8 +144,9 @@ let ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; - patches = [ + patches = optionals (versionRange "68" "86") [ ./patches/nix_plugin_paths_68.patch + ] ++ [ ./patches/remove-webp-include-69.patch ./patches/no-build-timestamps.patch ./patches/widevine-79.patch @@ -159,12 +160,18 @@ let # # ++ optionals (channel == "dev") [ ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) ] # ++ optional (versionRange "68" "72") ( githubPatch "<patch>" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi) [ # Improvements for the VA-API build: + ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build: ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) ]; - postPatch = '' + postPatch = optionalString (!versionRange "0" "86") '' + # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): + substituteInPlace native_client/SConstruct \ + --replace "#! -*- python -*-" "" + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" + '' + '' # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ --replace \ @@ -190,7 +197,7 @@ let sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 2429baba4b3..efaaefce65a 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -1,4 +1,4 @@ -{ newScope, config, stdenv, llvmPackages_9, llvmPackages_10 +{ newScope, config, stdenv, llvmPackages_10, llvmPackages_11 , makeWrapper, ed, gnugrep, coreutils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null @@ -28,7 +28,7 @@ let callPackage = newScope chromium; - chromium = { + chromium = rec { inherit stdenv llvmPackages; upstream-info = (callPackage ./update.nix {}).getChannel channel; @@ -37,15 +37,6 @@ let inherit gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-03-23"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "5ed3c9cc67b090d5e311e4bd2aba072173e82db9"; - sha256 = "00y2d35wvqmx9glaqhfb62wdgbfpwr77v0934nnvh9ks71vnsjqy"; - }; - }); - } // lib.optionalAttrs (channel == "beta") { - gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-05-19"; src = fetchgit { url = "https://gn.googlesource.com/gn"; @@ -53,7 +44,8 @@ let sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; }; }); - } // lib.optionalAttrs (channel == "dev") { + } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { + llvmPackages = llvmPackages_11; gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-07-20"; src = fetchgit { diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 14e9f306bf9..5639ff2b679 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "0i7vd0w1swvxw46wiy1xrni02xa7yvccw4cp9v2dc2lm5r43dw5q"; - sha256bin64 = "0by3fgmd54zj5q5znazrl3vf42ik3rhirwy5815i7isqiq7bb6lq"; - version = "85.0.4183.69"; + sha256 = "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10"; + sha256bin64 = "12nm7h70pbzwc5rc7kcwfwgjs0h8cdnys5wlfjkbq6irwb6m1lm6"; + version = "85.0.4183.83"; }; dev = { - sha256 = "1yasmx3alal3gygyjvvjk799z0b6p6nm7q10m0qyls2mpfvxpcyw"; - sha256bin64 = "0lp93z9qwdbjblmj0d514plk44hs0yqw1v7vr5mnrrx6l9gm0yg0"; - version = "86.0.4229.0"; + sha256 = "16yj47x580i8p88m88f5bcs85qmrfwmyp9na7yrnk0lnq06wbj4i"; + sha256bin64 = "0i81xcfdn65j2i4vfx52v4a9vlar8y9ykqdhshymqfz4qqqk37d1"; + version = "86.0.4238.0"; }; stable = { - sha256 = "1n4n95gllqmsrzxmcp9p4gz95gndq2v3vknfvm8p1qfhjqah0hfx"; - sha256bin64 = "1ak903wm8zq6pri88md2wdij3izr6kz9d4avyqnpmd68ch16vfnj"; - version = "84.0.4147.135"; + sha256 = "0fz781bxx1rnjwfix2dgzq5w1lg3x6a9vd9k49gh4z5q092slr10"; + sha256bin64 = "0fa3la2nvqr0w40j2qkbwnh36924fsp2ajsla6aky6hz08mq2q1g"; + version = "85.0.4183.83"; }; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix index 10d9e7b2a22..7548eb94fa6 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/beta_sources.nix @@ -1,965 +1,965 @@ { - version = "80.0b8"; + version = "81.0b4"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ach/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ach/firefox-81.0b4.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "0dfa5e6840276f2bda03babdbf5273f7d5549d7610b3cf00983fae5a1e8e4ad6"; + sha256 = "4b133dd14e8ce1b934e482c4f7f7b5ca4b58751181bed89f6573ba5994ebe644"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/af/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/af/firefox-81.0b4.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "ab51a6e8eb2fa5bd828da95600e7eeffa19c96fa8471299d832cc8024c5da998"; + sha256 = "8e50a0845eb058ee853fe40b13c88d764e721f7f8ac2eb54695049ab2a66e3e9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/an/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/an/firefox-81.0b4.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "5b7f60f06964dc13d0dff9c603d00a8bdaf86b1c0871fc60b6b074cd535f5dd4"; + sha256 = "3edf8e157cac424b1cbfff019240877e7b7c3bf5ed1b576580569c155c5dd660"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ar/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ar/firefox-81.0b4.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "8be8cc6f547475cccae9ff6675689334c5baa10025208035bbed4a186ff3d61e"; + sha256 = "b2167ff357963e3295eed2ed423a1c3bcf62d645329b8f4cf817ad3c0e101c97"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ast/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ast/firefox-81.0b4.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "2efd5fcf0e69f155ae0aadb28534e141224d16c64706e05c1b72f6ef44fed6fc"; + sha256 = "805a87a99a417ff4b762c01a9a2b88c7963f53a04fc19b42015db304b15f4bbe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/az/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/az/firefox-81.0b4.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "9ab8f6b96db687367bf8f770ba2f72f19ee7f438a949373830d03eca0dca22bc"; + sha256 = "79c61c9515a683731649bcb5d36b26b95dd56165765e5a952339910310c9d259"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/be/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/be/firefox-81.0b4.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b1b3e44c5733e197c53f013bfbe82eb7f6a300278f5b170338fcd56670445bd6"; + sha256 = "318fece7d1ad734f6a19faa7003e060b1254b31bf62e59580c70a64c4a167ec6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bg/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bg/firefox-81.0b4.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "e659b463c9a152e635dbc36ab972a64e3b6c28987ba5e5437672e68f24f6dcb7"; + sha256 = "55616606306dbd0933240d718fef8e83004fd65e4f53dd18f1601f09d0b94e92"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bn/firefox-81.0b4.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "f2e4e6e80747754fa449105cc870b87fbae387b64d044f8dd2fef743e34c749f"; + sha256 = "c38fdef89f6aee7bf03362d2edfe4dcc665d540b1e1dc1dad8c53db20d70087d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/br/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/br/firefox-81.0b4.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "90749e4392f518e5636cc687946e066545eaa26badc23c46e6b63da6ce1cdd59"; + sha256 = "c5ac1c8e9dc2f4c5a1a2b6e33bf699a823a9422bce46922bc36222700a29d2e5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/bs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/bs/firefox-81.0b4.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "929758b30ab1ff8c034da26be688541ea1ba9e99e7206b981f11a7209ff6d771"; + sha256 = "a18718ef7f467ed87c76816fb6797165db3e06bc166c5e88b526c9f2ce5c1d19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ca-valencia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca-valencia/firefox-81.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "1e60124bf4946605bd100945748302ba61d406b44563e9c51f58d781226d4a07"; + sha256 = "fcfccd0714c965801ce468f6817bf37eb074064e6e0b616c81be7218a6b632fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ca/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ca/firefox-81.0b4.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "6c16d41ae0748931de875f756b0a3b09268bc96c6ebec54a56e6fe8672879c95"; + sha256 = "5f08a2b2d357d5a6828865913b9e28fe90bda7a8ce17a0ea60effb25b8441b7a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cak/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cak/firefox-81.0b4.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f3f6877e2d8132737b978d073b54171ad6d30c227f50e1bb2dd2e1d15e2201db"; + sha256 = "db41156b75e1148527c51b915e3d9367d1c36a8d24a52132d1cc9cfe63bd9db6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cs/firefox-81.0b4.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "0677a8fd1ad69a8bb2869942624ae0cf37dfc5e89bc0bfccc68b79b7b4382688"; + sha256 = "d3287f28964581e63a3b1a5484e47e8ef33c136b39f13e07d6f3d555c27864cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/cy/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/cy/firefox-81.0b4.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c037ba4d4f757784923aedd914527e8fc079ab33384d84694b469af3e9eaf125"; + sha256 = "f41fd34cf1cc72d5fc80113cdc9fae7f03f434e45e990e17a94dd68463464c49"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/da/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/da/firefox-81.0b4.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "5c0b86cede27223a159a0052ea146f4f79a2cc95a9515d4da6bac598b1a792e7"; + sha256 = "dbbf1611913315ac5294f400c727cd5afbc832efbea56bd839b77cd4d6a5b823"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/de/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/de/firefox-81.0b4.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "e40a4752fb32a31689bcf546aa4867ead0da80207de3583bb2ed43b944a12f53"; + sha256 = "1047799de5b42b5cb0827371872b7e85b93a4474bde9288da54a573841e156bd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/dsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/dsb/firefox-81.0b4.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "d0e22abdfecbfbe2a25dbacf35e1bdaba716bfd2e09c0a4206c7260f405df15b"; + sha256 = "602eaa32d32db35d6a6d07f1c0cc53eaa4e432b7ab81d1f23b47d3125ac98d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/el/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/el/firefox-81.0b4.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6a4206278f3aa89aa0a49b41df8372c4ae10a6afdd107210a7a1d8a240d800f8"; + sha256 = "8a460f9542e213b1605265c6497742e7d55213ac91b42d00a15b3123b47754ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-CA/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-CA/firefox-81.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "3b767fdf9d08e08526f72bb8bf14a7577370003f29734a39a61cd31d65491f80"; + sha256 = "9bcc44ca3f4192a2a7a001f27db6884dd481551663b6d0c348ed0b9281dabe87"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-GB/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-GB/firefox-81.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "29108de728a833a8f6df04e2e4aaa21aadf3a572534844f4a44ee4ae0b78eb2d"; + sha256 = "9d241d56362ec52619ce02cdd2f11dc90c2e0f7c515c707ea56eca2e8f0eb306"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/en-US/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/en-US/firefox-81.0b4.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "01b005fe37487f7bc9ed39aacd09c891755fea9adff44addacb708000deebd1d"; + sha256 = "28972b08f8b3f2d19f5d50a2c9275fc459fc3e57df11c884149d1fdb9d99300b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/eo/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eo/firefox-81.0b4.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "ca8f65b6bfb491ab66640ea2b02b234d2b68d268480532aafbba6fb6a190414f"; + sha256 = "013caa4590462b4bc5dc09cb963cfd85cba4b5419111cdc87316574ca5691e80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-AR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-AR/firefox-81.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "19bf5b10da6afe691cd50530c57256b18c4059c48561c1c776e5e35a7a0db327"; + sha256 = "d6970ccf4d58e2f1219cb0d43a8788084d0863f0f349ab3292e182fb0201e860"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-CL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-CL/firefox-81.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "42e383a691ef11afe1ed5afc64a0e6fc7e87534826d71d169e060f10fb07cd1e"; + sha256 = "76fb3c865b3efa1da1d34c8caa7b56b5b6d0af2cbbaeaef873fa96d2b8c93bb1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-ES/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-ES/firefox-81.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "7cb0aa8fbe6983bb68a583bd61d307d3b44a6a38f5b4c8cfcb1bd401bcd10421"; + sha256 = "7b41a2b297df4f0f6d4f44e1eb0ea0cbf02454382d0994f119a77876c578c4b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/es-MX/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/es-MX/firefox-81.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "e9485c3a290a0a240d3cb9d18ec6929645aee333a919b4aa09776da106d943f8"; + sha256 = "733b90640a30df66700397ab0cc2045fcbc25af94ef9f36463a191228b511b77"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/et/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/et/firefox-81.0b4.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "eb1a74b4e901b09cf287e59d1c8fcb500cf2f948ecd5098f3d928413ff219897"; + sha256 = "027286d744b1d9f21157d8242445ccd7610a08d8d541d64635fc16549aac1b4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/eu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/eu/firefox-81.0b4.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "8daba1de73e594e3138ffc8bf58865fd4ece581a43337097691f2bec4f419fc6"; + sha256 = "ff555da3aaf1abb2c384772b309fb4129dad57b9fd523fcabef5b2743d3063ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fa/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fa/firefox-81.0b4.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "f0cbaec0e1087ad8f55d24ba39d60fd91972189aa367d6b80a22de3f5b5ff821"; + sha256 = "c99f9297568f93eda17058d96dfaf83e587907be9b5005e8f649f693662e4fb6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ff/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ff/firefox-81.0b4.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "6b98dcb2d5493dc7084f626b6e8aa807d1b71d0d8bc1ad30f2ebd3c002bfde23"; + sha256 = "91658b195a622afa3c6fde535391eff1aa6b70f4c0cccc5c55e56e6d66459435"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fi/firefox-81.0b4.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "4ebc56f8a38c32026380e02271cde2f651046d0b0fe4efadc48883fc2562fa50"; + sha256 = "cbc70d2051c96813ab081251c339f6cacd29ff26bdd8174b35caf9905a874635"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fr/firefox-81.0b4.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "b6d4ca33e93968bc0efcb504db785f5dee55bed9834d90482ba5abf54ab97672"; + sha256 = "51890621c8c3c0e40103a10e705adbc860937e5dbbb8a3984eb71a5cae3ed63b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/fy-NL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/fy-NL/firefox-81.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "438d72ed1e22da87cd0ec63fad41b5e355cbd8d2417627d74ded59940b6b1b26"; + sha256 = "5c3a982a51951901732ec7684514be233fe1c44780531fb38f7205724c241387"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ga-IE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ga-IE/firefox-81.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "6d3b4a427fc80b4f7e69f94a90d5d2fb9ebd366d224136316de8e2b03c06ddb7"; + sha256 = "04b5d338c7557f12fc6fb2206d444a8a00be6814b1ca26de4923449a4425b57d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gd/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gd/firefox-81.0b4.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ee54acaee8f5b2c0033fc3bf27cb6c90a6d1849c4eebb427e2efeb3a7fe44c0b"; + sha256 = "6bc0de0ac627203b1ba035f7a7ba7dd19bd82a7730c526c217150cc5de668fd4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gl/firefox-81.0b4.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "bce9bfb74c965ec6d2e346b86910c73dfc242be98473ba52f7d0cc34f14b42f8"; + sha256 = "37522d032422af770e37a93e33de6c0b8b79b2d22c6e71f32107cc8808de4d35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gn/firefox-81.0b4.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "a98fce4baf9e0424317231aac5ffc0b3574c2ec6feddd9e538faab59bf9ab432"; + sha256 = "f761db975c72d7e419601988c0674acc7fe17227d5569cac85a1fe2d91f5141c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/gu-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/gu-IN/firefox-81.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "35161db5c7fb962ad5c60118d422250c2b6a776ef13d116bd23b31fa5c312a5b"; + sha256 = "8565c1965e09060ddc5b253fa126998f827d17dd58692ec4d17d194d29a464a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/he/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/he/firefox-81.0b4.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "66fc1b065881a4dea1ac8d82bbd64bb6aec223c1419663b7a50752cd1700781d"; + sha256 = "c3cc5911103ce955f89c5104ceb1ee50f7c047e4ec761681c8693b643f5d91a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hi-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hi-IN/firefox-81.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "b1ce60f26dc79eb360e185805b98b2d1197a2e45c26cd24bd3c82edcfad42a5c"; + sha256 = "95463325675e56e700eaffb6e6690f4b398adb5cb77aaa34b87e16cb142f3533"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hr/firefox-81.0b4.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "712ce7b7e90c4b424a4ed46385a34905b7c4f59e6d07ced9e5e94a6108a3c206"; + sha256 = "6332ae812507f79baaed24e4fb79fc6c383418c4c9d41c0f3dbebc2fb72efef5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hsb/firefox-81.0b4.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "43fcc61024fa21216e7e05dd0fc46410b2dc32eaa87215014f9f3e0d83ebf37d"; + sha256 = "b18a7d31d3ce7373bcbd6bb7ff56adc023c58097126781d5f915828be8fef92b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hu/firefox-81.0b4.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0b73ab77e5e0f4ca34d0eed7fd734f30c1484a930751d5f2704e09e94179ed88"; + sha256 = "b1e4c6c9c21b2593f3fa111820a7e6a2e2e72e8b3065738f6a50df6ef4b7f18b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/hy-AM/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/hy-AM/firefox-81.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "bb52a07de2b0c1fccdc0910c0d861345822c9708f9f66471225a9e148f159cd4"; + sha256 = "562f4d9e094b688cb53860834e425997e65b78222724c48ff4ddd71ccca264fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ia/firefox-81.0b4.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "50cfffd20294f00e5194093b6114cfd1529e5f383f389565be7998c02a8802ae"; + sha256 = "87299a8aeee6da57666a06cc2d4f479b0c74c220e2b22ddf5254a052f11edacd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/id/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/id/firefox-81.0b4.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ed6473750ffa1006d0ed8a502809b56573681c85656f12cbc6fdfaf50506c15e"; + sha256 = "0cf1bae8def307d08e4c24fb44f7cfbebf150f1edfde2a3c0855a69775f26539"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/is/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/is/firefox-81.0b4.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1467ae111e51a4cddbf3611503e35da489fa6f506bedf441989fd093a1b507cf"; + sha256 = "6140d270e99173d995e42d32c0b696a51f72b1c6baa746549bdbbe7e2a08a811"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/it/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/it/firefox-81.0b4.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "b4c96a1e12d8c6e16b7e85c0080ff0c1e50cf78d0762907af075a9e272ea9ed1"; + sha256 = "3583cf0223528929141879c085278354927ced41d71321fe8d832ebd356d4614"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ja/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ja/firefox-81.0b4.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f79a5b441d4f6d10c9022e5b872e5e607065a6f8932b1f1ac4a32f586848a676"; + sha256 = "4a1bcf87b3cd09d7c3379bd922ede7a3c6c4a19bf11596e858634b408df95cad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ka/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ka/firefox-81.0b4.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "4e1e846659d18470e098dd9244278de6343bdb2d076927a46ae154f7b19b7843"; + sha256 = "320567daf4e4bb12c7209aff34d98efdbb2dead9b34f23d4a2181d2cdddeed71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kab/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kab/firefox-81.0b4.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d538a9b1b4c439bb2f1c57cb076b9f6f5be5ad673ef7f4e468031cb8f9f83d86"; + sha256 = "5b9d60703b494a4eb5956e59bc2d6893bc70e8b890d0c940f25d25b605000c89"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kk/firefox-81.0b4.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3aad1bffa285439350fd1c3fb09450e1d27f51a011383106b5341f75450884a3"; + sha256 = "45580e0c3cbb265f718a69ac9de7220d3d89e52e3b8a5cfceb7363c20e63c83e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/km/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/km/firefox-81.0b4.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "2d59a3a69a96e793efa5257fd9ba903fbcaefef99267f3f0921c3ef073a12f8e"; + sha256 = "24b4879f22829a2a5d72219cba2c5658bf7c7e73ffdc9640f6e897ec613733c7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/kn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/kn/firefox-81.0b4.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "804f85a1d5e8f5acd561aa8ae91e1100de2e62ae270d742f0b16111dab20f94f"; + sha256 = "905ed3fa762c73c5ba677b8ca5b620294cb1ad36dea2ac53fdfca5a739c0c0e6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ko/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ko/firefox-81.0b4.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "a09382d10e2114f02848e7deb8c770599ff8f84e18a5c0253f4884b7b7174233"; + sha256 = "a6a63ca4106ee9c710331ea50099e2a50842465095d38ea55a63dcb3ee3d80ad"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lij/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lij/firefox-81.0b4.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "b088949b9d87986b2ff1fe4020a59faed22b0c205a432ab29b862d07bda0dc42"; + sha256 = "b6fa42dc9bc68d4b71ae93eebfb1a19416f0cdd06d20fb344c0c0347aa2d4862"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lt/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lt/firefox-81.0b4.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8dd0b88ab0d16dcdf218b58e9f2fe8d8311d826461de8a4c94c9cfdabc8bf905"; + sha256 = "c70f6e7c20e252fdef6bf136c99095ebc27672719594df302e58be801a3f06d3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/lv/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/lv/firefox-81.0b4.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "bf289b7115d3114a59e92a3c63cbaf98bdb3f3fd1cc03a9cd5976a4834ef147e"; + sha256 = "c64d561be20fc8f0e7507a0b1dc2e5d79af407531a37cc7da3fd880789899fdb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/mk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mk/firefox-81.0b4.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "cd9b7abe6c53a221d88c5f49fee164d069c21d956285ad2d0fe06e7012b72870"; + sha256 = "aa38b13c6bc5288ab491f5ccee3a881474b1f42f1bd959435035782d1c39f407"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/mr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/mr/firefox-81.0b4.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "370d8540a678b356a4f373a81e4807170b3599db6472633b34c768070c77217a"; + sha256 = "e56eea60ca1cd447e30cccc82ce7a4797fa23e9bb4871a5e20e05d44ac35f720"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ms/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ms/firefox-81.0b4.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f141f3a22d6b5914f8cebbef0d2e124fc50833ca86bb62dd2a01d957ced6c099"; + sha256 = "9d8445e2bda6a8cc8714a0eaf82e1b9ec03fbd94042c3557f07d9c8b25bc4b6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/my/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/my/firefox-81.0b4.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "ac62b25be480b30ee2c71371a6a702c37b58e537a4c4781b92e4f0b74c11cace"; + sha256 = "4a7527e5e3e6ea0181cc8b9a2f206bbe162a4e1867faa75b4af261f08e89ae0d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nb-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nb-NO/firefox-81.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "c3364a0364176839b97d08294ec7291fa13d212edb806738392796218b7a7080"; + sha256 = "c2ae9f5fb235541cc69cc3c4307dd4b7de51a9f4b6e038ef3091a773edec6c5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ne-NP/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ne-NP/firefox-81.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "75d005443c28be517828d07be438b8c980d6885b4dacf42eba58573be4291b47"; + sha256 = "05acc175b06ab7f5861a3a7e58e9a92c40e0660224426fc8225fba6c25888726"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nl/firefox-81.0b4.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "cebae8c9c06bba81194c7126f115ffca44ae020af33b0de8e201ba930f4649f2"; + sha256 = "640be4e631343c9f2a55c24a4d5c63908627e9ab2d39a5346d1842d8e4a57799"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/nn-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/nn-NO/firefox-81.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "27607aad3a1d5ac50f159289cdb92e71d882b77ec9d2d320b470dfba799295d4"; + sha256 = "46a898f41e5c3c9853b05fda8f44be01b2fd5a7fe3dad281c21588c2deaaedce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/oc/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/oc/firefox-81.0b4.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "634372a5d704c890d464c7c3dceb365689f260feeb9ee273e97d32d8b8c9a102"; + sha256 = "7481c8bad2e905a033f09ec4c20f8d4b184a0f90fce1c10648c4fc57a7a5f301"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pa-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pa-IN/firefox-81.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "16a165ec3517839d07d2177cd3e88a61f063ad7341095a2c70baaa5de1f7a2b5"; + sha256 = "a460ed0241c569e1ac62727b17f8c8d0d4091e794900e2e2be7d8d8e2b90ada4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pl/firefox-81.0b4.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "cceb8d8fc319344bf031c7d86ab5d19ddd059b67a7293a2bb785621b99cd98ad"; + sha256 = "d82e300cc8be61ddc2aa66bd4d4ec35cd18e47603bd19530cf48728c5fe67a5c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pt-BR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-BR/firefox-81.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "5be4bd15fdfd7b80a156740c57166eb31c77ff32f7e4c354d403606aa3049f8d"; + sha256 = "1ee1560d4597adbd230fb0c556a4d8fa6984ee86bb731f7a5a936d660897eb99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/pt-PT/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/pt-PT/firefox-81.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "0dbb3aff49303f94539f82ad5d434351f5c2d1ffaf414b94f6b8ebf6535d656e"; + sha256 = "be7e484f8c3f4d8b7b894a437b70b2f4b448e3a7df518ce6906295df9be7749d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/rm/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/rm/firefox-81.0b4.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "6880c4976bb118fa934d189d6af4cde582d64b909ba0671a4ae62e41bba4d95b"; + sha256 = "819cf6a13d1690dee4e4255aa0c3f551411e2b7076f8ce3447bba47f07c806db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ro/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ro/firefox-81.0b4.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4e5ee175921c2e919d2cf1eace39d52c5b89c6bf4ff9bfd9080d885d2a2f83a5"; + sha256 = "2baa8154f358962983c7e0b26c4a7cc8cf97587b646884527fafe46f5d8d92ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ru/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ru/firefox-81.0b4.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d4be0a9f6d4dd99409a5099624429f951768585a955022c0efc0ca00140bebfb"; + sha256 = "eaaa5338ff8ffbc9bad5321ee3eb7410feb9a26a06d3cc49707c0a048f4412e2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/si/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/si/firefox-81.0b4.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "77460dd1207e11ef6227756c1fabca26777a98a5ae92bd38be2e86161c0efa12"; + sha256 = "ce04721a96cea62eb7011c261f740e9e0ad6288ad9ff231538c3a6df86fb40ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sk/firefox-81.0b4.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "018602509df7c86cb001f007937dcd44694438fcfaa9002562995b8cec0d956f"; + sha256 = "4b19fef341d64f94ad97a0bb8821693b00e4e7e04454156f92f0c82f4fee0005"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sl/firefox-81.0b4.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f35c5a8d8b3eb56c9241a13d20708069073558caa02bf6ca55459150869ad114"; + sha256 = "96192922f2012a3e6be634c7ed09017cebf9498c6fc2862336bfddbc4ea40840"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/son/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/son/firefox-81.0b4.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "561d9939c3065e2a604d7b51535a5b4b8c0da7e3fc9274657ea88366c5924c74"; + sha256 = "dfb144edeb3712bc0a3bf7e0675de80315c78bea7d7c6ee5f6047c077acbddf9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sq/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sq/firefox-81.0b4.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "1e38655b0ca5684decc1619a51b2bec39b8fdd7ed302513a8f8d14a3ddc7533a"; + sha256 = "54dfab9e843dcde43cf188ae33922371fb90c1bfda53ef629df16576d6a0bac2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sr/firefox-81.0b4.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "ab879d65f27ebe393ee86c12b2eea256639d17f2dcfd8b4981072772a277d783"; + sha256 = "f00b5184ccb47223858128aa26481867fb33aa50a914a8c807235c9a2bdf74fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/sv-SE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/sv-SE/firefox-81.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "832ca5b1e0d41675066e7bcfd16563a9e03dd87bcd96d4592232ca26321af7e9"; + sha256 = "d3884cf4a9ff23971badfb1a794c9489e0006e6851a0e501e290d8793054cc1e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ta/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ta/firefox-81.0b4.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "ad9c6fcb91fc87aa11ac0912f049db9cf93f5e62797335a8a699b9ea8a7ede9f"; + sha256 = "53584d2093feffd36a8a5249ee438b82d21af834a3c2c210944030c127b91cb2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/te/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/te/firefox-81.0b4.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "37c7836f86fc5f4f48aefcf28330e1003687752d506d1050528a19b592bbd7d7"; + sha256 = "63b65440720bc492fc95d080b191ba452cc87c8501b195e02df66ea4487fb902"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/th/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/th/firefox-81.0b4.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "66cd4f8cd18f1c076b9d7538600459fe01998185cbf6899126841b16b3184321"; + sha256 = "3b01fff09734f2206e4aee227ee7f0c13544fb1635f92a5221ee356117955446"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/tl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tl/firefox-81.0b4.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "d3f6102c2eeec1ecb1ba28884592c11e544e71d42ea2204de59ded1065f71f5f"; + sha256 = "00f1c65baf63246a9ff44d98171a6ceec6e276488f5d6fbdf6f97760509b3bc7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/tr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/tr/firefox-81.0b4.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "ea161412fd08571782f607c2aab116a1e1912caa3eae785db1129f617b389f11"; + sha256 = "064d6c6036fae215fcb50a87863e6808bd1626084d9144a18f7ea1f4c7072093"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/trs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/trs/firefox-81.0b4.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "a1824abd2c3f0e0ab3e1ad971137cc81c636af48865f7bdf7eb1029a7d08a16e"; + sha256 = "73c892e0b0ab0bcdbcf6af88fdc8de335bcd5c56805675ba7b487ed3b620ed22"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/uk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uk/firefox-81.0b4.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "38afb4f054d9b577257509b17e32049e7c5fb50e47971fe52bc5ecc7d9b5806d"; + sha256 = "8ac48524702e3f177e78fe97e4fcf528752a3ea0ef08e9212037dbd0febea53e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/ur/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/ur/firefox-81.0b4.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "8b9503d7b5452c43e7300c8a1b1c2ec9d2b0572aed78e7b8f05fc7c1ca883d07"; + sha256 = "154dd642021769aa67a081080f33d87d736686b9e6e46cdfa2bd2201605bda26"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/uz/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/uz/firefox-81.0b4.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "789a4b08daadd64f6275bf267bc269ea92177902ae7a8b20dd14bdabcda49cde"; + sha256 = "dd36910596d777f49de3dfe8e22f2838b76081cb259107047b9a98c3445c01eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/vi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/vi/firefox-81.0b4.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "10702553917f359954b204b65bfe311826cd44f6e81e7864c05a94d541dbd636"; + sha256 = "3cef9f657f83bbfc68ab4a7c8ab84e1e937553cca98cfc30d3fbbec5c8be7907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/xh/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/xh/firefox-81.0b4.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "d99ea01e9d8bb5efeea45e2c2e14da6618d1eaaa25f4f1a1facfec1ebdef2291"; + sha256 = "30a98fa9218cbb07d792629e73a250659b321a3555eedca0a68e6ffb1d5191a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/zh-CN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-CN/firefox-81.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5c7c3d76a7e4fea7ca207cbcea698eedc970a6fb727fad7c071e19325fd8631d"; + sha256 = "bf15e819d84a3cd3825df2046bd9ffc139008f45fdbbdc64e04cec6a549af3e4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-x86_64/zh-TW/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-x86_64/zh-TW/firefox-81.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "9fbe3205110e83ff45fdc8f5c1659caeaef48c75db30a7014454d6338f1aceb7"; + sha256 = "b194749cb05fe282f59f2f6621a5d04fba42406d7a3ea71242b667fe94a5a857"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ach/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ach/firefox-81.0b4.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "a6a965e26d90ef0dc4b892d0d90f8b0b81ea7ced3ea1de3a70126c4095731fd8"; + sha256 = "203ca1a13f76935935daf2124c662329df93af0e44b4bcee7334ff60092c8027"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/af/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/af/firefox-81.0b4.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "649d3f77f16832b3a645f98616bdab4b788fad7d2ecc2d91558d369b439857be"; + sha256 = "481d233552b0702a8b8092748b4c71da3c14c8df5e971c5b4662273cd8808022"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/an/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/an/firefox-81.0b4.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "8b0e52a60af14565dbc514536a8808fc8aafefab56d765fb0ce42565f67ce1da"; + sha256 = "a128b96a34eea409a8b5fa412e6a1a36bcc28f2fbed40ba9b474b9d86d23dbae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ar/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ar/firefox-81.0b4.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "522f35d947d56354d31ed106ba5fc6feda9ad0a4c29476c7497aec6cb2f6dd36"; + sha256 = "a2ab8b556b6b477bb1aa287f630e7ae6aa902fd1b75968c01c2e2c76fe9cdf09"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ast/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ast/firefox-81.0b4.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "03220451f980f89f3d9b23b53f90e852402fdbf54494ac99be7dc8932287d732"; + sha256 = "193422cbafcaf5ed58f334a9d5b30f9a6181aa1cb649303df18626d9a3484088"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/az/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/az/firefox-81.0b4.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "2d70285230ec8fd4f5f0e3232d08b5c669e5f71d4758d88947b82f907305df3e"; + sha256 = "c206f5351f0ba474a5277e223514f032c7ff0b66029f570143f2d1d2b8ccf566"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/be/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/be/firefox-81.0b4.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "02967f01fe3f8b225d60d462e4dd17cee0d031bd5171ec781d2938796b1174ed"; + sha256 = "c3d7d04ea43230b6a6e4227b799d47348bc5c2ab6a60e93f4107efa6e7b34ef3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bg/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bg/firefox-81.0b4.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "9b5acf3d80fc9f7e8ea20d0df282d6ff1b605fcd46a5a329a9138734df501035"; + sha256 = "08edf0db8aebd41f25366ef4302214b4ef00540be39406fc780eec288b0de324"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bn/firefox-81.0b4.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "e8a65769c738e9079d1aa9fda2ba74d21b96cbb76d4e348acba7ea1887d90d52"; + sha256 = "a6d5dd5918d94e74ee8ffeb10c4caba65697ecdb81598b0bda815fa5d4830a78"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/br/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/br/firefox-81.0b4.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "7c2a12900d2adfa765b4036e05875adbf59f70e4eaab33568799cae91d948b5a"; + sha256 = "4e7ffbc380b6f8716399ee9d7b9ffc5fcdcae72f48b63ae4bcd2011a85efa0b1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/bs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/bs/firefox-81.0b4.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "bd0e3d7b35cb845288f91eb1ae21d405f4dea2a6633897c30fcf56219982cd59"; + sha256 = "ef36dae13dc3c943e5981a16d7ca61b4c6daa9a4873d2cd87022fbbcd01c8907"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ca-valencia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca-valencia/firefox-81.0b4.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "a167e7db353adf008d28458aa24209175c29c1af92f21da7e999729a8ce7e5b9"; + sha256 = "584a0370f79011dd2691461acd573133348a94cc1323d6fb99dea9dd6df1e155"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ca/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ca/firefox-81.0b4.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "809cca0c4549e747944f043c96bab11e50a1ee6f4ddd6436ae94f85cb55063e8"; + sha256 = "e280fe05f4e9320fd354407811ea8664d50de3810298e5eb4922b2d3e549ad11"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cak/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cak/firefox-81.0b4.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "8575e1572ff2872993aa7cc07ea1fe82d66830e80c779f742412128344afdc07"; + sha256 = "3decca8b5b0d44db169abfa20f07b3c109bbea0a68ae3e44a35f97e3b989324b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cs/firefox-81.0b4.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a4e5c1e08e138c077a8cd5a3f54e3a7a1ebaf7ac674d2658e1c4cb10b4a26a5a"; + sha256 = "efccc2a43f961179f61eb7858b1e17ffd069bf7a26027faaad09f1b529ade52c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/cy/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/cy/firefox-81.0b4.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "149d1bb8bcedcf215095629e71e530a58e0dfb60a13e72d6346db1200f79a882"; + sha256 = "dc8a1945d0230070e2bdf65b673a9aecc4868c9821f7f1e2f6e0d18bb98c912d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/da/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/da/firefox-81.0b4.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "5eb27549c370ca89421a9d39bc5f33c948f85c48d67446b32281a54c50e12ea1"; + sha256 = "058b800e2c9fc464f2a75fa48542269056a88916b9474a953f0d29a3e9041257"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/de/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/de/firefox-81.0b4.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "d868edc9f9831a4f8f196f438a1235339592a05086c3d5e4ed25714df36421af"; + sha256 = "7fbd0b27073b2c46829fc0d631ed11fd9a38a07d0ce474f6837ad1f5c2adff62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/dsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/dsb/firefox-81.0b4.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "ffc379cbd30f04c1f7c78f6991414b9214ca2c23280655690dea42c9a11992aa"; + sha256 = "d0b6083098d416366040a877a92b163d469e2764af995c65fced49de23148624"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/el/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/el/firefox-81.0b4.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a87721a1a6da5674d0b9b754d142ad5c00fca4274cca7d4d1d5e15f1e21be389"; + sha256 = "104258b0e47b661d7c75c72f5a0d7750399a101a9996a3f8837f0f524e9820db"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-CA/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-CA/firefox-81.0b4.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "dd04f6027f1cac7b5a34013ad4dfd3b0494f40f243665a80ae058887997ec299"; + sha256 = "be6750a6946b7ef58869d0c9f0412febffcbe4955c823a573d02822f9a14266e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-GB/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-GB/firefox-81.0b4.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "d425ea90fa18877faac09cd7ba1b499cc92133580f720cf0481dd651f529582c"; + sha256 = "e6d2c60c30aa90b6026cb85d6fc3a1d1b7266263980df652c9a1c158528cfc74"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/en-US/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/en-US/firefox-81.0b4.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "777291dacd6ada8f3777c63e0264d36f3477b15e262d575e60b9efc4ac5de30d"; + sha256 = "be534d43126a7fdd297f3431b579495b6f22832a358a0c793a23bea8adce1c9d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/eo/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eo/firefox-81.0b4.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "df865cc147074318eb89c0ac4966b42aedd12aecb2a637bab18f6c231fafbb29"; + sha256 = "6ffe84994fe7db178e59ea667495e95e6fba621cd0e4ec812d94dc3d98cf0a3e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-AR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-AR/firefox-81.0b4.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cbccc83c1e54a59716173e5f1a8e675ed1e3567a7a316e48b5bf83adbfe39597"; + sha256 = "982874a48791db0bc98559de45bb8884da93ee0a0738664c73ae5a08b3b1a2ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-CL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-CL/firefox-81.0b4.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "45b0243d594b5e8b4828746719b93a9388ab509aef54d03412292b76365f4fd2"; + sha256 = "c21fcdeacdf570a9f8bba9c34c64a60776aa8a4de56b5f773b1d26eca6d65b70"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-ES/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-ES/firefox-81.0b4.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "8eb9961ed19594381a761385af10bb0acd0bddc95166737a766b20de03e12e0c"; + sha256 = "bb34dda74d59c862ab24ad9ff0c5ad1e1fb5d73e6029b915f966d0913cf4506a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/es-MX/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/es-MX/firefox-81.0b4.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "d4cd439aa71e06af039922fa98dc33bd25f90c728faf09c6bfaab4bfefc6dc0f"; + sha256 = "53686263f77643ad4f769faac81697c7e1eca216ed0a7b051c2318b181318d7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/et/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/et/firefox-81.0b4.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "dedb23bc1ee86909143b02b1d1601beb1dce38e9bb14ec8cf015e274fbab9e97"; + sha256 = "053d8ad6cf01be9f51cd133090e99230dfe797effc749e14c8a21ba712546776"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/eu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/eu/firefox-81.0b4.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8e51b57208029e32ae01c93724f7b2f25d896f732e6739d5537e770b386e22be"; + sha256 = "77774b9126ccbca2b5716b1701f8eb7933ee67ec5437a00b8ab991f423888a80"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fa/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fa/firefox-81.0b4.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "1c332cda9a1445ba3b58ea93c614300f3b0679d3b32e9722068a554c92e3c8d8"; + sha256 = "4a0554bff8c11ca39f1de223537d595d298e6f61c2590543151e8ab1d8eca36e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ff/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ff/firefox-81.0b4.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "c99e29b5b31196dc71a8c89b66b0e34b9bca8ae630414190ef7f56133bd08959"; + sha256 = "272784bfa53ddc48fa43590b3ebd2fce808786b4649efa1d5b417488efbb8911"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fi/firefox-81.0b4.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "98a35572115ce221a03215bc4a4347f9579a3052191d81f64af1455f38f47ff7"; + sha256 = "c389eb80f3cdd215549c7ce55402a7c03544eca2fa3c2074842af32755d14cac"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fr/firefox-81.0b4.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "34f0991b083d5a924a0e77000010d89f049767a86338db7f565a1fbc815216fe"; + sha256 = "dc5a79229fbdd3e9fada6b6bbb35183c17a703b9c3f29d9172f2b56cd5c0d289"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/fy-NL/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/fy-NL/firefox-81.0b4.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "157dacc021af4ca81590394c4dd01cb337f4436df1020718ffa424d43f023606"; + sha256 = "3eb69867818f0a8448e4f421f0ded4ad1a172bd5c99048065bd4b6cf83e8b25c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ga-IE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ga-IE/firefox-81.0b4.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "0e338674ea0ebb68052aefbb33c8eadcbb0bd71c78fe9bb7eba455e7c58f1a5d"; + sha256 = "b09208ca65279e393f512a04712f91b2b170ca6e32777479acb7a03db89e87dd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gd/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gd/firefox-81.0b4.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6129a4db1d2c0b0b2f250ea2ef30d08cf41da50c1d2401a7464ec4f6b8cbbe76"; + sha256 = "011beadfc3e78ff216a13d55a9b54471ebf84bb1be852aa986ab5ba1648836f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gl/firefox-81.0b4.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "94ea69444a49b0ea79f22d805963adff4a7d8fab8321e415fe8b4682b489e7b8"; + sha256 = "c492314ad418a190484fce335d1dc5a28a515f630c59b1cf2d7e812b6d3c3bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gn/firefox-81.0b4.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "e3e6533130afd6577b8f1d41f66c2b16d3b385aeb398cfb211e7196073d7ff9e"; + sha256 = "25b03d5251a69631f5d0cbf9dd89d1ce1dd5355e05efcc233bcf62e5311d4d01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/gu-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/gu-IN/firefox-81.0b4.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "25ab691be04561a2dcfb2185fe5deac0b6e4785f3cbbed871b8f51e370429b3d"; + sha256 = "1cc9a3b933b625a26beeb7c31eb062e22ff8dc98c4860bf6ef4aef5567552d63"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/he/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/he/firefox-81.0b4.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9ca2569009d5707c9ee9051173b24c5f531bb9c3aced445bc3bc01fe99c7926e"; + sha256 = "027cd01f51db3b4d27381870ddf95ca2f7252bf7c6588c3d073d303bebb45311"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hi-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hi-IN/firefox-81.0b4.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "c39d4070be5517f8979527064b5553236d2f1f15eacfb3fc66fe4f7a2a063814"; + sha256 = "99d6d2159ae34ce2154678e4913145ccb9c96572ef19a18db6a223647b7ec68e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hr/firefox-81.0b4.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "c6c37633f91a675dbd33180761542d8f1af950e876dbd1635f73a0243e2165ec"; + sha256 = "d9b2fbc6474bac73fe7fb5c4eb818f5dc0d74cbbd52c3aacbed0f17db8bce9eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hsb/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hsb/firefox-81.0b4.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "4bc5975c97a98c4a93ffb4940b2f0f35670cbc9785f5fc07be5d387c3403fa64"; + sha256 = "dcd0c254c542a50807cbf1d0036a4cab5463c237318fb1d1fec9826d052aef62"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hu/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hu/firefox-81.0b4.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "5c76f9bed31bd9e906b0a044b67113f1cc6d91ae738d3c6e1c2746eeccf8854c"; + sha256 = "5a0a94eeb9c8d219b3e34e92fc51163e190c606f975735215177d521b7ed9656"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/hy-AM/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/hy-AM/firefox-81.0b4.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "40d1896dd1763f035ea5f626430e6de77df4e0c83f3cb4d2d9c2b992379695fb"; + sha256 = "2ff26ab884697d226bcfe224ff5c068aed355f6bb00777fa6d9f3bd0b9f9b386"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ia/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ia/firefox-81.0b4.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "5c8a0451233c3d55d764a3ab073ae25b3fd2125aae40c73968672fed9b2520f6"; + sha256 = "7bd9d940f81d76984886463cc10920896247084f91efedf99f787601a47abba6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/id/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/id/firefox-81.0b4.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "7328e7f45205c3f9109eef8d7e512f41dfaf179eea50233f63a549efec0412b4"; + sha256 = "c415b55ec7701219557cc4815ec0975d86f18312a2ef6a8abf3e82876edc5045"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/is/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/is/firefox-81.0b4.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "3f9e92d8218acf6da2ca09bda7544b6ae6d99d1ec2398bd3281fd28aaf3b7845"; + sha256 = "3ee6e83bd9c244b123c1a1989fbcc0524c4101fefe697ea0a9ab7c6a05302ac5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/it/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/it/firefox-81.0b4.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "947b2947b5b33c3d62645fd2a5ba7e02eac525bd3fdc511f62881b61c77a1eb7"; + sha256 = "de141769375ff5da94ee1030f5af84b309917eeea48cde769419004ca5a015c6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ja/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ja/firefox-81.0b4.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "fc82a3d2b816af47b8dd632d672135f7dfa3016a554c6b1840129394007f25da"; + sha256 = "69c5c01998a78c17ba55f262493c4e7bfa4fe03bd19a8ca605546f41f0c6f794"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ka/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ka/firefox-81.0b4.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9dc51bcb8d60327d5f893f334a54181eb6a4f34800ca9f15671fbc833e8a4026"; + sha256 = "4c37f22f1a20c79c1b391b0f86bde8535c0766980a1b9a42ef912cbf91752392"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kab/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kab/firefox-81.0b4.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "bda38d2522f0fdf8d1d6903bb11b63dcd242684bea412f9176c49fdf56b6d5f6"; + sha256 = "1c6722e18e1eff26918de17454d8103929115f7f036a1c23247695f7fee13051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kk/firefox-81.0b4.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "d89d7aaea34b094c6a452c3d566ca03f42e4a1dae4db26d1dea5bc2da49d808d"; + sha256 = "9ef2e2142d2e6d49adf59e6dd190b4ff816cf566cd35e5d288f66794aa2d73c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/km/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/km/firefox-81.0b4.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "932469479db43ced4b9ee82a481ef00adb5808f7d2e859ef7564e20cd764417f"; + sha256 = "bf0899cad62f3331d157c557cbf3cf1f7faadaa7f9aeed3c6547b4533689dd7c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/kn/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/kn/firefox-81.0b4.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "80564390296e12424ad2fbe1952397cf7b36af4e9dfc1fdcf914745aa01a5836"; + sha256 = "cfea495b254e1ca8c1be94e95f0c1f126d5f1a1c9d54129562fbec5ded6dec58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ko/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ko/firefox-81.0b4.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "b3f091451469caea3f87f81be1da8d2e981327ba36df12224f8466ab68a2e9ea"; + sha256 = "ba8c93f8567a4f6bbf7af3c38a2d2ee793b05c0246638ded86538f91e6e9112b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lij/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lij/firefox-81.0b4.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "becabccd189bad47d9e716889698811f39c0833474bf48df2e4f2792b67bca6f"; + sha256 = "c093b95b291af78460396e87ad39aa142d9925a7253f74aef9640fac0134e397"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lt/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lt/firefox-81.0b4.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "fe38d20e2cc294f3ae11df9ea7d34849489b1456355b7d110f8639649d5cd944"; + sha256 = "b035e58bfe373138626d9c5a22e6b6a8c6f35e8ba30ce821f80a1a85fd16c35c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/lv/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/lv/firefox-81.0b4.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "1f6b7bf9f9b1fb0eeb80ef4a9ff280b042f9f524edd88b9ccd0500fa4ab40063"; + sha256 = "6dd5cf66db0207527966532a2728d37438f71d1e79caf9b97916d0e404c9509f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/mk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mk/firefox-81.0b4.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "732585681ae095a83428cdc32c4277f98861c73583c6b12fb1ba07f0265be8ab"; + sha256 = "1308f476d0052e1317b4c7db29d4d2218c60921a9ba7f619dde4455aee7978de"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/mr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/mr/firefox-81.0b4.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "1aea289a62cee8243f69bccb02770b026ed183b6621bb99f33b1f5b4c8a5b667"; + sha256 = "7336012a19cd650dfb8f842de37da8e29e7b0948cc707880667eca87bb31869a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ms/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ms/firefox-81.0b4.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "12726f171b6d5a831898fe0c6379949860e8aa899789c2dbff7df86281549076"; + sha256 = "192e12151ed1be4c3f7ea12beedd2c50f6e7fa877ae8c448cc899cd0fa1c6d24"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/my/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/my/firefox-81.0b4.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "4545ba6aee4231640d4670e08a5bfb71b0cae5faadd5bd3d9705b37df04f5dba"; + sha256 = "08db2ff728d5bfcf751e95eb9bba34a94c435e53863790ae06daf803d56c227d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nb-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nb-NO/firefox-81.0b4.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "1b741c62a58ac9a0ca845fa942ae169576242a3d97018439d85c9efba09e41ed"; + sha256 = "22cfe518994fff77dc41e6f45550549593564ef2fa2dd34e31af17f5e42d636d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ne-NP/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ne-NP/firefox-81.0b4.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "5f44c3bb3351ded2b7f5ed216323fcee990175ef55b34a32026a2c6afa280ebd"; + sha256 = "605180e46adcaee8fb813dc41c4e7bbe5f509f181b607554137712405c0cc294"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nl/firefox-81.0b4.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "5da24260eec62457572431b2667eba929876c68e0122f589cd87c7df3c364e7d"; + sha256 = "ba8b45685a1d428d5fa1e38e1a3ec024f55db2f3ce4221fd53b96b0e0801a6b4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/nn-NO/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/nn-NO/firefox-81.0b4.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "3d8ae8f44295cb55a3c148510922e5e74b0ec8b69333fc9dde04e6f05d1109e4"; + sha256 = "0b76c63f7942576a2deb29cf15b089d2e73aa0b25f07eb1a511ccf033c68234a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/oc/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/oc/firefox-81.0b4.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "913bfa234f56906bb48d2410ba8bb400cce92f6f960d7e1557786092f03aec30"; + sha256 = "5de508b4039c395b594a0c78d25655113906b95a735d1e94f8e1171ca789da19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pa-IN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pa-IN/firefox-81.0b4.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f6c276a03f658fe7f62b49d8ed4e7ecfa14c9852384b224b732bb80d6d0421df"; + sha256 = "0bf9e4751ef967f4c6f63cb6332fe3940698b3e67d0e4873ea6bf639487159f2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pl/firefox-81.0b4.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f1118903f6774c4e24cf2a01238f0cdefbb137e8af829dc403b13290bad64124"; + sha256 = "0fcece8a65132810cb297a599cd4b003604854f0af684b33c9de554fbf7b1e86"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pt-BR/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-BR/firefox-81.0b4.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "e421152016cf3551bc66382559e947aec03698090ed797514a35bbcee07229af"; + sha256 = "8363d209d1eb7e8053acb4805df119e230ab31e74b3389ddb01b53b032c12bf4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/pt-PT/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/pt-PT/firefox-81.0b4.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "a4da74dda8c2641e349cabc2360bbcf4ad531719d3652c96a8c9a8f2130794d1"; + sha256 = "cf2ecf2a673f0a4f17cecb10b330bec530fd6e37aff9ed821aa68e202f59f864"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/rm/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/rm/firefox-81.0b4.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "578499fc230856e300a6774a8ab0b1d58c1afaee1e0fe6987ae16ea033cd6beb"; + sha256 = "8849e945e79f0f9605e288de967e9f5316c792b150654e23ca65f6c91bba8978"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ro/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ro/firefox-81.0b4.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "967ada36c6bfb6bd658493417f5f21e1cad56afc40081463072eee40a964f809"; + sha256 = "452496612b170e53423009a128f092a3d4a372e0e6fe352e649b3c989f6f254b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ru/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ru/firefox-81.0b4.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "58008daaf760fb6a9202d10771764cc3c46347b905aa622319b0631d833120e1"; + sha256 = "0e7787bee9fdbb1ca0bd3ef050b1ee5d6c6d8277da941232d6ef10c612003773"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/si/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/si/firefox-81.0b4.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "c599e263b7084a69ea0730755483fdd6334610e07188c5c9f06b4be6bb7f073e"; + sha256 = "bfd6df7b86490aa941f5878ad749d7918bc3c907a177213ab8a60df0270eea69"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sk/firefox-81.0b4.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a7170c138b30450e5b56ef7d5460f549288488455e482c8a89ea897dc9607f73"; + sha256 = "87c4827968ac3de5fb7609b9d7685653ef279bafbbb8b15f15f93cc876d6e021"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sl/firefox-81.0b4.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "f7dea114d00831e71a6940348692b6523174a9fe099dad3743bb69f277cd2d7d"; + sha256 = "6b272ee0cc91ba6114dc777f1833ed5201a96fd905a0d68a71cbafafe1a066cb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/son/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/son/firefox-81.0b4.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "9d9917d01601e3de913267d1836764cc10acb09363b05049867d7069964171ad"; + sha256 = "342f9eedcb359409fb324c13120ed25421435b614e9b5e15585ccf1551c263c4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sq/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sq/firefox-81.0b4.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "85c34be5e061157f94444cfa07d8c8c1768aea4d4ed29a63d46b13bbb5d80438"; + sha256 = "ad11f5878139c46a2344d0bcf6b02ad2c19e59f9861e7ac74668801e14742b73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sr/firefox-81.0b4.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "15a348fbf5fb4ae31e0a33b17d866e40b655b4dd788329d579afc82bb5ed86a3"; + sha256 = "5e555aafe353036537609b9ba997374d106bb5ecaaa386b5395b7d156ff89901"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/sv-SE/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/sv-SE/firefox-81.0b4.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "bb9bbd0edb5934f5d33d4f8db92d1e039f8519c0c126f5156f88d4a5be864902"; + sha256 = "cbd33b4fd20d8a7401e384196c28adf9fda6ee2bf24895d75e75f8b727d33e53"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ta/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ta/firefox-81.0b4.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "1d886bf18808d2dd3d6a95e5ae377c24be50f7e3788bf2c37c42606e2141d3ae"; + sha256 = "8e4e9919ec79c1847449cc75539f24801d972b67d6895727aafddf7485d95ed3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/te/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/te/firefox-81.0b4.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "72bcbe4f087f8ed8248d5056adc786d96982a87fb79bc3e83dfb9e9f209211e2"; + sha256 = "cb756aa758e69f26eb50d2e81bcb922c2a15a2304ef99debe67a57c44b2c3c52"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/th/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/th/firefox-81.0b4.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "ba0d8e25d5d2de631c05b9aa7317eca67dfa12564e677f9391a7da61c7630ddd"; + sha256 = "8c2be1458aa4077264ec946181d7ab3160086d12c821dc3d5fa3bbba46de3574"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/tl/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tl/firefox-81.0b4.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "020791c52209fe806aa92f7945724ac1bbfc5554ec7827d7c320e1cefb5d6e60"; + sha256 = "e51e4cf97b79b3720129ed9467b57d393a4ffd5698a9a941cd28feffa1d166fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/tr/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/tr/firefox-81.0b4.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e803849628fb4a07aac2b23d457a8d1f954d2270d989fdd167c82e4ff407dd23"; + sha256 = "9f0a494434bc3d78c43428bc535517b5d61743326fbdbf1836a84f353408a54e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/trs/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/trs/firefox-81.0b4.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "8aa74977fc2ae7e85150406541673b71b122f10a79762ae98787f9196d6e1ac9"; + sha256 = "24cadb7247a254595c29aebe60784d37061465f2c960a8d036096c6df71e4186"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/uk/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uk/firefox-81.0b4.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "7489d2f06cc74a759e6128a9e1ae19305ac8d81f026e8d16fce30dd8c23762de"; + sha256 = "6aa85e7119fd3ca00cd87d898eb93d954b1e58d01edf14106c41df98bdca4d99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/ur/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/ur/firefox-81.0b4.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "a0e924a25bdde879856fbf53fc0ca3972a3f701338079ef408694c0f87a13aa1"; + sha256 = "6b188379acb89178d08e827a60244c2298eae62434991d53378327c36829fa01"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/uz/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/uz/firefox-81.0b4.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "4603be13c80926a5de1a2fac56d433798c2e2415ac5e769a7d4893b3eae7ec86"; + sha256 = "782ced50737f68a9fa6db854cde83ef7bbc6f95776a44918248efcedd95230ec"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/vi/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/vi/firefox-81.0b4.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "1f9aef09fd0707121eb3335d60bf0b3b06554294594f45158cd41cd37f0beb07"; + sha256 = "37b600b306c901080f659955163b1696f5129e71bc3c5f65dc74d280ee6e3024"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/xh/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/xh/firefox-81.0b4.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "4c61f2ca3c4ecbc5b6a71edfa540400633d689c2cb042030c2291117443ade65"; + sha256 = "ebdfb9a50a5a7cad0508ade647ef3f81e18837d6b84212de6393a854bbfc652f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/zh-CN/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-CN/firefox-81.0b4.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "b24226ecd5946ea1320dd8ceabcf5402af96c7674c45d058b548aa212da1e1aa"; + sha256 = "fbc7b8952fa6d2d73b736abf4e60a10512eb983ea4588f7e746bff9512b953ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/80.0b8/linux-i686/zh-TW/firefox-80.0b8.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/81.0b4/linux-i686/zh-TW/firefox-81.0b4.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "9765b5e72e0e2bb22b080d6a9a050a52fe003771e172f4865948b0c8b0000ff4"; + sha256 = "5c29c56ef6480703ef9b6a2dc3cae8bc45b2fc01495ba099bd1ee28bbcdce55a"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 6f5b18bd56c..d86b9d6f987 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -45,7 +45,7 @@ , gnused , gnugrep , gnupg -, ffmpeg_3 +, ffmpeg , runtimeShell , mesa # firefox wants gbm for drm+dmabuf , systemLocale ? config.i18n.defaultLocale or "en-US" @@ -130,7 +130,7 @@ stdenv.mkDerivation { libpulseaudio (lib.getDev libpulseaudio) systemd - ffmpeg_3 + ffmpeg ] + ":" + stdenv.lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 618a6fc519d..e8e5109351e 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix @@ -1,965 +1,965 @@ { - version = "79.0"; + version = "80.0"; sources = [ - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ach/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ach/firefox-80.0.tar.bz2"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "25571c5d9aa4294f84d3e8aceb501efcadcc7d80dae799ee7246391782079885"; + sha256 = "4679b0ce4913b2c240f873fe5898234362d0b2cd6777e73ce272f37950edfd02"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/af/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/af/firefox-80.0.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "400edad1b17de72f33237d5c0fbe20dee9a2032aac41745339d62eaafd36b157"; + sha256 = "ae2f6e7d46344f56599ef1e7ba3f3321636ee378e8e1a4c0b8e652c5e71b932b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/an/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/an/firefox-80.0.tar.bz2"; locale = "an"; arch = "linux-x86_64"; - sha256 = "13971db840762cbe9b54c917c1cae459259df1bfc8783d0659accf539dc0bf05"; + sha256 = "8ae2ea7f6184f5f0cd5bc937924cfc5d813bb8bb0ea3e4e0770352b15291c043"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ar/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ar/firefox-80.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "7c8f5692e483667ccc173d9205ab5b5b77b4e4d50a5643f4ac531b1809a97d80"; + sha256 = "54926c7b61e4d99f1d49f709fad198604c5e5af165d60a96c6f5cb1a94f73884"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ast/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ast/firefox-80.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "50cc5928b1877be40e29f30b51cfd183d9196bf73f68234866eff9e0e50c2e36"; + sha256 = "589262534a8665387cbbb3c13f5003738bca4c5673884bda831a4858aa73de54"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/az/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/az/firefox-80.0.tar.bz2"; locale = "az"; arch = "linux-x86_64"; - sha256 = "6f8f0b486652ac7bb4e3808a02b123acbd4babd6b272c503c6fc14159278d492"; + sha256 = "60bfac6b93deff04f63c67dc9944d3df8efb314054ed6ee8f93d3b09db8608b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/be/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/be/firefox-80.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "f2dd77674d83b888e2016177eb80c7855a7fa26318ec052fbb919fd2abab6561"; + sha256 = "48cdbcb785f190dce708db6ca1fc711d5d2411da0f544b3a5d03aba6665efa1b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bg/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bg/firefox-80.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "08514f73d202ed1f53f0ef23de3093ac7eb08049fedf3bb09b69c98148efb99b"; + sha256 = "a48fbe5f88ec729c1becbf7c63957ee48cd7692d153dcf709dd038ce1a218317"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bn/firefox-80.0.tar.bz2"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "7f5114a60d966e2dedb95c1b65696bd3b04d25eb057b9a109d8bb0dc43b46f40"; + sha256 = "38245ddeeaa699941f54ba3d3d0fc3e804b57d4e8a6a0d1c58cf25d7c271a23c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/br/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/br/firefox-80.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "816dbbdd0f86874aad38733a30b54e683c7b18557c34d977ced6cd17ddf8b125"; + sha256 = "6766542a98977e6f2329b76345ab8f59d545479f1564261a47c0cb7b7db1e3d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/bs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/bs/firefox-80.0.tar.bz2"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "6c975f990120e9c70121eea464e9c375df40f6aa78275922d005096135044067"; + sha256 = "9bcd21931680502a9a5459f82a6d103d8b367b09cfa9048f54d87ca654e39e34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca-valencia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca-valencia/firefox-80.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "e993527db5fac86e5a503cb7615c073363d73c733837f7acc66b30d17b7a369d"; + sha256 = "a666b19726a6d10863cf351059dc45f610cd0356e2220a8d9e2a5bf2df0fde3a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ca/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ca/firefox-80.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "8ac5bfa08c2f082816c4f7bc45a0ebdadd04a078efcd172049899890ddcc3ffc"; + sha256 = "458e791ac8025a56a7a9444aeb8aa1138f5108c5a5cd1d87a31bbe71c6ed51ca"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cak/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cak/firefox-80.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "76680375d4f2ffb8f70414e2f934fe442e30d50c1921f7eb596f1325ee01a155"; + sha256 = "890f462890cdc825e138d174e396b78e10f74111d01da47514a8e449ee470676"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cs/firefox-80.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "99f83abcdc15839e879b7cced936fc3bb628d8b42f5381dad980d444d4fcfe1f"; + sha256 = "98e1bec6f176bc83da232b76b33e6dfe09db91c4be1424cf0c7b4e18e26b8d5e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/cy/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/cy/firefox-80.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "d81fee7d2b5b8177f1b28f4e4d05f4b266b876adcf5ed62a7d458465ca50bf42"; + sha256 = "06b649bc87eea5c81fa37873582a963d972cbc3d0a65fa9fcc12c67c107ccfbc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/da/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/da/firefox-80.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "40fdbaa88e3ac77d4cc846bf01b00ba1cdb5d3241f7af8a47efc92c929c862e1"; + sha256 = "98328f0f7ec2b807717fd4ae6aaeb7daaae8a962eb929b760598f225f6d9e784"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/de/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/de/firefox-80.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "6635eb71b5f4dc01ceed02771cc4e7bf7b3ba340c75f471fb7ecfde8170f838b"; + sha256 = "401877f41fd2bda02d0cbb7737f029f648e1d2b3c9642b093ef8bd4342f13712"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/dsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/dsb/firefox-80.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "afe56bea25e44fbd3cd1fff7411cc20473ed0212500304ed865a985c2565594c"; + sha256 = "408ae85999139ba5c027bbf9ca20157b991e741349aae77176c012b862a7b4ff"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/el/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/el/firefox-80.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b83801b722069d476bdb3325051f6e0bf2c34b6081320b82824aaf218d0f968a"; + sha256 = "430c1062e9edc9bc4a0a47268782cb7928214df074aec17e2e3a283b7bfa69d0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-CA/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-CA/firefox-80.0.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e5a1a6e755cf35287f455a36c2019157fc7a0de6296c0af5949f7d33c55c871b"; + sha256 = "7f8d97a5643c959eb09119264c8829c7b7227c01f8e035b17f3c21eee3d1e0c9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-GB/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-GB/firefox-80.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "709d89f99e96d76a77b0a1a40d7f2ef49d6709b41336973c114fc25fee2f1d49"; + sha256 = "d2361c90c46dc43eae25ff53440157322351645d6a20ed077e2496fbc3b955bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/en-US/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/en-US/firefox-80.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "d57ce2ec9d39d4f0e1100a2faf7cfdc827eeb45db672511d5a6aea7229430f85"; + sha256 = "84191f06dd927cd16b8c0900e6c330f68cc8012bc48e9277891282a2d6f7bce7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eo/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eo/firefox-80.0.tar.bz2"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "facef477b06aab7d67580c6931d97a26c5a7a9ae9555d92c7f31227d0e944dcd"; + sha256 = "8a9f5359cbb0d8a0d173d3302181ab41f463d8cf6b17f9c06e33432a95d79b0f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-AR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-AR/firefox-80.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "43449d930cfd29ff06a1f38b3a36cf7b2bb7aa4feef1a4509f60f1370f08539e"; + sha256 = "0f5e7d4a23daab7c96cf706fe1c5a62d9a244d39bf6be97325cfcc1d699936c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-CL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-CL/firefox-80.0.tar.bz2"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "fd821e8cf3c2f67f0993d08dc43026b1f5454a91102dc44706587d5744a63d1c"; + sha256 = "fd914b5892f2aa297054e79c6d6d863f1b4d88ab1a2bfae3d40192848c9efd64"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-ES/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-ES/firefox-80.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b1db4d75e75bd4329cc8ff4e637f920ebab47384442fae56584f170421a18657"; + sha256 = "b87aa07e99d0c8d3a17c76bc7e281f8309cda97565bbfa4dff653326fb2bbcb5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/es-MX/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/es-MX/firefox-80.0.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "b08ce5a33ada7d551b341693545ec7d9c30afc4529a3e33f55836a4e2bec1a41"; + sha256 = "ffb619b95658d5001a036e0906689f12520cc25d541c4b5b154e44e4b176da33"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/et/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/et/firefox-80.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "5fea2b490a7323cf9cec5e02fd148aab16c18a4bc107b1f267ca2b442eb2d53e"; + sha256 = "2558280c2fa85aa3a2fdfc59994de6a593ccbb6a7141e76c21e5318152b6e992"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/eu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/eu/firefox-80.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "98f89c8e3efcdc3585c6cd0cd6de6b5ab7ab7a55266328a2fd6198e1b739fd7f"; + sha256 = "0ad66a2dd10d1e5b0d44e6db28982d82430acb7cef6e465ad0c88fd7958606ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fa/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fa/firefox-80.0.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "874beed2e6b23f7edc7b51465a758243468e99e835951bb908336f16dc7baf0c"; + sha256 = "39b1bc086dd14ced01668961dac12a5408f5cc261188b2c32b6114dc70c67e4d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ff/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ff/firefox-80.0.tar.bz2"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "f84e37769376d2a05fd1d76903ff75c79e3631c2c7c5ceccdadde59de991aead"; + sha256 = "1511c50bd3ced8f570fe409ef609a6c9dc626d061156e5091e667b9314a5c4a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fi/firefox-80.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "8898a7ba0aefe3e26c4239c8b4d3768f716004b18da5ce5799ac5fb159b699b0"; + sha256 = "4d9e7fe4eaa94e4a2195589cdaf9f58c4b55339751001e87bd42a6326ee26787"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fr/firefox-80.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "3f6e7cd8ffa7bf343d28cd289ea14f88e4e0ccf7229ff122c118627ba909a400"; + sha256 = "99f293639744dd8e2615bc4d6290d2f5baeb9d646bc796d3bfac5de8a1c001f8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/fy-NL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/fy-NL/firefox-80.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "de4d6f8aa0564ff23eed16f2bb41486a62ed4fad935625eb1d26829aa281d71c"; + sha256 = "a8628d16e51d7355198415f086186c9874f37f9250e64512457aa725c8ba9f04"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ga-IE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ga-IE/firefox-80.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "48a595094b959f74455f568d872b3426bb6ad9be60df256d5cc1d5ac7cc688a2"; + sha256 = "df63d7991979e8fdf8f6911f8df2122d9995c50c089596bc0f7c0e7179326051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gd/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gd/firefox-80.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "8c64d89f708238affb2bc356a5f86b491d368f6b838371c62ed647291925e72a"; + sha256 = "616906a45df46004e081cba3cdadd2782c3d402619193f5d19142977b7ff0fcb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gl/firefox-80.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2d391f67f0f911112332a155436e5013ebb505620e5070d03b794949df2a4f36"; + sha256 = "bbff8f63ba3c029c97e5d40d3ecb41d757b5fccd59018dc81d7484f12c830686"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gn/firefox-80.0.tar.bz2"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "732951a35fc0ab79327a225ee02494eff4a17a8b5b348764f980610fcb1de6ef"; + sha256 = "62d7fbf8afb95d221df768fc190381a859e142a253b8df6b63ee276c4111077e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/gu-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/gu-IN/firefox-80.0.tar.bz2"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "0c3f65ab3736b43832feea9459a6fc336d0611c3221eba091c6194494eaf252c"; + sha256 = "3e451729a93e315c9ae767d21c5fe25c505e327ab435c5a9c4f606e04ca61051"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/he/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/he/firefox-80.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c62d4e52a2f308061fc6348531b708cfb26c0aee71a5f08f33b265af1789ea54"; + sha256 = "a48159e9c2798308ca4765f02ac90a0a2b05029ae0505ad59688d281fc06344f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hi-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hi-IN/firefox-80.0.tar.bz2"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "e83f4fa9cd50d2389697b78eb6591b7d1c1a6b4a61ae91b429909cb3cdbe1a99"; + sha256 = "39341543e9e8e2d5a377ead92287413df77d2f1c00a7362eb42d8e640b8f75ab"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hr/firefox-80.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "10ccf56a6f388a49ab6b5aa24ab3d82cf3ee685af5fd9592fec35055c1195d48"; + sha256 = "0067b77ff388004e0c60855868f1a45a282282b8c7360847b65ad2b53a558010"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hsb/firefox-80.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "771b5bba633c08861acc056cf0cbd73752f6109f601b8d59685dcad23804e3db"; + sha256 = "5c3a47a28a8e67f6a5be72540d9ae85474e093b1a67254949794918a8294ded6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hu/firefox-80.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "0f8631c95cc683d0c9faa5153cd3b499fa89374f6d8c2d0ef161074b03355d2b"; + sha256 = "2c6e390d9348d2d9c1f2adc30b73c451aa6fdd281dfc040fa79dc7365a5414f4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/hy-AM/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/hy-AM/firefox-80.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "e3f6989cf2716b455d5d962c88307a74cd57d57c8585f31a4007579534b168a3"; + sha256 = "ba3d7371aae296aa6417e3c5d2b4647c0d0d0cb4f20441be525f2dd2ad594125"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ia/firefox-80.0.tar.bz2"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "aa769627a633e32b8bab9dc1e0cb3e4030a9d6af36c66a6fd365520eb978a7a3"; + sha256 = "799ba99b5e5c9568d94c7ee7a3bc482eb6d827830ecdc8aef9a2e4d9b157634a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/id/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/id/firefox-80.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "179529666d1dce606758f7a7ee700e1823a7c4f5840195ed57a5eb48f2ce21ac"; + sha256 = "97f9f9194178918d8af8453b165aaede0a236e75b973a8ab0374a36ea4a8f8cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/is/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/is/firefox-80.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "53f5231e74ee28eef4ecf954ac850f1e6070fb7be51e7c8a0aa8477e0c9325e3"; + sha256 = "f63efcd86ece79d4a996c23e22a1876e3db25bfc09e5132e1832c309711d9012"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/it/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/it/firefox-80.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "410c0c6f119b70006a947ea34ed1462247f4cfda996cf9797423784c8833776f"; + sha256 = "c1d5fcbe8a3fba613e5da888f5252043663b7a1fb801da5cf54934af11ea5782"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ja/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ja/firefox-80.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "38f1f110e1490626908dad0e8f638453e70adc2afe66da5ae834a889e0ed13b4"; + sha256 = "75c5d37fdf2a488b0dbfb09c6bd020db90d699713350ca3c091d5e8096d41d18"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ka/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ka/firefox-80.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "bd38f5fe5707a0ca0aee0de7d1ec8afcc92fa0faa8661b724b876c0faf5bccf7"; + sha256 = "364b16782a4948e986268aca5e07dd92367120e97aa1d3bcfd5b78e58f58025c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kab/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kab/firefox-80.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "d7c748eeeb4d26433147b02d08b57f41be742b86480220d4fa7ae08823ae7984"; + sha256 = "20a5bfaf08f75040d1c627f79ff8cb133d0574c83cb13f8902367e88a3742bfc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kk/firefox-80.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "8e3f43b8551b9844aeccfb21390ae1ce59eb7acde612efa4d9eeb4bcfc81bf60"; + sha256 = "f61bce593069f598b8b8fc035b09607f423d5600df7cb620360fb1aaf4cce68a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/km/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/km/firefox-80.0.tar.bz2"; locale = "km"; arch = "linux-x86_64"; - sha256 = "44819213495492477fc7401b816f45b2a7d3d4e6b5b04b2b5dbb73380fc60ef0"; + sha256 = "7056f40cc5fc9d59145f4e08a4b19aad8e2b473beb4d8a7b09d636559bcd8457"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/kn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/kn/firefox-80.0.tar.bz2"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "89b97b079894174c2826e6106806d6bf9a46a3499e0e458a8219ba9f5ce6722e"; + sha256 = "c18b07bc5ee941f001e3ba9336d677f51b60dc08c2bf516b68882f647475b5b9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ko/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ko/firefox-80.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "731f9a98b4edfcf249fd08f94e8849a8f1c396ed577c0a1ed921b2d58863d029"; + sha256 = "7b58b30aa461119ef842ee886d06676fb5b00d05547e959bbaae4ab597cdcda6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lij/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lij/firefox-80.0.tar.bz2"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "a3325d7298d0cffc04757e3d4617725145ab5dcb11d359b029f92e70cfa47905"; + sha256 = "8107773361daf1257a1a77d853ae5baa1e9ff393d16118fb1987723f2a7af33b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lt/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lt/firefox-80.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "2071fa08893ca0b55181478c677669577c9011e8f4d39b499aaec939046e45e4"; + sha256 = "356a337cdb3ea658e6723897da2f8d99179ebfac01d071f641c661eea1da52c3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/lv/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/lv/firefox-80.0.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "b6639a338afa0fe86e0324d844740caa9260b26e3f06d075348999253f0a0bc7"; + sha256 = "10a9272101d4b37ac5949f2606317da5f41d205cfdc0967cacd9c72aba550cbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mk/firefox-80.0.tar.bz2"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "e06db923b89559735663c93b551f31e48cd12b86f5fc7fdf78e8db88fba48d59"; + sha256 = "45618096f39f0c6e28a900e2a5985fc1ce5c9fbcd6abeeb2d21fb4b5bc095876"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/mr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/mr/firefox-80.0.tar.bz2"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "dcd161187ddb20eaad0353c7ba0bf7d5d0149c8bc324151d41d013e5756a7e35"; + sha256 = "63d774fdd4f825780c7f667365a560b72dd1f31449d408553f8c51dfb6583dc4"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ms/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ms/firefox-80.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "d309a899fe69b3b17a33c43093ce78e1942b497e3e3db252a46968884bb9d737"; + sha256 = "fa67faa072b03b64132320a19691eadc719f8598167aa39f21d097b1e8fe42ce"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/my/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/my/firefox-80.0.tar.bz2"; locale = "my"; arch = "linux-x86_64"; - sha256 = "9f74bf01425741e1c08d5a637e20b3df7e5aefc0421da14eb3ecc8199a03a0d9"; + sha256 = "e40c7c534108dc7e9f978d3e6ea025e41b0e6120b9dd701a7935f90a7c4b834a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nb-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nb-NO/firefox-80.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "638a017eb9d5f7402565dd293c44b236460be99d718fa43cfa705a55eca949e3"; + sha256 = "99b52d2ecd2ce0154378630f80f3bb9371d0cb7c59d780e8abcbd47f7008a7c2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ne-NP/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ne-NP/firefox-80.0.tar.bz2"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "d7d0b87b0f3aa4c8cfe1d6a44b011c167b48e19384031a302d0e0eb5bf422951"; + sha256 = "49e9e67f879ecc519001ba500d136285c89a0fef3f7b8b1a693e8efd2af152cc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nl/firefox-80.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "88a6ed36cf8116634010f5a1ab27fb22f2519974ba10dd48deb2a6fbb2ac659e"; + sha256 = "ada875468cd865efa4023bfecc0cde06469fa3bf655944a2dfb945603d3ad483"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/nn-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/nn-NO/firefox-80.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "aa6475e941d6e2f724447a94c2000f9f8983d872a317d4ccb1df421128687564"; + sha256 = "b04996dccdb1a34ae41066a58090eb1be8fef2d458cf1aeb0297650123ffbce8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/oc/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/oc/firefox-80.0.tar.bz2"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "2535537159fd34b6680cb676d607e3810f78d2db2130e35c1086210c8fc40c0e"; + sha256 = "c6db46006f3bdaacd7a4ede17166e2bbcb4ef672d432363e86a819858327d867"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pa-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pa-IN/firefox-80.0.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "ddf3f2da7c31bf2b52e9dc4ad9f3d2b25c42e4c621594bb48a9213d2a18ea91a"; + sha256 = "a52fde04d6f25f6ff0641ade83dbb88f4d15aff689a041cad36352705fcb43ae"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pl/firefox-80.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "efb57f54e1cdf5a99b84856fa12d8591cc970d5850bab7595a5e804458b1f430"; + sha256 = "6918dd7bbde254eef27b740147d64550a1b4203979fedec6f9064006300e4638"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-BR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-BR/firefox-80.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "704d84a395b6d24b33723121785cc17d36ffb95eec1c550895f61277add01cba"; + sha256 = "21bd4c8b68c7154889f4d06cec9eb3696dde94e2ec2b946f25a627ade2b16a7b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/pt-PT/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/pt-PT/firefox-80.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "c8f67765c2bd151c68a973135ad67c46287aa11bd8055b1ee084e7c18bdc7a38"; + sha256 = "b30ab69cacd27d7a60a0387caea18712cfd4f4e2dd45f7bb51e3074e46dc3f05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/rm/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/rm/firefox-80.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "5fe367fc5338a867cf16322fd4cfb55899275825a6aababbcc95be1f2df54a79"; + sha256 = "9fdba8959e1276684bdd53c2c3d02e80768f3e9a289bccacf5a719f5ce51efbb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ro/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ro/firefox-80.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "f22ce12f453e7c08a1fa1277f80a24038a2906d556c5d96fd6c331b185f38bcb"; + sha256 = "e31d0a914b107736fb83e686c5c011b912b7a5b04fb394b7e769c40ab249b504"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ru/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ru/firefox-80.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "057a5c87914e98c056a2213c348bbe72be46cad8566d7cdb0f68370b19f4b313"; + sha256 = "3b26ecd7fd38e224625def5087fe5e6ff1aa408e3a04a06e160e688402026113"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/si/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/si/firefox-80.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "9b97d6588b9f304e090dd5c0258f0209fc7229ccf7ce21d6fb0d6da1f829dd38"; + sha256 = "bb37483590bfe23951063e15626724a665cb03de6ce2916992ebad88759f2691"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sk/firefox-80.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "621fb92cccbf325edf25ea274e90fe9533a0ce5fdb1e0bd9f266b4a1f3a47ffa"; + sha256 = "60be0fae9156d425708360e233a39e8b1d2be45216d8a155d06f020fb5808cd9"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sl/firefox-80.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "f840e911bebf98a7917f15421fcd8feaeb72097659bd3fb0f3d1fcd2e348ec75"; + sha256 = "d1261f9dc8091df947df5e64b5123d8d4b39bf15ba6dbe5fc4844bce9f3be220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/son/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/son/firefox-80.0.tar.bz2"; locale = "son"; arch = "linux-x86_64"; - sha256 = "9b834f1895db63a263d3f2ce2567095b8000ad39d0753020f69a704dac7d12f7"; + sha256 = "76ae5c6f4890d5c29ee33ffd81923696f755e6fe0fa8081c75e72ed1599e5070"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sq/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sq/firefox-80.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "7136196b26f6e9b963d86e1cd9a088f9d2a7751e08193a59dd27c00b08da4d4f"; + sha256 = "5aa679e980bd0808b0c924e4ad11bb6b3256afd031cb04f16f862eb9bfd4644d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sr/firefox-80.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "6cd5ce0c122a3b9cb6c066ab8df57277bec7d78e4fab9f15ef88c7ca16a6a3e1"; + sha256 = "a4941d40721de72abf22b97846cc16de49670d7f096829aa0d1775089734d36e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/sv-SE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/sv-SE/firefox-80.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "ed0104efacbe6c4054b5d6a2c4397c13db38d245bd557dfe8ed876334bb232a1"; + sha256 = "c50a2d0bb15cc95982e3d2997719a65eba6e0099ffb13b066e66e5aa951375fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ta/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ta/firefox-80.0.tar.bz2"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "4589d31f7ba58e6f149ddf64f6020b262cfa9a7b8c228ddbad5ac9032013bb74"; + sha256 = "53651d5b0ea3d36c6600c57f02c27202f2f5b938aef34de4164f325ef46d8666"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/te/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/te/firefox-80.0.tar.bz2"; locale = "te"; arch = "linux-x86_64"; - sha256 = "3bae0a5ae9735ba623b8f3b4f333169f4f99fc37c43ee29e65221aae21060d9e"; + sha256 = "5225d57d4a5c83843ecc83735be2fbb4004d4411da5ea72340cd6306078fc426"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/th/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/th/firefox-80.0.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "eac036a449108ee78cf3d527a85abcb87b0c116d78e71d7a0274f326ebcf1218"; + sha256 = "b38092aef16253b180dfe0d297ee1bb8417dbb4851466625b80858a18b2d3801"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tl/firefox-80.0.tar.bz2"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f8c9053e62b80b7ad1f20e622c25d01b8926c89b8780f1ae642d922d293d5018"; + sha256 = "5ac9aa87ad90d60a852f7cbfc611c05eeef09b2aba46da80a2ddb093ce5f1730"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/tr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/tr/firefox-80.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "8c6d089c9b0a1acdddbaf01d44b274da4a7d01751239dd017add9c7a0867dd38"; + sha256 = "b2a6aa22523f9d3396675c60ca7590e9c379a15c445727f01c3ada090a0557fa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/trs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/trs/firefox-80.0.tar.bz2"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "086b1b43a42f3c1487ead061b822b94274dd58b927df5b481f8079b960b52dc3"; + sha256 = "0e3e21f8c76bba90e730959e3f176c5b4406196a4b9f00aa4d85088495eeb337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uk/firefox-80.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e3ee4bf352916f57bece093a079ef58f68a1d3c60d39e02ac7ba9587b98b6cf9"; + sha256 = "626f9af6252a003cf869067de439197d8b0dd0b73e654310f439579959036f5b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/ur/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/ur/firefox-80.0.tar.bz2"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "7e485392f74814c874c2efd153add419a110c790514f4fef4bad0a4c5043751f"; + sha256 = "67e1108697c033ba3c6bcce7e36e5ab269f66a75674795e931aeeefadd7e949f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/uz/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/uz/firefox-80.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a9f0e8e1a776d1155c609bce03380ecad60c2259a05248ddabb65a6c2f8080f"; + sha256 = "90e6d82c75ee24925cc6fdb48674e7ace3e58fd2cf27441d8ba9b24002b03a03"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/vi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/vi/firefox-80.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a50f5c651093bb205f5cf7d1c44c12994d0aa73cf3a3cf1dea22e3754c6943e0"; + sha256 = "dff1e18e968d514b91d4f3c419da0570478e1667485761be703349b5c6019124"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/xh/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/xh/firefox-80.0.tar.bz2"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "a94a46b428a87a3cd543dfcdbef46708931e18b377c548b11ca565067c953ebb"; + sha256 = "1d524f5c5e6003c4cb1e00676ab5c369752c80c763684d7550224c7bdc66ca68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-CN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-CN/firefox-80.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "911e0b9591dea07aab26e4e35e84645d79c132fcfcabe504ff242ac87d853834"; + sha256 = "8893528da90e46d8eb287ab857ee6e18d89355d7901e221c7820d7f1bdfc155f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-x86_64/zh-TW/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-x86_64/zh-TW/firefox-80.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "58afd8192b08eb343da9385344b87ad0e72046cdda26495a5534a75f12d40d38"; + sha256 = "8b01036a6c807e22f66ccd93fa335e3fe71476e7a9993965172b85d2eada27ea"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ach/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ach/firefox-80.0.tar.bz2"; locale = "ach"; arch = "linux-i686"; - sha256 = "055e0f66d0e5e3c9f3bc7ae94f6bd46a8ab0bb87dcefc2cace02f4ebbbabbf33"; + sha256 = "1bb95b52770a8cad2b339874ac4576e190790935dfbfccf22cfa8be41e3b7e5a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/af/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/af/firefox-80.0.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "0705f3f63655b6b55604d9b2b801ea07bacf2f0060ce6a2ca6c1d6021c35a594"; + sha256 = "919522f2c9d8f0b3c7f7c7d4311735e68eee173883c80f4d168625b690d0f29c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/an/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/an/firefox-80.0.tar.bz2"; locale = "an"; arch = "linux-i686"; - sha256 = "f1735cdcb500df69cf66886f194d101393f8e5880b790fc135348e6515fc7ba5"; + sha256 = "878eba95507de8dc1788e01facd9710e39cb62d75229d6204601c58ea0df4cf5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ar/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ar/firefox-80.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "97dc4e314f361d7afc3e77d13d712f45306af21e4ef2e5737409b9932b341f92"; + sha256 = "4bfc935eb7a94eb6cb957b118c4811cbc0d1265a9fbcd4b4ecd3aea593658af1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ast/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ast/firefox-80.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "2cb19f22bc6372d4b3406d87b19acc4ec61cf60317869392145b7405a820b7ea"; + sha256 = "c64157e1ef1c361cf1dff89ed443f9b7fceab088c3bdac4058e262a1c068c97d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/az/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/az/firefox-80.0.tar.bz2"; locale = "az"; arch = "linux-i686"; - sha256 = "83fe4b78ca684c9a58702451e4f8bbc9ee4a67aeb066d74699f7e3d471e0a16c"; + sha256 = "6045ef88f6cda1ac9b87854c7ac0dbfe789f9a4b4f7d35f9612beff57d832b60"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/be/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/be/firefox-80.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "f08a685b2b99d3f508487215e426af802097599752ab82dfbd801c063588194a"; + sha256 = "6c0e25a6610a0da75f086a829a142f1b7f419e1357d7c97efaba4f1a9c95b5d2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bg/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bg/firefox-80.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "a5d3c78d91e813358e7b1c33c10854f43112398ee88310c078aa0b5db00b7518"; + sha256 = "1c8579439940499262e8e2096f16bd6767441b72a00774a35d76db9463fdaf34"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bn/firefox-80.0.tar.bz2"; locale = "bn"; arch = "linux-i686"; - sha256 = "eab386c0bc37dbe0ab2c8b51a470bc9f65a8f59ad17223d95fe631507da8fefa"; + sha256 = "06eaec1ac31a6c2dc21eaa871aa2dd4f45a299458d5cc950c2d52454366ba1b3"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/br/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/br/firefox-80.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "125e5bfe77bac8d9155b07d057e3e8e8de3c3b4bb3aa3de192f2ae55ab9f4e33"; + sha256 = "3f8a1a9204ba24d2367f6ad995343eccdb48c981d726ed72e6f96b3579bb504f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/bs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/bs/firefox-80.0.tar.bz2"; locale = "bs"; arch = "linux-i686"; - sha256 = "6d9fafc803b098e8fe93911e9d07baa28765dff6b072aa911f74b2076cef54f3"; + sha256 = "61da2d6bb7dc90615949b10ab45ac56d38ccd4007ab6f0ff730454994d303f6c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca-valencia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca-valencia/firefox-80.0.tar.bz2"; locale = "ca-valencia"; arch = "linux-i686"; - sha256 = "91d71b2538e059c9aed1d7a564125c25bca6f6c8213eb247aea7357b1f27b9a3"; + sha256 = "15ea7d6e7eee13f2100111b8c9fd10cba728acdc27575ad0160b5baa5c5ba0f1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ca/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ca/firefox-80.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "5088cc39fd0b18926e6821348373f834a8b5d093ccaf9152cfc8da3157522734"; + sha256 = "140c3b74f0edd7ad47c07dfd5cff6fd224048560ccc691467a00d3c67cc1505e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cak/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cak/firefox-80.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "31c9be88e0263e0968fa2ebba0673234532d6a99d5cf97ab7b863b814d9d140e"; + sha256 = "614876abaaddbca2dd2c56eae7b865828fa446c07bc5401f7bfca7637edb2728"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cs/firefox-80.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "a606452009ca9e9e7d5f44fc9b42a222e3f557ac4d338c90ab9335dbd96e6683"; + sha256 = "2dafa0635a3192a9049d7804f97beaccf6e62a8613e96ba241dff1728aef840f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/cy/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/cy/firefox-80.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "a8254adacb701007945e4cbb48d861358cfefd4f590e509264ecdd4e0e858235"; + sha256 = "1993cd996e6027b4dbc0e306ab8c09772e0013bdbdd2dc9c774a702555b2f21e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/da/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/da/firefox-80.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "350ce9d092799302a8c3830fc756c7ddacc752f9b42e70bd73dc1d61a1d1d07b"; + sha256 = "8fb1663ba5f646cf65593fe6eb57a63f750b555f6c75fad7f4a9d3592bb46421"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/de/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/de/firefox-80.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "576c95fc5aadbaeba43991b2fb28e13cd3f18f2e81e6584a0208328a4f9c5ca6"; + sha256 = "9536de23132d6267f3535e08194679ec16afbcf1c3cf6beaec64cff7de38d701"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/dsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/dsb/firefox-80.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "024054a027af7a4e8f68a299ae24a47eaa2ab2e69a847cfaa053295cd454b947"; + sha256 = "277cd59ab97d33a89e621ca3819fea2cc58042cc373891fd4599cdbddbf483ef"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/el/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/el/firefox-80.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "63ff8a79ec70c7ce44d8375e5ee377754e329f32ad751b87de214707984eba7f"; + sha256 = "609c2e25ab34f793a85e60ff9fec4d4281bdd228026ef698fda1b25e956142ed"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-CA/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-CA/firefox-80.0.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "eb8597936d2a3a2747827227082743a5b267ee12b45f16e901ab87ad897ae780"; + sha256 = "ca54e8fd35633530605149ca7aba49099098f96e880dd0629885e6c867c3d632"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-GB/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-GB/firefox-80.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "8a1b4c0320439cd3ac22b46fc111564b7ed68ba9f04c7b20a276ac550ebd84e6"; + sha256 = "6a6e6b1b34fbaa578a035e430d10fd2911bf64e1917b170cd47ab565ddf9bdbd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/en-US/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/en-US/firefox-80.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "d56bc3d81f7e1807852b326d3f0b00f9e745fe4f8b97c0ffc64aee979db4fa15"; + sha256 = "d87d71827f0161f7d3230217fc4f7c7bdca804ccc5f49b4d107151fbcdd7622b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eo/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eo/firefox-80.0.tar.bz2"; locale = "eo"; arch = "linux-i686"; - sha256 = "cd979e28dbf2032ed8f1e5c7c84eda3ddefdef4223749b6fd61ef2f727401a4e"; + sha256 = "50f158c96b8de9b789dbc138004646ae583b900fb067b59108ee4ad97e0cd2e1"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-AR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-AR/firefox-80.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "4875b4139be6ddcf1e7bff57c3045f29e7730a7bd0e38fffa0443bd0f3aa45a4"; + sha256 = "e5589a3a92ce6ee1b5756beb4cd6903e1526d74d457bf3fffd8b9072ded3c5a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-CL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-CL/firefox-80.0.tar.bz2"; locale = "es-CL"; arch = "linux-i686"; - sha256 = "68bf54d52e45e0b8e0cfd27ec39e3ff97307e91bcede2f2d2561ac5139d179b8"; + sha256 = "3188fad7ee67a0c98b370ac32a50136c41f69154f99fda13804d16356679a87f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-ES/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-ES/firefox-80.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "e324772591d019b5b27a00716c30ed0f8803dee83276b19b43f5808f584d5000"; + sha256 = "c9f37fa0ab8e4d3c16cbc20ae9ce0f0a568a9cc2c48fbcfa114b1ab2b9b462a7"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/es-MX/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/es-MX/firefox-80.0.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "bf40f1eec6d42c5706a2ae0f840ec00778801d98476dd6055a7170e8ebe8033a"; + sha256 = "f07ee3d9317157e5205187bffddb0339fb810ff06aeb192d12e367acdfe89592"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/et/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/et/firefox-80.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "d0f45fa9c2e9559efe0376a53d1bfc7fed04a408d563419e283a0e1a4b4f0840"; + sha256 = "01aa2da0ec5504f601e774fb9a35e0b8bcaf59fee1cf8fe33a5d29c05fa75d68"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/eu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/eu/firefox-80.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "def48b817fcd432a3573a1d17bbc4dc8616e8b94366836406cf6341d610ba3aa"; + sha256 = "6d3f10b801660064e8f51fa45bc17bf1fec641cbb526e1da925b8eb71b863112"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fa/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fa/firefox-80.0.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "08e4e0c50bb80aba30c2f3666cf568c39bd031938a1e2a6b9fd092da688e3b4f"; + sha256 = "0f519bd6d2e8d1e01ef3f6af13937a84fe4c551b56a6c438d01f2b7818c0c440"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ff/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ff/firefox-80.0.tar.bz2"; locale = "ff"; arch = "linux-i686"; - sha256 = "3e9e75e5501d2a5d1d1d11e628d6b9acbd613f3a0f7aed005752f4d07f15686d"; + sha256 = "f72bf80190d3bf1a4b81aa06f6f0a7ea25267302747ead42a505461d4cd63e35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fi/firefox-80.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "61e0d7ee1d4b0d8dfbea3869766497d88dcbf0c467d41d07ea45309d03839a49"; + sha256 = "44aef7c10ed8815634d62bb60b7d5412901dd016ef7439b28a84219546b702b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fr/firefox-80.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "9c502d317ae781e82a69a80c864958ea23eeed18b215b9f08a7ecc024bcc6249"; + sha256 = "a347e36231516c410e756e55fa8e03c660635a70c8315ec14e9b2c68deae9db8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/fy-NL/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/fy-NL/firefox-80.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "05ed05024ebdb58eb2c178c30da5d0f013299ffbf42c26b7e28c0bd1053106f5"; + sha256 = "d53d4fad373b633e287db03675f89279e44b80c28ab50c238a05b286abb916b6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ga-IE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ga-IE/firefox-80.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "101f512b07c22c24d55fab970b1d5140f6f7a54d470652511e8d053d5d3ba265"; + sha256 = "279f93b6e57dbaa443df2221217e4ef60be015c0a4e6fad8806e97f46f074f9e"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gd/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gd/firefox-80.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "2a7998045852b8f3bcc86aecf40b5582724da71eb14d1fa612184dacdc751fcc"; + sha256 = "b3c89bb8b8e4f9bae3686e601de8ad7c065940f8852d63a8e503095b0674e931"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gl/firefox-80.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "0aa2c2ca4cdffedc5d17e4223c2cc6e96ce89bc69989ae10be683bcd61f4a143"; + sha256 = "cc9687f4d35a62ba0be5c362bf0d55ed1acdc4d1b4e0284cc4db04553c36786b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gn/firefox-80.0.tar.bz2"; locale = "gn"; arch = "linux-i686"; - sha256 = "4e9f93db434ef45712c11ef5e3e812dba5927183d73da81db3b9698f35c51585"; + sha256 = "c3d4cec222d099bd2a9f66c543c97d1c18c0abfa087c19fac3da08579c60d103"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/gu-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/gu-IN/firefox-80.0.tar.bz2"; locale = "gu-IN"; arch = "linux-i686"; - sha256 = "f2c3cbef250bfdac654ec2eaf438f51c059521b6a0d1694427013b949a323cdd"; + sha256 = "7af5a56a90bd0eadf93ffeb2b61f08232996b560588fa52d55ffe3023e08b3e8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/he/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/he/firefox-80.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "3b4d9dc608998b2d76db3ab2f21826983a12284bffa22e76ec60a275c5a54f97"; + sha256 = "65222595c4df12375837f0994f9fe23a3a8f96fde8ec0d7be980ab16ea19bc71"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hi-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hi-IN/firefox-80.0.tar.bz2"; locale = "hi-IN"; arch = "linux-i686"; - sha256 = "840ff442beb5c0599f7c67a00adf840a8f4306f2bc6ac8f2397af0b876304741"; + sha256 = "ee52e1eaca1e61c5ee1cfd5e86fc0afed242f9162f36027f57052162b88b2500"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hr/firefox-80.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "e0098a3069cb9b86becd2f77a671731bd849a568d2fffb6064528f802e5cd6c6"; + sha256 = "ae9936bd5b55e92250d73859b1d78505fcc3d3312d0772591720012ea820c367"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hsb/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hsb/firefox-80.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "8322028ef47168ecc2928284e0a96d36c9208dfa2a7f3eae6f7449fb77753e62"; + sha256 = "55e837eb12417899dbcab8d15f3c8e3604f7a071339b1f2ee608801ad7fe7912"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hu/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hu/firefox-80.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "801b62419499f9ae9fa48848aafdad7258cc95f7b04b1ade6d3cbf6663a6b3dc"; + sha256 = "710a5e73c34cdc1b7a77e8465724b0e99c4084effb015c3dd71e3fc2f678149c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/hy-AM/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/hy-AM/firefox-80.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7b4af441958fbffbf43b7e1ff8e97d62dfd3aef2076bcdf1fb1eda8006093721"; + sha256 = "7e40874e151c69145db6a812d7050de5ea65b8939a394cbc468c3492abd189fe"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ia/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ia/firefox-80.0.tar.bz2"; locale = "ia"; arch = "linux-i686"; - sha256 = "ee2bf28f2cb18a5cdeb51420042d624c40bbaea73e4c567eb801273f0c4c8095"; + sha256 = "5c6083dd765489f378b6855713e601d50ff84acf95674b8d3b873b29981dda99"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/id/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/id/firefox-80.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "1083dbcab9b2b297869ef7a4a65ee04b63e851805e7fe7f7977fbe6d2f69828c"; + sha256 = "b8cf9a69b6b52f816e355399e2bf6c1742f56d7d631dbee78a687a1cde9312dc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/is/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/is/firefox-80.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "c2c475e280f3f52a134182ac6dc679273c29198605d9214f4ceeb09e57f2cdf5"; + sha256 = "532793a2e2d761ba36a3bdaa0a257e8828b5516193c4cf1f1ec1735efa510e6f"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/it/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/it/firefox-80.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "d7de926e398e6291e031f737da63fe223c7e4c70c01994bf74c8461e04af0840"; + sha256 = "a5309e5f3c387990ba1aa255684ec73f2e38dca0aa873f998effb7dd7b13e0a0"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ja/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ja/firefox-80.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "a5f1c6bd8bd5aba351511838c04a35f26aa107ca43d87489ae24bac3831df165"; + sha256 = "f9dc927612114a5c8d9a4e0ee311356a0e5e819729f4ebd08ee5f03dcda52afd"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ka/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ka/firefox-80.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "513c9c885f741162301a980daf84eff5aa42f45aaf766a9b3e1376fea83bb78a"; + sha256 = "37b82df19bd4897bc2c29eb3f5f94d107b6b97eeb5a1b3ff5ddcaf641dd0fb19"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kab/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kab/firefox-80.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "15fd46b89f7ea425121d02aef931bbaf624391e7039d81e646d6551303598579"; + sha256 = "1ef2b402c518da26838c2c3e0d5c47fa8f3c5d74cb2f9a95999814476d3bc629"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kk/firefox-80.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "82a29718fdff57e6d02f8cc6ae76bb604d0e14374e7881c120ff6e38c4b21995"; + sha256 = "d152f45918a163fccc9eec97f5543d8c206a3e9ac130de58260943e6aebb19a8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/km/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/km/firefox-80.0.tar.bz2"; locale = "km"; arch = "linux-i686"; - sha256 = "406c361b49d9e5cb6eb952e5be0eea3a8b9ff535a3edb6dc1c60ec6171d5ae49"; + sha256 = "2d9639684b0115f9db6eb73379e1d7b24670db83afd2e7d2bed2a7c62188f54c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/kn/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/kn/firefox-80.0.tar.bz2"; locale = "kn"; arch = "linux-i686"; - sha256 = "0839a7af990a70523355047e5cfd24e73d0c8816cd12f2a21aa8cc244d9ef90c"; + sha256 = "224e41e1c33e60f1de88fe8243742675e0813b7041f1bac3a9a29528c618df3b"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ko/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ko/firefox-80.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "2ed856441ea51d642027b800911f134c27207dd8a53ee5a27b9674eb11417b05"; + sha256 = "16372732d44159e017875ee9d3bdbc5443bfb1eb577d62e8b28a05560caa2650"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lij/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lij/firefox-80.0.tar.bz2"; locale = "lij"; arch = "linux-i686"; - sha256 = "653c7c4be39dfc49f89e5e6c591ebc953ef0bff5a9d827d348dad26e3f06bcd8"; + sha256 = "a796e32ed17c08499fc2e459a1bf753c7578f5555e0a7eb62757b4c5d4f6b735"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lt/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lt/firefox-80.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "b61fe55f65029ab661d0b589cc5301c6131b778d55524de6b13779dd2d0d6c35"; + sha256 = "6687e81d9be17a992e34fbbc9f44edb86be75e1329292122e7978211d4c0b43a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/lv/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/lv/firefox-80.0.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "2f9a99d7a344984736cb422ccc106db8d175f31c1b1a108852494b7201ff67cc"; + sha256 = "7c4beca6385caaf9e05eb6f6cf508f51d559094cff3eb60e28d562ec7404d804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mk/firefox-80.0.tar.bz2"; locale = "mk"; arch = "linux-i686"; - sha256 = "0cdde250523fbdbb8b651660fccbe1afe65068c263e03fe7ce26d9758fba7bba"; + sha256 = "d8da49d2b43467ef4b29f55a15f71125ceb8388a55ded93ccd90e7d484d84feb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/mr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/mr/firefox-80.0.tar.bz2"; locale = "mr"; arch = "linux-i686"; - sha256 = "0df4e48be06d800d1fa308841a1890f7b1c87e63b34901cdd1481a63a7080d24"; + sha256 = "304c8f8caf6ebdd5d928135f7fb94d490658e0fb6b7b73e2f1618b7b07234de2"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ms/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ms/firefox-80.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "3fc1dcbe6c72acbee7a68ebf6a8b08b9961a5a04eb05f0cac86ac8fc56953917"; + sha256 = "a4cea6625395d522ab3d4000f6774ba5898a1f740c9b70b23f71f52e1231404d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/my/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/my/firefox-80.0.tar.bz2"; locale = "my"; arch = "linux-i686"; - sha256 = "aba83f9c9f41dc5660a480b6821dff2c405900d9370c3d1414a892ad0e44161a"; + sha256 = "1bbb703f65bc5d41174800ec789066d99ca10430605dfb2975b6d788b41c1220"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nb-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nb-NO/firefox-80.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "34e9cfa0bd9a065b58edeffffff690abb6240e90f1d788146ac3976d9e7d9cc7"; + sha256 = "95592600fbb71a6346fa42f8647460fed047af96f38754a3322eef9bec7a22aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ne-NP/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ne-NP/firefox-80.0.tar.bz2"; locale = "ne-NP"; arch = "linux-i686"; - sha256 = "8031d15b84eb3baa73064ba592434d4d36ae94c6bb3b7c9fa359f93486be3ea8"; + sha256 = "f902008b0c6390265e11209e573555b0854b0d0c879eb5c2637f18ce981223fc"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nl/firefox-80.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "33f19d81143a26b7472b70558c2187a4ed39f67ba95e28332c7e8a8699aa33e9"; + sha256 = "9ef3bbe6b6975b50013a951559f6beaa34ddd5b183ccb33500c585e3c094fc05"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/nn-NO/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/nn-NO/firefox-80.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ca27dd578f8054df63b77c314d3504a2277139cc2d54d43f8c202771ad12e76c"; + sha256 = "783427d27ef6be2bac3a219f72d61a6cc8b6105ec01c94476b06187d83fada90"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/oc/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/oc/firefox-80.0.tar.bz2"; locale = "oc"; arch = "linux-i686"; - sha256 = "336cfde595de21f8ee355ec4e6a240da8a8946f357a100629ab0d0d883bee335"; + sha256 = "f5a6af6e4d2bee9ea6c8e27edfe593640f0410766eec4a029c7b6641731cca58"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pa-IN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pa-IN/firefox-80.0.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "bb51ced0f4993862a7d025b1b504e29fb96e6341336c3fc61ffc6d3ffc18d884"; + sha256 = "8d45fd730fcbf898062231356d11892eda44a2dc124444fc0623de363a807a73"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pl/firefox-80.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "c44b50bc19b0ba7cb198d144f05b10d5f453c110463dd945534ccd180b71c7d1"; + sha256 = "9c89d3be668a295ef53d1dba84d1b9db230956d5700de6a86a6c8b0dffce5781"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-BR/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-BR/firefox-80.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6cda521f9c8a02c948dd1461fafff84e7e1b793815b6f25697a78751264dc689"; + sha256 = "8c591df0daa36ce3fd8380d34609cd1e1d26c8116db5bbe22828820c1f7f84aa"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/pt-PT/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/pt-PT/firefox-80.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "56e5ced26db5466aebcd7108dc3f499b243631bf61505a1fffb92b2eeb2cb5cc"; + sha256 = "e3ea46565734355a779e5b4b083c14e2f13d14f78f7347c36306fce57f4beb16"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/rm/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/rm/firefox-80.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "47913299e22f8b955bd5307241d368cb3c29d6a0bb0d90d5ed7667b85b6aa0e3"; + sha256 = "c2355ccb07cd804aae65b31270e51d2d0a1ea438db44ab75c22aa57cb1bec71a"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ro/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ro/firefox-80.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "528c36c4361f42a3d90f076800b0b73c8c1d630ae97ba33ff59e72d30d203cab"; + sha256 = "e7b729a18283dabd9f295a436e97c3bd42eb6666e77c42ef1b967598d6e0ae37"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ru/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ru/firefox-80.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "ff1a33da0bd8bb7c2d7f460724c292b7433087ba5596258cc4bbbac2087d81b7"; + sha256 = "d9b2a3449ca0ed738db8bbd3f316a4973fa318c4abdb63aced9832419b579229"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/si/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/si/firefox-80.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "675d6238f6bcf07751ec5356f3f4824d681ef28ac26255e1bae84cdab23ac0a7"; + sha256 = "8a43a0b25befbb5f0a9477086ae85d58b1d4c448e06630d1c0ece950d24bb6a5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sk/firefox-80.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "141416a2320bf355cf9f3ca33ec3983b5089c5b2c9172cf03e00d21577b570c9"; + sha256 = "40a4e4b307ebea63a13e8073536c1d039ee400b4eff109a4ed086c5f073c12bf"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sl/firefox-80.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "6d062305ad9e40add4f8c84d051647df8c6b3e083011e00d9380f3e2eb6f128b"; + sha256 = "19b163d77a8480099cc356f84c00d51c62cf97095ed2a3f2a16a654abcc0d413"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/son/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/son/firefox-80.0.tar.bz2"; locale = "son"; arch = "linux-i686"; - sha256 = "2e2adcfe7f26adac4aa820acbe894fa567f53faf2854eca3febf2d7fb66c97ee"; + sha256 = "0c9b0546846cde59fc550f2a94abb8e909f1955ff5790aacd3bfdf63a668a1d8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sq/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sq/firefox-80.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "eeddc2cb86011cbec49ace8c954ae9724ebb9a800cacd4354cfbee782ce7e481"; + sha256 = "b153afd0d8efcb4563bf46df1f8d20408e179ecd94a4e294683eb5caa0141228"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sr/firefox-80.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "88081a8c78e039aca0774b1ad61eb3508b9d4bf088cfd27e6b420431dcc6b95a"; + sha256 = "36a3dbe8a9fec700ab91134344db6d70dfe96d53bfcf366ac83b29ba7f405a35"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/sv-SE/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/sv-SE/firefox-80.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "51096fc91f7bd36b6bf66c57eb870cfbc62c42880ef2b7d3ae8032c49b5dc07d"; + sha256 = "708b43a83fc88ddec15a87a0f753690048dcb7500aee2a52c59c28912de5f401"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ta/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ta/firefox-80.0.tar.bz2"; locale = "ta"; arch = "linux-i686"; - sha256 = "06f1af1fff1eff74d3aee7a7bffc7485911d350daf216bc8a3f6462b85ab28e7"; + sha256 = "e552b1ff45f4b904a7b76af41f44e9e349cf08f20981f44b95d7e89f727d3c12"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/te/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/te/firefox-80.0.tar.bz2"; locale = "te"; arch = "linux-i686"; - sha256 = "5921702973c5c808f396fad81e736ffe7b9948996997cde5f721e55a6b0c172b"; + sha256 = "5ea5d027d0b6aacec730a865d8c70e8929c858b26a3ca0f798bb3a405e438aa6"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/th/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/th/firefox-80.0.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "5e8ff4f8b3204ed67545c4c68cc225ef7e28ce9c63108efdfb1ced7c77e2ce6e"; + sha256 = "32e0e810308c3fdb52b247d086193f0dbf1184ee2f6ac42c2a25766f158ed79c"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tl/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tl/firefox-80.0.tar.bz2"; locale = "tl"; arch = "linux-i686"; - sha256 = "72b9a9cef7a4d166e9d33e0a89d00a1c270d1e6b4e5039356f6145bab0d8f6a0"; + sha256 = "d64ff747faf81f626ff91c18f72f786669f48ca84f55df58a25ffeadc1683325"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/tr/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/tr/firefox-80.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "38cc4e45e3222633b7f85c59eb1fc8a993f4b77ffe9b50478ae894fb68f67304"; + sha256 = "22cfc8b33829476e0a058900f5a606020b249225e15c3a78a5baa314ea39a5eb"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/trs/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/trs/firefox-80.0.tar.bz2"; locale = "trs"; arch = "linux-i686"; - sha256 = "f82d215f8a1a9b5b07ab71cadf75ef007e57b987d025c14fa671305dc5087182"; + sha256 = "a7db4c7fc442156414d658b04cb531fe5b4f4ac7b46e3a62229bb7528b40a43d"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uk/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uk/firefox-80.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "014d024f4d14f465393f096147b661919dc1793289e68c4d13b6b01dba42d4d7"; + sha256 = "072b4d82b5a8c14764f3664ea5fd436aa616984e044e078002ef6c4ab3f5a804"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/ur/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/ur/firefox-80.0.tar.bz2"; locale = "ur"; arch = "linux-i686"; - sha256 = "c2b7382f1e511dd7c79b3d5854059c403f633ec4423ec31dd9395d6dca4d31ee"; + sha256 = "c52f5cb761b5d8f7c6c3646c3fc2a5c4580d5dcaa0d8757f3f37b990a1b61191"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/uz/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/uz/firefox-80.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "66e35eb3fe6aef2a3d4986a585072f96b55877b0a15ce81c41096e1f1c001f2a"; + sha256 = "4bc2ca5751a9d0cd69661799ab5ca6725bdc12055d07c975a6a7f90f44d93182"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/vi/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/vi/firefox-80.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "d1cdb32bfb6f6d8e41d3f32de0c86654660d5d7ca4bfe0e763eeb799c0ead10f"; + sha256 = "1ce68d3b630754f961264558c424c0c9771d77f01858570ef0d15ed2098e99c8"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/xh/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/xh/firefox-80.0.tar.bz2"; locale = "xh"; arch = "linux-i686"; - sha256 = "508d17ec13f5b3e1d18641451374efb72331fe68b254f8a71bef4807c318bb9e"; + sha256 = "b7e4d8f55c8ff78491cf2e65510397f09b3b5995f7f7fd506c7e20027d330ee5"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-CN/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-CN/firefox-80.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "cf2f5617c652209daef0e6e5176181f2659e188f9007d7accb4041c030c54fad"; + sha256 = "3ab8f24ea6809b9a2b1cbecef55caa39dbf4ecd33b287b8ef77e5a76bb617337"; } - { url = "http://archive.mozilla.org/pub/firefox/releases/79.0/linux-i686/zh-TW/firefox-79.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/firefox/releases/80.0/linux-i686/zh-TW/firefox-80.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ec99c9201151f134d72450513c518816f244fec0af6de2bb4ee08d3286b709f1"; + sha256 = "4c306d3227ca8dc322780c0eeb8532a62db101c6cde8317acfa824bdddea4d12"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 4ecdec77ddb..1f1831d3c91 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation ({ dbus dbus-glib pango freetype fontconfig xorg.libXi xorg.libXcursor xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file libnotify xorg.pixman yasm libGLU libGL - xorg.libXScrnSaver xorg.xorgproto + xorg.xorgproto xorg.libXext unzip makeWrapper libevent libstartup_notification /* cairo */ libpng jemalloc glib @@ -141,6 +141,14 @@ stdenv.mkDerivation ({ postPatch = '' rm -rf obj-x86_64-pc-linux-gnu + '' + lib.optionalString (lib.versionAtLeast ffversion "80") '' + substituteInPlace dom/system/IOUtils.h \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' + + substituteInPlace dom/system/IOUtils.cpp \ + --replace '#include "nspr/prio.h"' '#include "prio.h"' \ + --replace '#include "nspr/private/pprio.h"' '#include "private/pprio.h"' \ + --replace '#include "nspr/prtypes.h"' '#include "prtypes.h"' ''; nativeBuildInputs = @@ -277,6 +285,7 @@ stdenv.mkDerivation ({ patchelf --set-rpath "${lib.getLib libnotify }/lib:$(patchelf --print-rpath "$out"/lib/${binaryName}*/libxul.so)" \ "$out"/lib/${binaryName}*/libxul.so + patchelf --add-needed ${xorg.libXScrnSaver.out}/lib/libXss.so $out/lib/${binaryName}/${binaryName} ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/browsers/firefox/packages.nix b/pkgs/applications/networking/browsers/firefox/packages.nix index 62181321cac..ce9365f72fe 100644 --- a/pkgs/applications/networking/browsers/firefox/packages.nix +++ b/pkgs/applications/networking/browsers/firefox/packages.nix @@ -7,10 +7,10 @@ in rec { firefox = common rec { pname = "firefox"; - ffversion = "79.0"; + ffversion = "80.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0zgf7wdcz992a4dy1rj0ax0k65an7h9p9iihka3jy4jd7w4g2d0x4mxz5iqn2y26hmgnkvjb921zh28biikahgygqja3z2pcx26ic0r"; + sha512 = "3rw30gs1wvd6m2sgsp1wm29rrbkxyf3jsdy8i0azfz9w7hqcfwnv76j3cdf18xghh954hpn3q6w1hr7pgab3z9zjxzyfcnh2mbabyvc"; }; patches = [ @@ -35,10 +35,10 @@ rec { firefox-esr-78 = common rec { pname = "firefox-esr"; - ffversion = "78.1.0esr"; + ffversion = "78.2.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "223v796vjsvgs3yw442c8qbsbh43l1aniial05rl70hx44rh9sg108ripj8q83p5l9m0sp67x6ixd2xvifizv6461a1zra1rvbb1caa"; + sha512 = "1dnvr9nyvnv5dkpnjnadff38lf9r7g37gk401c1i22d661ib5xj0gm2rnz1rjyrkvzrnr6p9f7liy3i41varja00g0x1racccj1my9q"; }; patches = [ @@ -63,10 +63,10 @@ rec { firefox-esr-68 = (common rec { pname = "firefox-esr"; - ffversion = "68.11.0esr"; + ffversion = "68.12.0esr"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${ffversion}/source/firefox-${ffversion}.source.tar.xz"; - sha512 = "0zg41jnbnpsa07xaizwfsmfav0cgxdqnh8i4yanxy49a45gigk895zqrx2if7pfsmdnj9zpwj9prj8cpnpsfhv6p62f3g2596aa9kvx"; + sha512 = "169y4prlb4mi31jciz89kp35rpb1p2gxrk93qkwfzdk4imi9hk8mi2yvxknpr0rni3bn2x0zgrrc6ccr8swv5895sqvv1sc5r1056w3"; }; patches = [ diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 686ffee9148..eefe7af26a1 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -47,11 +47,11 @@ let in stdenv.mkDerivation rec { pname = "opera"; - version = "67.0.3575.31"; + version = "68.0.3618.63"; src = fetchurl { url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; - sha256 = "1ghygin7xf5lwd77s8f6bag339di4alwlkqwjzlq20wzwx4lns4w"; + sha256 = "1643043ywz94x2yr7xyw7krfq53iwkr8qxlbydzq6zb2zina7jxd"; }; unpackCmd = "${dpkg}/bin/dpkg-deb -x $curSrc ."; @@ -104,7 +104,7 @@ in stdenv.mkDerivation rec { # This is a little tricky. Without it the app starts then crashes. Then it # brings up the crash report, which also crashes. `strace -f` hints at a # missing libudev.so.0. - systemd.lib + (lib.getLib systemd) ]; installPhase = '' diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 21a34539b86..ab528a2c1cb 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -91,19 +91,19 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "9.5.3"; + version = "9.5.4"; lang = "en-US"; srcs = { x86_64-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz"; - sha256 = "1kqvr0sag94xdkq85k426qq1hz2b52m315yz51w6hvc87d8332b4"; + sha256 = "sha256-XW2B2wTgqMU2w9XhPJNcUjGLrHykQIngMcG/fFTWb04="; }; i686-linux = fetchurl { url = "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz"; - sha256 = "179g00xw964d6x11wvzs84r7d6rcczx7ganqrxrs499yklscc46b"; + sha256 = "sha256-EyDyAxB5Og1Cn04tuBF9ob8BxqULy2Ur07BuDxZlmqQ="; }; }; in diff --git a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index 567a75a31ab..f9a2693f243 100644 --- a/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -1,4 +1,4 @@ -{ stdenv, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar +{ stdenv, lib, llvmPackages, gnChromium, ninja, which, nodejs, fetchpatch, gnutar # default dependencies , bzip2, flac, speex, libopus @@ -197,7 +197,7 @@ let sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ diff --git a/pkgs/applications/networking/cloudflared/default.nix b/pkgs/applications/networking/cloudflared/default.nix index 252a6f5b48b..96767f63653 100644 --- a/pkgs/applications/networking/cloudflared/default.nix +++ b/pkgs/applications/networking/cloudflared/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cloudflared"; - version = "2020.5.1"; + version = "2020.6.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "0r1n3a8h8gyww4p2amb24jmp8zkyxy1ava3nbqgwlfjr3zagga00"; + sha256 = "09jdgpglm4v7pivx8016zzdvj0xkdhaa8xl71p2akc2jn8i8i6gb"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 601b3da1570..45bbfbd6c40 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "2.9.5"; + version = "2.10.0"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "1x44mgvnbn47a33xnhnh9bxxvj1vsr32lvh9bq6w5hpmxb7qbq4f"; + sha256 = "19z1v6p59pcl8smywn1b5igqpv9wj48n6500wjxx5ayhc4mg00h2"; }; - vendorSha256 = "1vqmzz76lcwwnw89n4lyg4jjf7wbdgn9sdzwsgrjwkj8ax7d48cv"; + vendorSha256 = "0fqdxs3r4249qxlc9cac0lpbqf2aifkcah07v0cckb9rxfyiwhjz"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/cni/default.nix b/pkgs/applications/networking/cluster/cni/default.nix index 5bbd1014125..02f5fc18d13 100644 --- a/pkgs/applications/networking/cluster/cni/default.nix +++ b/pkgs/applications/networking/cluster/cni/default.nix @@ -18,6 +18,6 @@ buildGoPackage rec { license = licenses.asl20; homepage = "https://github.com/containernetworking/cni"; maintainers = with maintainers; [ offline vdemeester ]; - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; }; } diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index d3b2addee10..fb7d2e2d6a5 100644 --- a/pkgs/applications/networking/cluster/cni/plugins.nix +++ b/pkgs/applications/networking/cluster/cni/plugins.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cni-plugins"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - sha256 = "0f1cqxjf26sy1c4aw6y7pyd9lrz0vknby4q5j6xj77a1pab9073m"; + sha256 = "1sjk0cghldygx1jgx4bqv83qky7shk64n6xkkfxl92f12wyvsq9j"; }; vendorSha256 = null; @@ -16,7 +16,7 @@ buildGoModule rec { doCheck = false; buildFlagsArray = [ - "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=${version}" + "-ldflags=-X github.com/containernetworking/plugins/pkg/utils/buildversion.BuildVersion=v${version}" ]; subPackages = [ @@ -38,7 +38,7 @@ buildGoModule rec { "plugins/meta/tuning" ]; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with lib; { description = "Some standard networking plugins, maintained by the CNI team"; diff --git a/pkgs/applications/networking/cluster/helmfile/default.nix b/pkgs/applications/networking/cluster/helmfile/default.nix index d1cfc89f2df..f713d8a8a6d 100644 --- a/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmfile"; - version = "0.125.5"; + version = "0.125.7"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "00c1sppvdnsqay8zk6fz5xz8yw74zv30hq54r4sf1a5rb84nd05h"; + sha256 = "1m030gjrd98z4vbj7l927qi55vgr11czrb8wmw56ifkqwfi6h9hi"; }; - vendorSha256 = "04mga3jc2c01daygjcn245mv30lc2ibax0mpb1wjk3s8lkl4cxcz"; + vendorSha256 = "0w72nlf26k64cq1hrqycks0pyp18y4wh3h40jpn5qnysi5pb2ndj"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix index 59dd92a4d22..59be45bb536 100644 --- a/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/pkgs/applications/networking/cluster/istioctl/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "istioctl"; - version = "1.6.7"; + version = "1.7.0"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = version; - sha256 = "0zqp78ilr39j4pyqyk8a0rc0dlmkgzdd2ksfjd7vyjns5mrrjfj7"; + sha256 = "0541j1wdhlbm2spl1w3m0hig7lqn05xk1xws8748wfzbr8wkir31"; }; - vendorSha256 = "0cc0lmjsxrn3f78k95wklf3yn5k7h8slwnwmssy1i1h0bkcg1bai"; + vendorSha256 = "0sz92nspfclqxnx0mf80jxqqwxanqsx9nl9hg7f9izks7jw544vx"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/k9s/default.nix b/pkgs/applications/networking/cluster/k9s/default.nix index 1e700f2339c..3c793cc9ec3 100644 --- a/pkgs/applications/networking/cluster/k9s/default.nix +++ b/pkgs/applications/networking/cluster/k9s/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "k9s"; - version = "0.21.2"; + version = "0.21.7"; src = fetchFromGitHub { owner = "derailed"; repo = "k9s"; rev = "v${version}"; - sha256 = "06yjc4lrqr3y7428xkfcgfg3aal71r437ij2hqd2yjxsq8r7zvif"; + sha256 = "1rw1vzxfjzklzdpcxz7mplvlmggavaym260s7vzvbgvd1snf38cb"; }; buildFlagsArray = '' @@ -18,7 +18,7 @@ buildGoModule rec { -X github.com/derailed/k9s/cmd.commit=${src.rev} ''; - vendorSha256 = "1hmqvcvlffd8cpqcnn2f9mnyiwdhw8k46sl2p6rk16yrj06la9mr"; + vendorSha256 = "05rsbi40pihdh212d5zn6cchnkrqd6rsyl3vfsw77ksybwakrbf7"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index 282890ada5b..d751c8ca18e 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -3,8 +3,8 @@ let goPackagePath = "k8s.io/kops"; - generic = { version, sha256, ...}@attrs: - let attrs' = builtins.removeAttrs attrs ["version" "sha256"] ; in + generic = { version, sha256, rev ? version, ...}@attrs: + let attrs' = builtins.removeAttrs attrs ["version" "sha256" "rev"] ; in buildGoPackage { pname = "kops"; inherit version; @@ -12,7 +12,7 @@ let inherit goPackagePath; src = fetchFromGitHub { - rev = version; + rev = rev; owner = "kubernetes"; repo = "kops"; inherit sha256; @@ -51,11 +51,6 @@ in rec { mkKops = generic; - kops_1_15 = mkKops { - version = "1.15.3"; - sha256 = "0pzgrsl61nw8pm3s032lj020fw13x3fpzlj7lknsnd581f0gg4df"; - }; - kops_1_16 = mkKops { version = "1.16.4"; sha256 = "0qi80hzd5wc8vn3y0wsckd7pq09xcshpzvcr7rl5zd4akxb0wl3f"; @@ -65,4 +60,10 @@ in rec { version = "1.17.1"; sha256 = "1km6nwanmhfx8rl1wp445z9ib50jr2f86rd92vilm3q4rs9kig1h"; }; + + kops_1_18 = mkKops rec { + version = "1.18.0"; + sha256 = "16zbjxxv08j31y7lhkqx2bnx0pc3r0vpfrlhdjs26z22p5rc4rrh"; + rev = "v${version}"; + }; } diff --git a/pkgs/applications/networking/cluster/luigi/default.nix b/pkgs/applications/networking/cluster/luigi/default.nix index f69082bff3a..98b71cfe112 100644 --- a/pkgs/applications/networking/cluster/luigi/default.nix +++ b/pkgs/applications/networking/cluster/luigi/default.nix @@ -1,15 +1,22 @@ -{ lib, python3Packages }: +{ lib, python3 }: -python3Packages.buildPythonApplication rec { +let + python = python3.override { + self = python; + packageOverrides = self: super: { + tornado = super.tornado_5; + }; + }; +in with python.pkgs; buildPythonApplication rec { pname = "luigi"; version = "3.0.1"; - src = python3Packages.fetchPypi { + src = fetchPypi { inherit pname version; sha256 = "02c480f5pjgqsvqnkaw7f6n4nhdspmhq5w7lw8sgg2v3jghg8n7i"; }; - propagatedBuildInputs = with python3Packages; [ dateutil tornado_4 python-daemon boto3 ]; + propagatedBuildInputs = [ dateutil tornado_5 python-daemon boto3 ]; # Requires tox, hadoop, and google cloud doCheck = false; diff --git a/pkgs/applications/networking/cluster/node-problem-detector/default.nix b/pkgs/applications/networking/cluster/node-problem-detector/default.nix index 48dabaac90e..3ff0e4b397c 100644 --- a/pkgs/applications/networking/cluster/node-problem-detector/default.nix +++ b/pkgs/applications/networking/cluster/node-problem-detector/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "node-problem-detector"; - version = "0.8.2"; + version = "0.8.3"; src = fetchFromGitHub { owner = "kubernetes"; repo = pname; rev = "v${version}"; - sha256 = "0cphlaf9k2va879jgqd6fzdgkscpwg29j1cpr677i3zj3hfgaw1g"; + sha256 = "1sga5l8bvqgm0j71yj3l1ykqvchxa7cg8pkfvjsrqlikgrfb54f3"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 8aa1f4a44fe..dd1da887cb4 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -132,8 +132,8 @@ in rec { }); terraform_0_13 = pluggable (generic { - version = "0.13.0"; - sha256 = "0kangddd99ix50w67hi0pwa9js9c0hjxqvrc0lxaa6msjvjsxyyq"; + version = "0.13.1"; + sha256 = "0a2sjjb79ziv42ifhplpkvqgsg8gxvr1wdgkhdj59dwahqv64pm2"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index be5d47eb0e0..14744f188b0 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.23.32"; + version = "0.23.33"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "1pa3k0hjdb5bj0bp4aj3lfcgz98l3wd9kfa12rn9zzbcmp087kih"; + sha256 = "0fsyvmdg2llnzy0yzmiihnb865ccq2sn6d3i935dflppnjyp01p4"; }; - vendorSha256 = "1xn7c6y32vpanqvf1sfpw6bs73dbjniavjbf00j0vx83bfyklsr4"; + vendorSha256 = "05p72l724qqf61dn0frahf4awvkkcw8cpl6nhwlacd1jw8c14fjl"; doCheck = false; diff --git a/pkgs/applications/networking/cluster/tilt/default.nix b/pkgs/applications/networking/cluster/tilt/default.nix index c2ffb816aa9..c3ec58df35d 100644 --- a/pkgs/applications/networking/cluster/tilt/default.nix +++ b/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.17.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "0bd01fmrf17njzf8ri4bw4qi7bxcvd3dx7yyf42qfvnp7hrfzipk"; + sha256 = "0wiqnlam4f7085n3djvb5phhvw9df61bj8w6c5rcpffykg33vhmi"; }; vendorSha256 = null; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index b852eb02fec..977b71ebc50 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.12.1"; + version = "3.12.2"; propagatedBuildInputs = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "0zqpibh31rl6xlfw9y66d9hfhwrnzy5cjzbksczyw3lh4dfzsql0"; + sha256 = "12w6x80wsw6xm17fxyymnl45aavsagg932zw621wcjz154vjghjr"; }; outputs = [ "out" "man" "doc" ]; diff --git a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix index 0143e401c19..f8bcdc4bef7 100644 --- a/pkgs/applications/networking/instant-messengers/bluejeans/default.nix +++ b/pkgs/applications/networking/instant-messengers/bluejeans/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , rpmextract , libnotify @@ -62,7 +63,7 @@ stdenv.mkDerivation rec { expat gdk-pixbuf dbus - udev.lib + (lib.getLib udev) freetype nspr glib diff --git a/pkgs/applications/networking/instant-messengers/franz/generic.nix b/pkgs/applications/networking/instant-messengers/franz/generic.nix index d1206cdf9b2..3f05e3d7a5d 100644 --- a/pkgs/applications/networking/instant-messengers/franz/generic.nix +++ b/pkgs/applications/networking/instant-messengers/franz/generic.nix @@ -1,4 +1,5 @@ { stdenv +, lib , makeWrapper , wrapGAppsHook , autoPatchelfHook @@ -64,7 +65,7 @@ stdenv.mkDerivation { expat stdenv.cc.cc ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/instant-messengers/nheko/default.nix b/pkgs/applications/networking/instant-messengers/nheko/default.nix index 5d9963956ed..2f5316c9fe2 100644 --- a/pkgs/applications/networking/instant-messengers/nheko/default.nix +++ b/pkgs/applications/networking/instant-messengers/nheko/default.nix @@ -54,11 +54,6 @@ mkDerivation rec { qtquickcontrols2 qtgraphicaleffects ] ++ lib.optional stdenv.isDarwin qtmacextras; - # Quick and dirty fix to https://github.com/NixOS/nixpkgs/issues/94952 - # and/or: https://github.com/NixOS/nixpkgs/issues/94905 - cmakeFlags = [ - "-DCMAKE_OSX_ARCHITECTURES=" - ]; meta = with stdenv.lib; { description = "Desktop client for the Matrix protocol"; diff --git a/pkgs/applications/networking/instant-messengers/rambox/default.nix b/pkgs/applications/networking/instant-messengers/rambox/default.nix index 6bf3efa5364..e6f80de821f 100644 --- a/pkgs/applications/networking/instant-messengers/rambox/default.nix +++ b/pkgs/applications/networking/instant-messengers/rambox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook +{ stdenv, lib, fetchurl, xdg_utils, dpkg, makeWrapper, autoPatchelfHook , libXtst, libXScrnSaver, gtk3, nss, alsaLib, udev, libnotify, wrapGAppsHook }: @@ -20,7 +20,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ dpkg makeWrapper autoPatchelfHook wrapGAppsHook ]; buildInputs = [ libXtst libXScrnSaver gtk3 nss alsaLib ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 90e2b201ebb..69a95b3459b 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -2,7 +2,9 @@ , gnome2, gtk3, atk, at-spi2-atk, cairo, pango, gdk-pixbuf, glib, freetype, fontconfig , dbus, libX11, xorg, libXi, libXcursor, libXdamage, libXrandr, libXcomposite , libXext, libXfixes, libXrender, libXtst, libXScrnSaver, nss, nspr, alsaLib -, cups, expat, systemd, libnotify, libuuid, at-spi2-core, libappindicator-gtk3 +, cups, expat, libuuid, at-spi2-core, libappindicator-gtk3 +# Runtime dependencies: +, systemd, libnotify, libdbusmenu # Unfortunately this also overwrites the UI language (not just the spell # checking language!): , hunspellDicts, spellcheckerLanguage ? null # E.g. "de_DE" @@ -79,8 +81,9 @@ in stdenv.mkDerivation rec { ]; runtimeDependencies = [ - systemd.lib + (lib.getLib systemd) libnotify + libdbusmenu ]; unpackPhase = "dpkg-deb -x $src ."; diff --git a/pkgs/applications/networking/instant-messengers/teams/default.nix b/pkgs/applications/networking/instant-messengers/teams/default.nix index e3b664e5fc2..d58e27cc62b 100644 --- a/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - systemd.lib + (lib.getLib systemd) pulseaudio ]; diff --git a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 014e22bc512..7e932d74abc 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchurl, fetchsvn, stdenv +{ mkDerivation, lib, fetchurl, fetchsvn , pkgconfig, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook , qtbase, qtimageformats, gtk3, libsForQt5, enchant2, lz4, xxHash , dee, ffmpeg, openalSoft, minizip, libopus, alsaLib, libpulseaudio, range-v3 @@ -63,8 +63,6 @@ mkDerivation rec { "-DDESKTOP_APP_DISABLE_WEBRTC_INTEGRATION=ON" #"-DDESKTOP_APP_SPECIAL_TARGET=\"\"" # TODO: Error when set to "": Bad special target '""' "-DTDESKTOP_LAUNCHER_BASENAME=telegramdesktop" # Note: This is the default - ] ++ optionals stdenv.isLinux [ # TODO: Remove workaround once #94905 is resolved: - "-DCMAKE_OSX_ARCHITECTURES=" ]; # Note: The following packages could be packaged system-wide, but it's diff --git a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix index bece4e467a3..2910c389daa 100644 --- a/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix +++ b/pkgs/applications/networking/instant-messengers/vk-messenger/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, autoPatchelfHook +{ stdenv, lib, fetchurl, rpmextract, autoPatchelfHook , xorg, gtk3, gnome2, nss, alsaLib, udev, libnotify , wrapGAppsHook }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation { ]) ++ [ gtk3 nss alsaLib ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (lib.getLib udev) libnotify ]; unpackPhase = '' rpmextract $src diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix index 1cd2df4c7ac..bdc8aabf61c 100644 --- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix +++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix @@ -40,7 +40,7 @@ in stdenv.mkDerivation { alsaLib gtk3 nss ]; - runtimeDependencies = [ udev.lib libnotify ]; + runtimeDependencies = [ (getLib udev) libnotify ]; installPhase = '' mkdir -p $out/bin $out/opt/wavebox diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 532eeb1d038..48eb1ef202c 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -5,6 +5,7 @@ , makeDesktopItem , makeWrapper , stdenv +, lib , udev , wrapGAppsHook , cpio @@ -107,7 +108,7 @@ let ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' diff --git a/pkgs/applications/networking/instant-messengers/ytalk/default.nix b/pkgs/applications/networking/instant-messengers/ytalk/default.nix new file mode 100644 index 00000000000..8cb22aabc69 --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/ytalk/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + pname = "ytalk"; + version = "3.3.0"; + + src = fetchurl { + url = "ftp://ftp.ourproject.org/pub/ytalk/${pname}-${version}.tar.gz"; + sha256 = "1d3jhnj8rgzxyxjwfa22vh45qwzjvxw1qh8fz6b7nfkj3zvk9jvf"; + }; + + buildInputs = [ ncurses ]; + + meta = { + homepage = "http://ytalk.ourproject.org"; + description = "A terminal based talk client"; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ taeer ]; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/applications/networking/irc/convos/default.nix b/pkgs/applications/networking/irc/convos/default.nix index 6adcaa7b3d6..7a30737c047 100644 --- a/pkgs/applications/networking/irc/convos/default.nix +++ b/pkgs/applications/networking/irc/convos/default.nix @@ -6,13 +6,13 @@ with stdenv.lib; perlPackages.buildPerlPackage rec { pname = "convos"; - version = "4.29"; + version = "4.33"; src = fetchFromGitHub { owner = "Nordaaker"; repo = pname; rev = version; - sha256 = "07m9lhwgqq77hi4n2zrya7n8apkjv8xi166bxa0n7pnlknlp74ar"; + sha256 = "0mxq4jpjk4vvhi5lqslj614dvk84iq12rsdyykxr8h9cnjjs57im"; }; nativeBuildInputs = [ makeWrapper ] @@ -33,6 +33,10 @@ perlPackages.buildPerlPackage rec { ''; preCheck = '' + # Remove online test + # + rm t/web-pwa.t + # A test fails since gethostbyaddr(127.0.0.1) fails to resolve to localhost in # the sandbox, we replace the this out from a substitution expression # diff --git a/pkgs/applications/networking/irc/weechat/scripts/default.nix b/pkgs/applications/networking/irc/weechat/scripts/default.nix index 0880a32af92..6d228688607 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -7,6 +7,8 @@ weechat-matrix = python3Packages.callPackage ./weechat-matrix { }; + weechat-notify-send = python3Packages.callPackage ./weechat-notify-send { }; + wee-slack = callPackage ./wee-slack { }; weechat-autosort = callPackage ./weechat-autosort { }; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix new file mode 100644 index 00000000000..d219aa481cd --- /dev/null +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-notify-send/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, libnotify }: + +stdenv.mkDerivation rec { + pname = "weechat-notify-send"; + version = "0.9"; + + src = fetchFromGitHub { + owner = "s3rvac"; + repo = pname; + rev = "v${version}"; + sha256 = "1693b7axm9ls5p7hm6kq6avddsisi491khr5irvswr5lpizvys6a"; + }; + + passthru.scripts = [ "notify_send.py" ]; + + dontBuild = true; + doCheck = false; + + installPhase = '' + install -D notify_send.py $out/share/notify_send.py + substituteInPlace $out/share/notify_send.py \ + --replace "'notify-send'" "'${libnotify}/bin/notify-send'" + ''; + + meta = with stdenv.lib; { + description = "A WeeChat script that sends highlight and message notifications through notify-send"; + homepage = "https://github.com/s3rvac/weechat-notify-srnd"; + license = licenses.mit; + maintainers = with maintainers; [ tobim ]; + }; +} diff --git a/pkgs/applications/networking/mailreaders/mailspring/default.nix b/pkgs/applications/networking/mailreaders/mailspring/default.nix index 3bb68d7805c..6c6bf6f93db 100644 --- a/pkgs/applications/networking/mailreaders/mailspring/default.nix +++ b/pkgs/applications/networking/mailreaders/mailspring/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , fetchurl , autoPatchelfHook , alsaLib @@ -45,7 +46,7 @@ stdenv.mkDerivation rec { runtimeDependencies = [ coreutils openssl - udev.lib + (lib.getLib udev) ]; unpackPhase = '' diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index ec4778cd4ab..0b18a579e3b 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -27,11 +27,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "mutt"; - version = "1.14.6"; + version = "1.14.7"; src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - sha256 = "0i0q6vwhnb1grimsrpmz8maw255rh9k0laijzxkry6xqa80jm5s7"; + sha256 = "0r58xnjgkw0kmnnzhb32mk5gkkani5kbi5krybpbag156fqhgxg4"; }; patches = optional smimeSupport (fetchpatch { diff --git a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix index 0b2a76cc00f..214f4311e69 100644 --- a/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch-bower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "notmuch-bower"; - version = "0.11"; + version = "0.12"; src = fetchFromGitHub { owner = "wangp"; repo = "bower"; rev = version; - sha256 = "0vhac8yjnhb1gz60jfzg27spyn96c1rr849gc6vjym5xamw7zp0v"; + sha256 = "0hvvlbvad6h73iiyn9xshlj073p2ddchgh0pyizh9gi8niir4fn5"; }; nativeBuildInputs = [ gawk mercury pandoc ]; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix index e0f75692d26..c48a6d1c606 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/68_sources.nix @@ -1,615 +1,615 @@ { - version = "68.11.0"; + version = "68.12.0"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ar/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ar/thunderbird-68.12.0.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "878336931005573f76fb15c25fcf2593bfabde16356ec6b1f9b8913663b5fcaa"; + sha256 = "70cfb9e6a7a1f285f37a8f13c9a010237e6aabf815b77a12f54ee0deedd36400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ast/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ast/thunderbird-68.12.0.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "5e3f29fb47ccb059d983946d6efec14b8ab00695fdd84a5cc7baa0cc40657cc5"; + sha256 = "5645657f20d37ffdb11f383f164f03c66ed2024244849b09bfa60075d5d07490"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/be/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/be/thunderbird-68.12.0.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "5cd4c3a3d6ac865b727b58cbb51def60779c0d731a9f6b8f01d4b8cdc90d42b5"; + sha256 = "d38cdcc2ba4534c23a1bb42b93f271623c497f48e1d255a23bf12a368ff339bd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/bg/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/bg/thunderbird-68.12.0.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "f359cf1bd12f14bd6636fdb0bd885ed829235559c20c86bd361668f057039f34"; + sha256 = "c8883242683dec57f9db502d96d2036ec46753f474a33c0f1ae31f97f2c3113c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/br/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/br/thunderbird-68.12.0.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "6cfc9608b392b1e604eaefda5a5dcdc346bd88a1bc411532e8864a04631cf6f8"; + sha256 = "cfb669e2378f97689a14f23e2c55ef4987e2508695eb195be3af75ed1d648345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ca/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ca/thunderbird-68.12.0.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "9068b49e2d8a6f5e82b70ddda1b0a048d094328c96cf21848eefa431d358e6ca"; + sha256 = "9ae4b43e0d5d9edd83291f0be7d53d07e5c84f1d0ad4348654136543b7b53a54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cak/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cak/thunderbird-68.12.0.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b3aef7c88302e2b9d0fcff8daa0d8ad4e2893d41e54ec29b746e79d5b03128b2"; + sha256 = "d6d635a15b913679ed943c3501dd03140d099ff36b48c8731a47eacda1b5232b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cs/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cs/thunderbird-68.12.0.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "a2338c8ac38a4cef41d8fab1e7857c290afa30af0b131a31e675368944d69ba9"; + sha256 = "616fbf24e36d63ce3cbc957d69b8972d517524c613a22bedcf5b57534f9a9a41"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/cy/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/cy/thunderbird-68.12.0.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "b02118f945ee76653df0364da6b2b8c597fff2bf52f4e20b64f2b8ac69aaf60a"; + sha256 = "548c51228d2f3003bb94e1bee91cea0d2edb95bd0f86ee4259c8daef90a2dca8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/da/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/da/thunderbird-68.12.0.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a565beeaf67c01edf83a2478732fa9e245645d6e6b4fb566affe552762b8bc86"; + sha256 = "ad0e4b7a693d881b8875a5b8cc3e607a3883df759278129f0933522b9a6acd24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/de/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/de/thunderbird-68.12.0.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "00a8f51254b2152ba37d964bfaca77cc06b9d778ef750eb6500e01510e298fb4"; + sha256 = "bf9b70b345ffe5df03365d819c5abc3339ed3af4d8a716cdfe7099134864a9b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/dsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/dsb/thunderbird-68.12.0.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "7cfcafbf7f46a4be23003a59390b0404d04ee344c883c29a18f42accb5fddc4c"; + sha256 = "a2cd7ffb0e8b4c3d1715c18e636d0dcd5efa245200d6d0f14048fc4b399b8121"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/el/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/el/thunderbird-68.12.0.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "b0d0865f8b64de26af8eeff6eb84f159f585e3f9f7590dab413e04167215dcf3"; + sha256 = "07836ce122936848e26cd5a1522967760bee67654582076c53e4ec183cc4c40e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-GB/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-GB/thunderbird-68.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "eb6731a9baaa1cd99584aec7c6dcce8f819d41106ac6ed4f42f02f747cb2afe4"; + sha256 = "c89fa35af79eca3cc26b492c602a3f8af0dbaf6ce4ee3af93d93f10daf4e9d6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/en-US/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/en-US/thunderbird-68.12.0.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "6ddd72732957282280a7209f2d5137229ca8af4ad7f02e112187fe333cc79a7f"; + sha256 = "6eeea0de838909f91da7270e42ae1513d2b801f412fc758f2f8c682d260a7c24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-AR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-AR/thunderbird-68.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "0d620d929ed41ffd16cfd8297ec70e8cb9105e726af99d2cd207de50920a1f93"; + sha256 = "e9d84032a91f7feb2db3d22a500c564f273c2b637f97aaab2edf3209b93dda1d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/es-ES/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/es-ES/thunderbird-68.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "28bac94492c7444caab029f3cc3995275000496aab854f20368f941514cd7b11"; + sha256 = "a986e8a48b59354421193f2dd01e3c291fb6c98031af43531e723dc217a43d4a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/et/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/et/thunderbird-68.12.0.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "49fe0adb4fc5c5135083ba53369030faa95d3a530e8eb49180f81e359229bf81"; + sha256 = "2f7508e83aba4fd64a817c7eb4b44d4ea9371956339a009ba541bf3a349693cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/eu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/eu/thunderbird-68.12.0.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a422935f96d5a3033c6c2a7bd39f19e3f84211d99b57d3996b31e404414703e4"; + sha256 = "edbc5ff4ba45106233cdbf5255405c4ee52ba7e6811736958323a616881b943f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fi/thunderbird-68.12.0.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "649c3908ecccc8466e555aa76aac47bf7153da8b6f45ddf83f36f6ac676cb4c3"; + sha256 = "f4ad740a724efdbfec54445304ca75e9a16e0881bc18789b8ea35632d8857d4b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fr/thunderbird-68.12.0.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8270cf0e0acfb7280b8616462cd87a1d8d929c7c5fd4839f9607cb588a97c025"; + sha256 = "ebf60a227c9fe5237eff22fb81f3c8bc02a593de823d6f0ad9b67f07af129dea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/fy-NL/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/fy-NL/thunderbird-68.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "177a9f337719b2902ae964525803cd437b2cbcc8c7b85c7881e14f7e0d207875"; + sha256 = "b12983077a62c5bf7353f50dd951348a457ce07f5beb2a579f199c4d77ed0906"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ga-IE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ga-IE/thunderbird-68.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "80d3625a04d027382ec3fdfdabd45d501fa4b451c82ec5cfdf5c3352a395a6ba"; + sha256 = "aa7c3a4b54fd6fef0f120a6748c45a3f379268f31e087cb3df07d270bf060bad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gd/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gd/thunderbird-68.12.0.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "0b2fc2582ef518529f204b5096601047b5b3406201b1fc9f7ea88736d1ce1e0a"; + sha256 = "39fadb2bd4c01da0eb188cb9f52ccd726ec9f7eb5ced44e2a30ee0cfac2527bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/gl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/gl/thunderbird-68.12.0.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "d1cfc4e646fa6ce03765a56ea4cc2ad3936ec8224f1a7f5e74a34c189be11721"; + sha256 = "b4ee1f89b0326b22fc7a5b980b857c2652d6881d096060a8bc083015b47762d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/he/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/he/thunderbird-68.12.0.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "588f22ff9dd4dea7c808c4786f2c897842dedbf2a04c0b4d28b3aa162f88773c"; + sha256 = "cefbc742672942e310dc9f4dbcefc8b66cf01d58ac64448ac8c0dc33fdace5ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hr/thunderbird-68.12.0.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "126ae387a1c97d253c4ca60441a192d6a00f63f0483b2888371624337e4fd2a9"; + sha256 = "9e132811cb6bd98faee86e298b78e845727bfded84c0cdab41608ed1565f1aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hsb/thunderbird-68.12.0.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "456c323f61f77c07ae73a260a3ad2641190f165d14c75da1dba33ed1f8d2a3d5"; + sha256 = "2a41d1e188fd5fed93a37a1bedc67cb745367447504a76836f79928194730d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hu/thunderbird-68.12.0.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4790f014d95fe3ae00433e27fa291f7e4657b8062538ca52c46dd46ea41a05cb"; + sha256 = "9196df7850b9cff69f52b5db69ec3b64cfa312bba5669380c137b95a8140cf39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/hy-AM/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/hy-AM/thunderbird-68.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "7d81493a67e27eb485c1cb702cb8305788733e133bcb22659026737cc2afe1e9"; + sha256 = "4a08137a9a714677ecf86a24f165047b809e22eff50d196b92c153e59f943c30"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/id/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/id/thunderbird-68.12.0.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "9f558c85ba88c6350da0445ca2d2b63205c8c1e6700388e1d4f7de0978321667"; + sha256 = "39784aab0bc3253af47cdcd95824eccdecae4dac819bacf6a04daa7b5c86d6e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/is/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/is/thunderbird-68.12.0.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "1f1f65bb573fb4fb563e890c043ff8c3283687575892853dd3e076473072b63f"; + sha256 = "a041d1af23e9c64967e4d014b6a84ddc80ad24e852146e448f6b380cdd672e67"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/it/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/it/thunderbird-68.12.0.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "de6c3adf83745370241c8935edccc412a60642ec758bd891d03c098b40b8792f"; + sha256 = "b0e3161c801fbaee2f589b1bc61a4fba9968f5f363a62cf0f8af855d23e4782c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ja/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ja/thunderbird-68.12.0.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "8b2ce4598af7323f59a31269c24bd05e369d9898266dc6e8cfa360dae7609273"; + sha256 = "ad416d47930d81be9ac2f20b3699f4c74471c36e08b14f9d5c6ee1af97c7c9d4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ka/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ka/thunderbird-68.12.0.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "be74a3edf9a1d931124c4351b51147be2e7a74f453d07482bce4f7721de701ce"; + sha256 = "3b30bc5f0971310d71e1909b4ed891481457ac8baf11c1e505c3400b2a7cfb63"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kab/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kab/thunderbird-68.12.0.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "1be81ab7bb429b44e0c63c81ebf249b66a79d43a3dba39ba0af6242db165d6d3"; + sha256 = "abdc58d5d5ef251e63c0c40a48460f90e299a4420cbe4e290d519fbed4c335b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/kk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/kk/thunderbird-68.12.0.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "ee308381b1e0643b7e0683c365c763beb4afcaf21c9b0a1e8c8c2ec3c218c965"; + sha256 = "08018b951de59b1a92717fc82bd98a0c324a019ee0ae14888f09c5351a586284"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ko/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ko/thunderbird-68.12.0.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "af2d7ee49a6295e41dbfcc7b8e19b8f146890f12baa36ffddbc7dfbfa39a8eb3"; + sha256 = "1178adc42b3a2ddac46dd50ad8436d1be50db409963e8fac3beb22a431f885fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/lt/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/lt/thunderbird-68.12.0.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "8d384844274d048772fbc35da75f91ab6398ca64e26f089c4da116065584acf1"; + sha256 = "18d88a8cbb24d2a78af0de282187a743e707136fdb61912e5f64bf75730e3a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ms/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ms/thunderbird-68.12.0.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "6e447b3ed1903a20001963021598d957270c88980ff04d3da6c819ab106a2210"; + sha256 = "e1754cfbf20e286fd6304b8d75337e3794893c5ebd9b242cf624090e6fc6e9ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nb-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nb-NO/thunderbird-68.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "710a982216120cbec822d7a9f74d8ae789b4a234fb3a192797604c9a47a23a62"; + sha256 = "6379f6dca3d8bacb466044f0a7d11b32eb61166d3f14c37431f77843eb884c90"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nl/thunderbird-68.12.0.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2b02b7e3b5e310e5b7935cb72e59d6a385567100d22e87d196c4b4700851d439"; + sha256 = "66a56e218365bb260980848427609d390674e2ba3c70b9adc4121f73c861d9b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/nn-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/nn-NO/thunderbird-68.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "128807f651cc0b09618bad42703970c391c17f5ff883c3ab11d115d0878fe1aa"; + sha256 = "ccdb135d43f5542151fe2c99a8e13cebfbc032367abb0308213433b753dc8125"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pl/thunderbird-68.12.0.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "181721ac04e9911f57ec7b4f36a5db82e261da71a310dc502efab75a101bec03"; + sha256 = "5dc2151d1bb956c4b6fbd1b6185d9328f7091e60fdcd51bad5a9ebaa8fcbb7d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-BR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-BR/thunderbird-68.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "e82f40343e28ecd0abafb71f421c6d7df40b7cfca4898503b32fb0500686d7c4"; + sha256 = "5ebf77d47bf45b058aaeca857060c908dbf7036bae2c2c5812ff145aed840203"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/pt-PT/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/pt-PT/thunderbird-68.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "96bea893919ff89441dd47e027a7d83aa691cc99abf4eaa342c941777ecf319a"; + sha256 = "73baa68f79b4a15795fc426dfc9a8d573a05e4ab8a663d122cfd802f93941825"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/rm/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/rm/thunderbird-68.12.0.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "544f666af94043737503a30551ad5832f22ae529bc32495bef9d7443c8869072"; + sha256 = "29f8ba57d9000803bae795c2ff977347af9a1f0df123337eaab3bdcc20786734"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ro/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ro/thunderbird-68.12.0.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "4c6e7793c206999e0a9510b390e4b47d82e19dc2da1cae8b4341b8afee440191"; + sha256 = "b8233ad81c6620c26a02457b9235ce0be0c5d93b81f88d9ddc84bc12f869dbad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/ru/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/ru/thunderbird-68.12.0.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "66e951339323a3a44326cada8c572d7040d33057a3a487d8078eb27efa791eb8"; + sha256 = "f959f786dbbb7d06cb33eca24efd9e2763c5ca73fc4ba47e9b933b6298d7f026"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/si/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/si/thunderbird-68.12.0.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "3ef89e462359d09d95216a132c462f0529948073a4f0aef6358362d0457e747e"; + sha256 = "dcf59c0c1ea0acdcc894463b04c54339a72dcceb25fe5478608265eb3ead226a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sk/thunderbird-68.12.0.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "476641e4d45cd114dca94f59ddee15fda5fbd432c50e4f29af09eb3298782854"; + sha256 = "2a06329fd4a9dd6333e2d73a44fca7eaf593032e8ace33736a03dbfffb2920a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sl/thunderbird-68.12.0.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "5e85ff37554f47f585a155db65ae9e782c8604fa44db8d0dc9c3e2741704909d"; + sha256 = "f7bd3e3a407dbab07836342ff29fc143fe3904e7f878ea719522ade3fc4f6b84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sq/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sq/thunderbird-68.12.0.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "fc4f839973d6986979089c1dcc1e9b219007c34ecd2d587538db706e4b01eccd"; + sha256 = "0edc58751a6794494efab8b0a2ce852374a747ccb73b38455475f0099ea0f238"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sr/thunderbird-68.12.0.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "85a32f352d2b535366dd10a49116e65de4c8ec87886b37e34ac55082c4c310fd"; + sha256 = "91ac5cc0646c062b00b3b064af53ba03c7e034b75afa13dca7586eb80578d377"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/sv-SE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/sv-SE/thunderbird-68.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "19af3a847c9e28baed2db8f6b025dcfb0e688932b0483bae461c86861bfa67ea"; + sha256 = "5aa21e4b78f4294835197f784a651f17453d83fce98e7140e49c6da117464fd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/tr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/tr/thunderbird-68.12.0.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "deea2513814df3e7a9004316dc50f6fa2bac46e0d9456cf124e33e6e03a9b4c8"; + sha256 = "3ab2639dd126e3ed9b031fc10f4396c7d98ffa7b7ffca6a9b3f2f47590e3b83c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uk/thunderbird-68.12.0.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "22b34b43ccc74eb2dc565a0c63bde89ff0d22f710bd26868341be91f51489f94"; + sha256 = "59be2ddc7c65405e0b3854c2a551dab73df9736842ee362b2a20dc9088242a96"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/uz/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/uz/thunderbird-68.12.0.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "26bb8336c617dc6fe485339b3c8da814f7aa0b46eb0a821db36309305ea87e58"; + sha256 = "ae196683b283525511fbd2e3ad428339672f2f1339566a323e01f6f649d333c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/vi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/vi/thunderbird-68.12.0.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "88705691ae084991c198865f1e93d1ed127496245313cb8f28dafac0a64793a5"; + sha256 = "9d66b8e4eefbb6b8c0d9893b056fc684310ae583921d626cb676cd8a7b4b39de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-CN/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-CN/thunderbird-68.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "5ebf1ad54acb6d6d17985d80bff9a0b39726d1f62eea30ad9ca0f04577f640a1"; + sha256 = "2839f2f076a8a6e283a3ffdd6100986a11d19b9108fce074f8e7f127cb0f375e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-x86_64/zh-TW/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-x86_64/zh-TW/thunderbird-68.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "b795b0127cf922f65a2ad2d8f17ebe64089c6d06fe7a701c289b7af5afe7c371"; + sha256 = "02ef645a7de8abc1c5dd92eb685d64570cf1db971cfe7e248111d6a17b3ddcd9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ar/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ar/thunderbird-68.12.0.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "d19d082b55d76862977b9357e9cf245697c24d207a6d6b3aacd81abf1443747b"; + sha256 = "5c4d899245a38626fa18d849bcf01d50125dee60d715d76224ca0bb4623f73be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ast/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ast/thunderbird-68.12.0.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "6cd6c484888fe96fb08eab2b6b2a4dc8495823efee6a373536c26e9679fc664e"; + sha256 = "f657bdc5b43b75e43578251abccf5c7b9e6d0848fd55c6105060daba33c36721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/be/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/be/thunderbird-68.12.0.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "bdd2ac4571d6444ff9a3ffd72c1b55cf5f564c740b5ceafce7a2e2268f482dda"; + sha256 = "669a2cbfe600727b9d9a8ed5046272a1f19b80b6af9a6a6977ce1b89f60fa36e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/bg/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/bg/thunderbird-68.12.0.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "3354c7e4b505e99a53a10cdbeac5b6425b13182def27a82c839eaee6ba6e2f86"; + sha256 = "e1b33857544c10c0191316f6e3d16b34957196b35a922c884315714fe851389b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/br/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/br/thunderbird-68.12.0.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "27339c12c5cdabea7a9a057cad70fa02cf4f69860e71b604f81a60f891345268"; + sha256 = "b9e4a530529449446fe5a302277878c4d2192ef7bb48206f8528024087f520ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ca/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ca/thunderbird-68.12.0.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "b65b6d20d7251795e0a9f0ce88f8133d7742c6361375e4897a0bb2e043dd8c97"; + sha256 = "aa5e4ae20fa9e5dbb8c0ba275ba18d1ba94900094ba3186aac40ffb27396a96f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cak/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cak/thunderbird-68.12.0.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "173a85565dfb7b9d44b5757245f8b5f8a62fd15a8a15bfee0680a96ef8f84625"; + sha256 = "a812c9150feec48e2ebfb1786f5e30ade33203160fa4102382435641caeaf3b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cs/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cs/thunderbird-68.12.0.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "9cb5def4eca0bb103516a66f90baf91f7b4e962d5ed59b4f09ae9f19e7f95b47"; + sha256 = "75813ad7dd0ae5c073964296dd687e5c1289178491adc98d40e853ed812bdca9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/cy/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/cy/thunderbird-68.12.0.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "8b51e01daf38091d3b1b32a249f3c6fb220ad8075bbfd16914cb72b24435d8bb"; + sha256 = "b3894f05cf905aa96612860dcef0bdb4bb9564901ef84172e11856a9fa9e0ca4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/da/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/da/thunderbird-68.12.0.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "1269600ab71c691563482c6d5787a7670fdceeda3a07c61d7cf2477aa16fe075"; + sha256 = "a4f21bd2017043872a962167f98db358b824ae1821fcf03e2df1bef7783e07c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/de/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/de/thunderbird-68.12.0.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "46c5fcae1b11b7e31fff2e70397a560c502bb3360ed646dd09945fcee81efad7"; + sha256 = "3a079685f75d2ec0320ec9e366b4e037954d67fa3f9e3bda055b8cd7de8fbdd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/dsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/dsb/thunderbird-68.12.0.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "4dc661243d99edb84d0bafd45300bf18d86d5289ede3db066ff89cc4094afed1"; + sha256 = "295a0f56429b3638dd0dcbf8d97a6376636b67e22d493ce8dfaceeb579466d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/el/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/el/thunderbird-68.12.0.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "efd5f7f46d53bf34146a6f39149abb2aed9c47b735339cf767e32e6387ba50bb"; + sha256 = "86e4b98ede80cc07cc1aec043af82068a73b7c76820f70df8314e3b91c108d18"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-GB/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-GB/thunderbird-68.12.0.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "ce97a84ba103a7e5bedba43ee47a5c603c1b5d9bf3bc1a8cab4c26ec9ace21c7"; + sha256 = "2cb03a17f88e3826181911ec6a7455528d1e4c051b065252c964c6c0794175e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/en-US/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/en-US/thunderbird-68.12.0.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "632f078407322995eef93db134f1da753a1b35696a668a5b8be29f908a34c223"; + sha256 = "11fe953ede0d99656534ac676f118e939024744c5301d378acbeac6792e668e5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-AR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-AR/thunderbird-68.12.0.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "88b67f07b6069adcb82c04f818493e25bd145b5d874a7503453e88ea14200499"; + sha256 = "596264396a25adb873320222697e7f1a58aaab484de9c0d2e85f99962b6d893d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/es-ES/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/es-ES/thunderbird-68.12.0.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a52a6917d77364e5f7ed06f4484abf7e607c53445ff338e65af6b9bad4626e0d"; + sha256 = "a9512af30e2b1613a6bd1ae6f4ce785f676b2cf70b80a37d85a5e1566bb2b35f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/et/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/et/thunderbird-68.12.0.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a0c15f0000a00984760419e6f737840b4637bf5aa014ee88093aa2a7a3258807"; + sha256 = "b7dcb196881a23e979edb5ae247a7c07b1cf1250cb4c159ce523d1a26be188c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/eu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/eu/thunderbird-68.12.0.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "d69e9af1a381743acc9ee1f800999b015129cba4fc112f312a04884c121535b0"; + sha256 = "4066164b4c9242a9885bc2de802c4f5b6b594c928db36ac72c94faabaad86679"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fi/thunderbird-68.12.0.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "876673de48a047d75e0ac766dca338629069af1872308a7bc6a7e068da026d3a"; + sha256 = "a7c635cbbbc10725b28052ccc61603fb60b91e06bbf1f240561bdb8f941af55a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fr/thunderbird-68.12.0.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "d83d87dca716d4cd3850df1c5923e88f15e35354abc874202c8c12bf8d1a006f"; + sha256 = "7dba28adb1287e1aa9ae85840fc3aca42aaedd4b2c2aa6cc68d5f793549d19b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/fy-NL/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/fy-NL/thunderbird-68.12.0.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "0cce3392aaace190f9ea0247d89699f73d534762278f4776146a1f75bbc09996"; + sha256 = "bd763e264eb684ec3b0b1f2c68ce295d1df86994d15f5c66c487e4742bfef86e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ga-IE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ga-IE/thunderbird-68.12.0.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "83b7e660e8098718bd4b205ad2de53522bd94e7a602afb960b6381fe4c11a395"; + sha256 = "52f9b5694efbdd8ecc76aef58695423c6a4b547b5b0cfedca313386b7500685e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gd/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gd/thunderbird-68.12.0.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "447a887ef76e57b9c12a0991d7eaf903ce29d7621d4f9143edd18b56bdab81d3"; + sha256 = "6c9c1b0f11ad13e0780371d54fedb52d2463713db3bc52adb72c8ea9ff80eb8f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/gl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/gl/thunderbird-68.12.0.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "288b865596e2b8b1087cbca98bd9c55f9aff1f1cb8d432953d20854b0b1e9ab8"; + sha256 = "608bf5c0d6148cc3014758829ba06135222b462242456ca0984e7dc12654c2cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/he/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/he/thunderbird-68.12.0.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "9d801a18324849e4a6faf3266c09eb5898c8122e89b020e35ea25a6b3899a4d2"; + sha256 = "f92d569a53f34bfdda4dac185834e5692526f13f20853d1943f165af33b54a37"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hr/thunderbird-68.12.0.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "f20210372b36b43cdae8f7f1294927dfb364d1ca4db21ee8af1c059a06f3e45e"; + sha256 = "60d2f184219f8d17c2739ee3cc8463bed474142bd2caad74157b97db2306b27f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hsb/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hsb/thunderbird-68.12.0.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "54daf67c97f2e7496fabe6bef2d1d9a60baccfee35d7331444d48fc6fe675c26"; + sha256 = "40ffece26101b2f6a7789511b026d99234bd34ec78e566e7e25065ae3201d693"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hu/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hu/thunderbird-68.12.0.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "0791aa7bec49ff1bfe862f9114ed4b0013361f2f1fa0e4745ad49c8c0e0a9f84"; + sha256 = "e74da0bdb27fe3375dfbd1ab042892de3ded84f33a6f6d46e209fdcaa28183d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/hy-AM/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/hy-AM/thunderbird-68.12.0.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "e64bacff30d0b2b2a5038aa11d719c9ef3124d64b9923d52a9c5856f6584f9c2"; + sha256 = "fd93972c11842b56453449e72617deb3177d020c8f25cf4d5fb687f4a3ddb5c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/id/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/id/thunderbird-68.12.0.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ba6108ba9b4f31f49e7c925a6051738276c67545f7f8d2b3cb378e8834dbd0ce"; + sha256 = "546825968ad86e4c5c6effefd0f924cc1d10489fff7968f17401e3f84c4d1ab0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/is/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/is/thunderbird-68.12.0.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "a3eac36b640a61f2fc6bd62350bd8aaf020636035547c2b9d687df2bd2d7174b"; + sha256 = "1f2e2228c685be2d65d6e0b92eef8ff3e58d7b772f846d0707a9b02e6d0ad306"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/it/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/it/thunderbird-68.12.0.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "bf3cc19a7d1c1415cad867b72c5765dfced27511616a8cbd230516adf8d3f20a"; + sha256 = "41b27c8195432e1412e3c4645b823b8dd1f673eabf07ddc72f3d792d3f7488da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ja/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ja/thunderbird-68.12.0.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "d4788294f5e91c033c3c3251cfb614e50843631252a2b1fcc6389d099b1fee1e"; + sha256 = "68940d44d933bb7228d6f9a03406ca01903c54fdf57eb5a1e1033b12ef507df6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ka/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ka/thunderbird-68.12.0.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "8735be035cf0ab5d4b2102aab8b207c1cc686da8843b45f15c1be91931850968"; + sha256 = "ce0aff0fd47b00803ea66278b3514dcf65ecb5547878f8081f7ec6c1f411ce10"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kab/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kab/thunderbird-68.12.0.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "a570fd29e5eacdc08ed484bce7336f90ae74744e80d8f2ac0f05395cb3363e51"; + sha256 = "3936b56eaa1e05a96626f7d10c8fcc3ba9014b1385b21243c049b133b923ddef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/kk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/kk/thunderbird-68.12.0.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "186b7457a96a64da0564c1b411bb04598de1067362a6238f7327abe780cc6aa3"; + sha256 = "7fa0aa64d0f0dcc6f71d6a21647cc4fccef935b783deb5d19b88f5b96b4b4ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ko/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ko/thunderbird-68.12.0.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3c9513362c6b7a64bf6e74bbfad6ef586b0085baeb9a8ad8eb2fbc73461e9f67"; + sha256 = "4bddd0ccb747bb12cdc6d88c2c9544354293000c586454bb5932f4d81afbf400"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/lt/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/lt/thunderbird-68.12.0.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "e90df1606ec0e875fa02f7bf5a52b14d84f758bdc18ab0f395703c0129a18e57"; + sha256 = "f1a3514188c1b887afd2c662a1b6abf6fe37b558864be0cc79e87ed147188461"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ms/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ms/thunderbird-68.12.0.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "ea686adcfb5cf4b1642e7dcb21053090ffb57d344b27269d807cebcf8469934c"; + sha256 = "7ea045d6db78ec7d6ebf164c8e3d28c2540a573238de518e934646573aec71dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nb-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nb-NO/thunderbird-68.12.0.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "6f827fee307917b590b99b5c85b16337865f027059f52bc9ab12da33f80448b9"; + sha256 = "d2c0e2099ea60b9da95ebd9bd79a5d0a6a1ebc84b8b490511a68c81355f97761"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nl/thunderbird-68.12.0.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "b88843831b982d1317e8bf64df99a8c7a1fa9f67461aa966b2737f12715c9cf3"; + sha256 = "48741be79422d80140ec862d004fa75a407f67490f67a3e440c01e0defe1f85f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/nn-NO/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/nn-NO/thunderbird-68.12.0.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "ab8383a432f55944d417108b59d891953f2d322ec81d09e971ec63d1883d4b46"; + sha256 = "b40f0d7112cadab322c8b71cacce5d6df87fb80f40cc55ca22c279016c3ea805"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pl/thunderbird-68.12.0.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "0f8c0feb68b090598a3db9295d4b4e09d9ffdedb69a73914228d7ef76b768414"; + sha256 = "e64b10526cb460f437427cc4a7ea90959cc693a75fd6a61b43e9d3fd76ded618"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-BR/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-BR/thunderbird-68.12.0.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "ca78fad9dce15534754571b14d82ede798b123210599ade352016420faf0db5a"; + sha256 = "bdb558f9430c06871954ec6c7d54267625184a0cba914a87ad199e8f32b03de2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/pt-PT/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/pt-PT/thunderbird-68.12.0.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "cf79430e02259d9117feeaebb5fe02139c3e3d95013e48fe290550814200cf6e"; + sha256 = "4631e8247446653e91f239fdb5ad3c8531f3d007dbdc83818178a4cdc525edf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/rm/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/rm/thunderbird-68.12.0.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "cc7d9614130f24969356b3496f4d322a9f73cafa5c7b60302ca8f2e2efe1f6ec"; + sha256 = "13e6aca7139fd89e83e7ae9b71253731f0954b0a83cc3560ecc00500b9bc1df7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ro/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ro/thunderbird-68.12.0.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "a8fcc2c6e0755fe701a56c2fa3bbf2d288d6351179ee74b8aa3da3180f14cdd1"; + sha256 = "023a567c42dad9bdbd465c8b99f12cf5f667ef4691e16971e09496c4a7db0f12"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/ru/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/ru/thunderbird-68.12.0.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "b9f68985e70f8aa47c36cd4a4fc0fb41918d43f089cc760ace8ec879e2561770"; + sha256 = "9ec35bbce5f026a4262a5d708b53a767f47ac8e90314513d36a587d1a49dbb6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/si/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/si/thunderbird-68.12.0.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "a2563b3c9d0ecb567c366aa41cb6a10bde8d09b8c1065cd3934c8c221afee056"; + sha256 = "c540b94a45deeddf1f7f5a8cca8de7e944ee8ad9f8595a308836c159901ec0b6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sk/thunderbird-68.12.0.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "566906f011283fd27abf55e1e9a1bf7504e4028f7c4a631716ba590c07fe9d91"; + sha256 = "5296241664023773d2c0c4fa55e74eb6470482389c834d1934c252f79e79ebff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sl/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sl/thunderbird-68.12.0.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "8b74b751b3ee706be9aeb06726ffd3a989a57a1dc9794112262fa2aac45498ad"; + sha256 = "cd0376137d8018875873332fdfae3bc3c0d6b2a2b881dfa970d7d7999e8b312b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sq/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sq/thunderbird-68.12.0.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "9f7bcc51d4bb3f7c8d6ae49c61b88c17a7a59f6de8d2f62e0ee3fb3a68d30791"; + sha256 = "6fbf47759ca8c4d7cf30ca3af8a3fd35a01b7738422d29448cfd9eed81eba49b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sr/thunderbird-68.12.0.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "809c22c379c0c9943acb23de8b7023843ad6ecfedb9cf89006d6889ac1214203"; + sha256 = "636708320247c7c45622fd9179d5689da97472a9308f11810623129cf5a0e8d7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/sv-SE/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/sv-SE/thunderbird-68.12.0.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "9381345ab9229f4b8465c183c936c17ab73680fa6aca27535daff9a2f9a133a3"; + sha256 = "9550c173b047e3ff774f4c3faf2c1f125b3abc34e6feb5801c108fda94e54e4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/tr/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/tr/thunderbird-68.12.0.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "0f08bc1e65a8bccf8765cf26af5c09ebf6b77ff463af2f8f133dd2499c1d935c"; + sha256 = "ffe82a300c7fa7a0e826d11613f5187c003b009efa29f4755f17af0f88d9e73b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uk/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uk/thunderbird-68.12.0.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "37a1fee3bcf2fca901c542295d01a32545e814217985414419a270ad9576c14c"; + sha256 = "b018769149c0a4ff323b90b5d51465733629e7c527b39381ba9696cb077ad767"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/uz/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/uz/thunderbird-68.12.0.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "50668670b10f3171b9033306d43c51ce24f1a48286c4156eff369530ae6d93d1"; + sha256 = "b0b59ac4d08c9f385f4ed7980065ce99ef24874734390a83af6e8fbd18173d99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/vi/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/vi/thunderbird-68.12.0.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "3588d2ed7c67459f5c091a1881821eaba72c9f3307624f7890549fcd1da120f6"; + sha256 = "901b40a99d84e7c7360fd5be6a14aa04ef6cc04fe1275cac26824b310bbd26e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-CN/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-CN/thunderbird-68.12.0.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "d8f2976535ef60e62c94338fd049365234a7b2a8658b32df231d1faa22529c0e"; + sha256 = "509478710f7c4fb404eec9fed0b6d22f4c5d76fee09ed833dffcefdacc53d55c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.11.0/linux-i686/zh-TW/thunderbird-68.11.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/68.12.0/linux-i686/zh-TW/thunderbird-68.12.0.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "aca4a8410429bde9926f6ce6a183439750f490fd68dda229531b2e16bb7068ef"; + sha256 = "a12dd777cc3eaf629cc7a6f4b8d4744cf63c3e778e559d9b3ce332414e509515"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 1e238bf8843..86dbf80a6e1 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.1.1"; + version = "78.2.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/af/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/af/thunderbird-78.2.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "540aa91a70379c4d6975820649abbe3063515bae031229f01ed7e794cf87395d"; + sha256 = "de73b113e488e76caca47b90abb4fa3f1c4d6ce04885d036f2e6aed81fe34038"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ar/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ar/thunderbird-78.2.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "18d1b4f33895b5c4b17199ca8412f8060f40660c7e45e024d0dda486ad290044"; + sha256 = "d6eeb95b1bd8e53663bd48570a0c2a03f570f906ca715ddf1d9f2cb8de37f3b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ast/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ast/thunderbird-78.2.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "dd87c494ef5f142517aeec3d8890bc553664b323f2cadb46bca597101b275c91"; + sha256 = "f244c41515a2382d15697a47b88781120c649e319d86a1c6350fd20cade25809"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/be/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/be/thunderbird-78.2.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "90e0d5354f41244e2ebaeeeb65959d64fcef52f914a15af7b9808125e6e25639"; + sha256 = "188c8850324bbc04535d4a1dfe1ef1f2e52de8cc2e1df7432623f6afcf8dbf1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/bg/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/bg/thunderbird-78.2.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "4e8f53fc2e1c3b8dddec3d62bfa104a458943c1b0794fcca3a1658b812359b97"; + sha256 = "3e7ab29fc795b577aa3bd2ac3df872c31a7ed22960e987d9bca6f348becb69a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/br/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/br/thunderbird-78.2.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "068c48e37b4d921cb33e2df27b32a8e9abfc29698c30779b1771f2ab61697f27"; + sha256 = "c1138c59275149aaa6071cf128e7b480b7f74fa0d8f237552a5c54ce1ae573e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ca/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ca/thunderbird-78.2.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1f09e12e53d7bc76551c47995b0fa5ff649db94013a66e4ee445e6901352ead6"; + sha256 = "4d18b0b11710ab3427bf917ebe17cdf5e98508f517cf5cc4c97822d42a019dd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cak/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cak/thunderbird-78.2.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "e917249cbc16e1ccaf630a5335577e76d971f422fb7c7d9b7c7f05805de18d78"; + sha256 = "5231c3b6c9b57ab528905184b740dd23de470f8bc4814a13000c8fc1fe4877cc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cs/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cs/thunderbird-78.2.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "89926439c396b64a701d688b2520eb1364e5f2a348a645651396e7f91a4b774a"; + sha256 = "04d1614000f1854b5d82e0d1740beb43ed9bef440b43f7bedce32cccec48fd59"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/cy/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/cy/thunderbird-78.2.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "65a124a1840efdc33b0426a0a8ab8426423425326f7905844c74f7503c6e60f4"; + sha256 = "0ef895fdc1878b77650846d2ea4624a50d06838a3c51a91523019bb4d00a1322"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/da/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/da/thunderbird-78.2.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "a572014192e6ba98994f8693b062400b7909bdcede065dd363a3ab182cf40293"; + sha256 = "e909f7ba1890cebcac435c2cfaab7db1791785e6b5b1e8b205ee3b9962624c8d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/de/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/de/thunderbird-78.2.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "a0eeef52d89bee326402354eb1de3f531c9c255d31840ed91e93110c9f170aaa"; + sha256 = "cce1e0acc3c61a66e5eaa065e81e01edb298b6dbf07a2376bf5a96ad2c1e784d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/dsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/dsb/thunderbird-78.2.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "35d0295ebd60415457a7defa40c5bdee2dbf40b08dad387aef0557dc511ce489"; + sha256 = "a5acad173a15e77e21057e7450d997387f88a608dd602df7509fa13743758445"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/el/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/el/thunderbird-78.2.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "135fe2424a1731e24c9602c40e0ae4f8fc551ed058fcd17516ce8f39a7d88bbe"; + sha256 = "7cb4dd233037415d9de96e0c292bd0a288ea62bc875b79a138aaf9639a8f8896"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-CA/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-CA/thunderbird-78.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "b5741a82e8d59300c1f2046b4a4deaa2804d90ad8e8cda7cda9a39b7d6293b87"; + sha256 = "158547432a7f38ab87ac5334b891921ef54f199896fe459cf65c81344d900edc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-GB/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-GB/thunderbird-78.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "61b0e85a24f56b1b7ad03e9d8206313d50cfc6480627cd377a4a4b1bfdd9f13a"; + sha256 = "1f434d2aa74143eb8695fe54f031fdc7270b1dfe7365896b08f9a55c9dcc8197"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/en-US/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/en-US/thunderbird-78.2.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9f0cc0edd2b23bc67824d3e8ed19b8c0a331e69a307b6d48c20e0e29e756e7e7"; + sha256 = "f5004ba1ac64911aec7dec3ec60a415500adfb0bfd566197f0f4fb139c71ff2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-AR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-AR/thunderbird-78.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b0390addfb6133074aab52d1b6b73eccb9fae9031967fc94d57f95be30cce54d"; + sha256 = "49063e6e19b9c4ee1cd63826fda1c969d9739759a57ffabba5e2f93fc11de06a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/es-ES/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/es-ES/thunderbird-78.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "4d9f115bba5f9f32247465398e8ccd2f279776fadc3961f79b9fcc923c9cc363"; + sha256 = "216fe2514dc21190532b19af814b825d8a39c7dfe91a120848491f98c49f8ec4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/et/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/et/thunderbird-78.2.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "6db8f8c69d8452e402724bf3fc6fb42242d2839307f6ad387f813a97286f4773"; + sha256 = "5a89262ffbdc536abf9d780d5d30ce7d0c626a4cf75bfe957689640f94323a34"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/eu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/eu/thunderbird-78.2.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "7c8165bc0a0feffd71431f3dd30ce99092a0816581363c2d317c6f40149234e1"; + sha256 = "f59c050361c617e4b2ca92f8e7081a135e976bb99ea4b650b80064aedef2c698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fa/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fa/thunderbird-78.2.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "9537892fa5e9ba5b3f79b96fafef1e8e37c4813f0515f965ce05b410bc7c9448"; + sha256 = "b9764595b4cb08584ccce801c08fa19dbbced21c3f89045800d83d531b0c825a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fi/thunderbird-78.2.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "31ca37c4d0f13d1a30b2d7541fa9fbe80add66c6d787bbec069cb904d1157e18"; + sha256 = "98169b3018a61ae6c2303300c1942c7d1d14a5318147a08a883b5a7b7042eba6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fr/thunderbird-78.2.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c7507fd9096e9c47632be197054be68631c9d1812b7242b4de06774dbc9c3b1b"; + sha256 = "49563e87d9543c52d33b7168c78adaab0483f14ceef22759541e927c13620657"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/fy-NL/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/fy-NL/thunderbird-78.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "0a3d9d62861eb11bf409ac20905e787fdb273dd1d74b754f10790ff7deb7160d"; + sha256 = "1f3444faf91c24f8608ec59a4f705b42c7520079e4ad6756e693e92cdc8b142d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ga-IE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ga-IE/thunderbird-78.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4bd0b50313e9a85a83d5b5a032710478feb2df52936bcdfd2621cf30a4d02efb"; + sha256 = "28b27f73016f0a4d53a6c47248c26458ca2bdceb46ae231f16086b8cabed5210"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gd/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gd/thunderbird-78.2.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "a72ed3ea99e863f4a6150cfeeaa0052adf84f8f5ad52388b8bc30bf15d58a310"; + sha256 = "b81b247ebecd1727d27b64f96ba08b08cf59921e9b2e8ae732407b27e233c971"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/gl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/gl/thunderbird-78.2.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "5d9bae1205ac9490821b1b6d5b700a540bccbb21a3d41943d7f3ccb8576e2087"; + sha256 = "ea019d11fed7d87173b218d86fcee0dea7d4e20200bc73171fa8c1bc8f7288fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/he/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/he/thunderbird-78.2.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "7cd6417391db27934b6945edcdd9d14b46a69052af7bccd5a62fed588c77894a"; + sha256 = "6308a7e4e2cc35e48bbd67a1a7b8ab37112f47ab228c703a6db681ac7af79cb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hr/thunderbird-78.2.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "b641cb7393e1e655adff946c82c43edf580e9fe3852b5c0cffe8f6d12759d190"; + sha256 = "3fb27f1e001817260981567fdb9949ad2f34818e9c919bd16fa0e939cf993cb4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hsb/thunderbird-78.2.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "39a27b797117eaed4e939e1c38ade2da13486f9050b5c4d87219cdd46abb67c4"; + sha256 = "2240e34fd713b39b410b584a8a6d06525f6abe0db2ee7b76b740a7252ec85e36"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hu/thunderbird-78.2.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "5c9795de2316add4e482f9e074c861ef2e05411ea3792d6256d3c43359dc692f"; + sha256 = "f303a1f1219c7b23d71471a00174e6084cee3773af72e855faa63a5384b08aee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/hy-AM/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/hy-AM/thunderbird-78.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "be1ba0a8fecf9a577cd63de519f92f48ddaf7c4b68fd629f94bb2ebff3cf16fb"; + sha256 = "3e74775e459ebdca2661e2e2f55307429dcc4d4a6623bbb8447946a75c94dd20"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/id/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/id/thunderbird-78.2.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "15eb3d6acda87645da2874cc92366fb50e821d7ec7885f87951366ddc66db2a0"; + sha256 = "0c9baf8cff28193f774e13c3a49cfd0ebcf27d8ef73ade151d2371ea69cbafac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/is/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/is/thunderbird-78.2.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "06549f464526e931f23c0925b402eb3da6fbd9bd16595387604fe7edc62c4672"; + sha256 = "5c505948333d9259d87aa5f2b53f33ade1bbbfd29b9d5438c2688d34891e29bf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/it/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/it/thunderbird-78.2.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "d81344b5dc0e131d1796f63de559a18b59dc70403a957eab737354ab05fd31c4"; + sha256 = "a99896e8ccf8d01099834ee502601cb9de993fd7101e426cb87c240a744f2f88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ja/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ja/thunderbird-78.2.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "48bd5534bfebd6c6f976ea4230ac7d364544c1467b2912f0db46fd23944d0908"; + sha256 = "83be10be5e946b785ac61e9a51c7054357c69af0a8e7bca524e27961dea4eef8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ka/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ka/thunderbird-78.2.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "8f581c4d9f6c2e8f79bf7be92bf06a69d0dfed017346e1c380a31f541c5155fa"; + sha256 = "585a1d805663225b1c154e27b54aa1aa5d8a1b96576c0f8ea36bde7844921474"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kab/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kab/thunderbird-78.2.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "2cbcf1e64dcb914af8dfa0f8dab462d59d37992b3f4e22159e2edd340cb6e73a"; + sha256 = "85128be7e4c28a526d0a395e38e86e5e85dc6c154be6b16fb2df6675effe3d0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/kk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/kk/thunderbird-78.2.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "1fd067e9751c60dc6c6dcf1e5cfee3650758ae6593cb20fa5e6103cd01e6e6b7"; + sha256 = "09538c022bbcfcb2a77a7ab11b5569eb56b483817d199cfd0ede68ad556601d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ko/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ko/thunderbird-78.2.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "efdd154ad42d1b8f257d0cf619afc4bdea44d7014882c82847cb5f21d7037469"; + sha256 = "3e6f472e69d40d46f388096e1d13bc6735860021fc655e3efd4e5b93b1a83240"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/lt/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/lt/thunderbird-78.2.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "4256ec374ea5a22553469393e7fde51b46cd2ade5a620e9b0fc442e9d524494f"; + sha256 = "8b85c0874306afd3a39d8cf851d378f5f1bfce74129b16b02230c516001adc92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ms/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ms/thunderbird-78.2.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "40f6fc9fb01a83288a6952b7a6e625bd00659594f7fa21ee883c16501407b8be"; + sha256 = "b14e7baa06a2d4f98313a7f363b0d998f902164abad13a992878812cc5a0b6c3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nb-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nb-NO/thunderbird-78.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "b3f363ccbc5946c6e0e87ca4b75e12e4e4372688ae7a034c9cf37fd401794840"; + sha256 = "c3718581db153ad8b171b3c454e9d156e3d55ff0969217ac36435d13ac0c7c3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nl/thunderbird-78.2.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "6963f3f09cf8a3370b06c894aa744c4ddbaa7c11df4e41f540a21427ec391135"; + sha256 = "802417acdc722e34c21936f840cd347ae86cf5ac8ad2ae05bd1e1ae078c4518c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/nn-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/nn-NO/thunderbird-78.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "da647b3c85db5ebbfbc530dd8d8fb1005928430775cd5c8a2999709614f4e35c"; + sha256 = "5034f1fe526cab8de8091d5f20851a678e742ed37fa80e8491f3891ed89c43a8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pa-IN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pa-IN/thunderbird-78.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9df18348eedd3b43a13ac991b875fe12678929faa58712b09ee7364a8dedbd2e"; + sha256 = "01ae1e84d990433b7cbb12dc637deec37b32998803cb60f5834d386e080505f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pl/thunderbird-78.2.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "7f60d5a0a819f6b69cd3f8444c12758f7cee17a681859c03cbea29ec27e1221e"; + sha256 = "84b877dba77c8be4400f4fc76128a85878781c4d8ff7845d265225211092674e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-BR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-BR/thunderbird-78.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "229073650b742b4566350ce82ea65f93f639a2b502bf706de4038c3c13ead354"; + sha256 = "4daabc0cad02b878d8e17af4402b6b52fdd7783f89192909a43bed09f8aae196"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/pt-PT/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/pt-PT/thunderbird-78.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "f8596511964a688747ce51cf0ca6bb6da65ea78b9b3ef70ced4f69fae8edbeb0"; + sha256 = "6ce92a7a1ea62398d22ee4e4fbdc383daa5d35d38c83cf1852953757563d17ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/rm/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/rm/thunderbird-78.2.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "fb101dae4058f2cf804aacaf60c1354415cb0287432bb367a83e2ef8109375ce"; + sha256 = "d876eb51534d8a5796b486f22f9602bcb9c4cd9c99042583f95c4464f7ee99f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ro/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ro/thunderbird-78.2.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "1cb1fc985122dea685fc1998764c60979a7c357d5e1e0646b8c4f45e856b4f00"; + sha256 = "ab4bfaea0914401188d486554963c9ab3014237e7116afdf274dce6e55725cae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/ru/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/ru/thunderbird-78.2.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "d89b9a418c78422e2a715e7e1c5d2bf57e90c2293ad63dc5e9f2645fdc910103"; + sha256 = "e722a13113896bde97dd72d0c7182c26734d7d546d8fe210bbce900854ac925c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/si/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/si/thunderbird-78.2.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "584cd0dca877163073824e9dfbee4d6146e0ef8bd0b23cd2325462a1a72a41a4"; + sha256 = "595588d25de16c3781c85a9ed5e3c767d4df85f0820d4503770468b1669e9411"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sk/thunderbird-78.2.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "cbb2b5678d11eef244a175d88207e00fc59584afd0b788a82319987368ff19c2"; + sha256 = "f30929cad216539754842c0d938b4d5b8ec5f4e813b3ff0d5108d9c4a0fc6df2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sl/thunderbird-78.2.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "e8727e9942c4555d6413a3ebe1d4b2ab2ea39da4f5b3b2ad7baaeb8abf49fd47"; + sha256 = "65d716b3fb5cad93d17704b62fd035a86ef6838cfff6ad95e571cedbb9e0974d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sq/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sq/thunderbird-78.2.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "31141f45121dab9c5ce3f3d6195264df91e61e434ee993c409c3cac164215737"; + sha256 = "38c652f6aae768ab7a8b0c1e975c676a3724ae22f5f7e3ffc6224ee032a9dc47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sr/thunderbird-78.2.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "dc9a868b1345da0633d090877ae6cddaa3a1b2bb1fc3113bc9de2aac1c30366c"; + sha256 = "7f73bcc8efb4452fedb0f9707c5e2b1d0db936fda4c6b9582207043aeddf8747"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/sv-SE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/sv-SE/thunderbird-78.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "fab7e11f8de1fcd2e8719d20e818d8bd2c39f7539328fb79f2cce56d4f312a78"; + sha256 = "221974d62563b49f6c030b7a1f6307a71e60ce2a0e107b551363621320bba485"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/th/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/th/thunderbird-78.2.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "fa3173940d4e7109385d65b479297110545cc7e2e76e8a657f376553e370563a"; + sha256 = "a8641ee0dc5bcd40ec84a4d4640e74e44710b5ac10d629ea0dd42ad2370e8d3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/tr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/tr/thunderbird-78.2.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "a8cf6b95a6b890892d034c0b014a62f710bbafa34f3282a80e17828ad9365513"; + sha256 = "1d80d967b5ef98f0e642390c55618d454f2d82acec36bfd56db21e872490ff66"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uk/thunderbird-78.2.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "a5086a87a87ccb605154aad5bc2986d6fe995391189b3e452640210e2016b08f"; + sha256 = "fcc24a9885db5511c0b2859e6472d436769da2670573177f7bf332fb363a3ee3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/uz/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/uz/thunderbird-78.2.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "b5bea650b678808b7fbcca432c1de0121dc19886b2f32e764e4fe1a797d1e8ab"; + sha256 = "b0f62e8fc5c6da398ad2e1a3488ddb37f0075c90ad54e6028293be7cfcd2f6f0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/vi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/vi/thunderbird-78.2.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "8b8b57417b1d6faeb283b1b6037eac92841029bd73769d5cb8bc6c227e87efbf"; + sha256 = "0e38a1b645894ff81a481250ed434157fa2b70792b423c31dab61288612a82f2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-CN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-CN/thunderbird-78.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "4a0c8629e2a5e5f95799169dba4ee9c10b728bf503e090ed829cdd11fbeb57d1"; + sha256 = "04f37793bd17df88573d9d3f8c8412c26cfb3332395689a06f5fca6efb02b2ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-x86_64/zh-TW/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-x86_64/zh-TW/thunderbird-78.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "11a892d8ec3ec6e2dccbad4b97ce2fe7cb0a0b1dc309bef9819432f0be9d510c"; + sha256 = "6c1e5b71bb2a9e005971050c9643c52090828e1ecb3910d66d2d0dbaa107011c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/af/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/af/thunderbird-78.2.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "a254eecebf45c16f55b7d72cc38da2c4d22f49704cdb5db72d2adfc199a7a78c"; + sha256 = "2601d98ad27a2ed7277f673876c2a7d206fe1cfd8c7c8febdead85884031a416"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ar/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ar/thunderbird-78.2.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "3e735d996bb3bf2674f1c04f035489893169ab632208af1427756bc3c15b1600"; + sha256 = "5d126b1152b42b6bd6c29ac602b59ab88f3491b0b6f2a69aa1e6ae3d9ded04d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ast/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ast/thunderbird-78.2.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a8fe0f85c250b0f71b0bac30cd51e10e5d1ded4265775afe93f986ccde4fbc49"; + sha256 = "7b22fbd980df00d6b1a2c0f14d68a3a7daf06dcb6a13033ca2619371b098445c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/be/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/be/thunderbird-78.2.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "279a98d38f6c33945ddd1e86c9263e72f9a52555e7f26c56a2f3062696436bbb"; + sha256 = "bd59d2a9e70944a736e8e5db100b2cbe937fb8021577fdd912087e2cbe38723f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/bg/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/bg/thunderbird-78.2.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "cb23b56841818af2e3e8dc922cace29c8538d22977ee951dee744bbc490c24a6"; + sha256 = "ce3906cafce8ce00c4b69f2b1b584f7e4148d2d40ac12916f1108f78d7d3cdae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/br/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/br/thunderbird-78.2.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "f729274b064205cb9baf57be3732268a2c56893ac6b17ae6ddc0aed3269fda15"; + sha256 = "2f41237e0dd3dff4e0e4b196f8d02b988d7e5db3ac1984ea5577ce5052d43514"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ca/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ca/thunderbird-78.2.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "eb434c12d8d841eb8426b95663591f742a9e62b630cadb7afebfa79ab1142a38"; + sha256 = "0ec94acd77cca38d37dd23fb240c3c9e3840defccb491704d01072c1cab1f543"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cak/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cak/thunderbird-78.2.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "daa19634d796f849ab9b3a575bc53e451453902f82ce7384a7ae5ae4f99a2165"; + sha256 = "1c77ebb51a83c57c7d81ef278f9fceae07f98330a8ccf8f863c2f0b613141e23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cs/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cs/thunderbird-78.2.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "181cc3c70985d41a806395b353ccd98475c37ae8151fd5f59adbe25bf2059457"; + sha256 = "adf8c11ff60e697fc5087698088c42c95a15766ccebf24d77141a53dc255c366"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/cy/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/cy/thunderbird-78.2.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "4cb93a1b38582e6fd4e4fc514c36e469b88bedf0bd36bee4d7a66d9c33c3c8ca"; + sha256 = "9b7c51652714c116c9bb22fab4f0fc6dcbce6ad2133cc860067898841d01b5b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/da/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/da/thunderbird-78.2.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "6eb46018b763d22e62739ec9dd98d5f3804f85b5b65ca3092c42d5d9a1a258ee"; + sha256 = "e7245ea0909efccaa9b94701061410437f16273c935484dd3638f5f4fa65aad9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/de/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/de/thunderbird-78.2.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "dff12cffa89c1ad5666b92b66361e17c604f0ca34305fb0e3b06be5fa8fb0f96"; + sha256 = "302394d24f919b0a24dc574001458b265bfc90024bf21b3d98a43b31ae50adf7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/dsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/dsb/thunderbird-78.2.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "efa2f9449703fc0941620650f1ca1332682b2866339413aa03f2438580d18f78"; + sha256 = "18ea8d27387581d49dd156957a089f1dbbe05f2772811aeddb1ebe81d26961e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/el/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/el/thunderbird-78.2.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "675cfc628dd02fe874a701e0e16986c797adac263605b304c1c69bb01552037f"; + sha256 = "bcec06d4b01268ca90d99a98a45c2ef5927ae4152b6b2d356332f3690de08f62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-CA/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-CA/thunderbird-78.2.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "a710c91df20b4b25d9e363b585344e1595ab96b9cc1df35e973e485834942957"; + sha256 = "475a1393917665c17bc5e787ef29dd886f1480d544f55d1caacb2a89503da685"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-GB/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-GB/thunderbird-78.2.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "3acd3020cb6116588a0f061aa9ba5d620477e3265eefac3dc22f4705757fe025"; + sha256 = "dda5664fd8d843f3f29b85b855d54e00d15188c57e80c01d79a8be0a2eaa0be1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/en-US/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/en-US/thunderbird-78.2.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "bf9ebc54aff457654b5ea1fc81437281f70d78de96d5a4d3586ae83fb8135d39"; + sha256 = "b299267b8a113dcd325bc6a928c561fe872535e1e876518e3075b85043aa7b23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-AR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-AR/thunderbird-78.2.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "cf1c278a36c9303956ac8dc29a51226a42ea17cf64559c34bef318c79ba6ed74"; + sha256 = "e3e7cb829b07b7db95cad09c8887b9c91123665cd4601b685e3c7a7b0036992d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/es-ES/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/es-ES/thunderbird-78.2.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "4a9356476a18f292f763f1647611189ebe89ee368a3f01a7c75ef8dce48d91af"; + sha256 = "be8428e1cce22aff5000bdc11f632adfc4c1096060a7456d36230ebd6040d12d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/et/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/et/thunderbird-78.2.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "03d3a43153b714f334a8f5d7d23e9080624488ec54400451b508c6aa50bcd594"; + sha256 = "deb81a63704b12ad2a945f5f0dcec878c3b7ec46f551f2d0122c03c52c031f73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/eu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/eu/thunderbird-78.2.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "a7cca16186f0e2627dc6e06164b3cb2bb691cf798f7c41378ae90349521d9199"; + sha256 = "8a2935dd5f83854b4d98bdab67e7b376a7e1d19a2ff790234516ba8211ed7345"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fa/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fa/thunderbird-78.2.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "6a19a79d409acdc25c69b5c8d75a18f2de665a7d18244d578e4ef0f65597daea"; + sha256 = "c39189bc1f740a1e5a372eaf3c6e99090f04ed8b1e86016c54ed25612d16f341"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fi/thunderbird-78.2.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "4b82f0fadfb5f388948e33fd3408e9f6ece6737c8e5e4b53c164a124f017e553"; + sha256 = "4f23c9941975e67e6e40d7a504a24e4058a27786c5989dd3e25cfc4fab4c4c0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fr/thunderbird-78.2.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bc4fb423664576d4d94eb24383e3f4f23c199e52f1c985fd3bfccc947212f82a"; + sha256 = "4de9885664bf4828355d09ceae11fc7cfb603d4514255b4de464c0653ddd45b0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/fy-NL/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/fy-NL/thunderbird-78.2.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6eb76c3a4d3b31160dc0d0b807596095354c7c0740f5593f86042af1e1b03d48"; + sha256 = "82ae68d970a02ad57aa9c3dfb6c1ef7783c25211e9228c0bad515c3fef385f88"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ga-IE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ga-IE/thunderbird-78.2.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "5321fff3eb4d341307233976de74624f6002abb8662f40ecbf77e3bdb5757add"; + sha256 = "e6035d81bfa5c58ab79e71b9895638f23e47e8ab2990794786c5e9f590bb70e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gd/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gd/thunderbird-78.2.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "515207242fffd0513a550017f8bfb53061f0a0e3d795a111adf0154b55363d38"; + sha256 = "2c628c5ed8ad0c00c42b384f8b925887e624f6a6dee69c86800a9b5137f04886"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/gl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/gl/thunderbird-78.2.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "84c32bd92a783c680343aa5b01dbf58e37eda9ee466b16f817a79a135e37fbe5"; + sha256 = "49b8e22610f8e602a3870f541209251b61da8cb81df7f0a762d01002fef568e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/he/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/he/thunderbird-78.2.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "96d07263578fb16068e0f48309552ea9237d3dd5a46fc63e3293326778cb7af1"; + sha256 = "5bb7193eb498d1edd713e18bbac630ba881b0a9b7fca9b05c9b8e4dd1ea1edbf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hr/thunderbird-78.2.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "9c612aad3a12530052dd609c2f20a3739c458b3c7f3d761e7c00754f9b43db95"; + sha256 = "c31022ae9a1665cc0b22ab0e911730ccf5cd0dd24614fbd8d3bd51624760baa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hsb/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hsb/thunderbird-78.2.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "376e4d8eadb9bb8f301053d30260ab0cbeb3dc9f590564583f07547585105fe0"; + sha256 = "3e286b3ccf66300ead4d6b98a88a370fa1bac96244b143005c4974f075ceca92"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hu/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hu/thunderbird-78.2.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "4e7e51dbbe359ec542e553f5b0691f1d191343261094828b2572dd5a03ec2c8a"; + sha256 = "6d0c88c46d0f4ffb296638e4e8217041d8fdaec3abaa6bda7b7cf97c4bcabc2a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/hy-AM/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/hy-AM/thunderbird-78.2.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "735624e30d1986d6c822fcbee4694389cf8a0061eba40926265bd4ac998e2186"; + sha256 = "aac23dfa8c299623bca2e3b0501a636c630fbf3f5b08689911569a568b3ad060"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/id/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/id/thunderbird-78.2.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ce6d668f38d1e74e7c8bbfc7408edc749eed9449908044bdd57b2dcd868cb89f"; + sha256 = "5bd5597cb6e91613a39c288d694f3af4f5686dcab1573e3b58c04dce3d1de865"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/is/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/is/thunderbird-78.2.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "589369ce68b6c78ad7753ddd14412eb68f438dbd7cae449f828288d25ee3f795"; + sha256 = "bcd926c704177945aa7b917fe12940e058d12e6cf8a3eedbf1ab205fb9c41b80"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/it/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/it/thunderbird-78.2.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "fd909d5aaa68a208050a0812f15024ef115b99fbde0edb0afe995c3b766c0d76"; + sha256 = "04ca02a4fed6e8d904173d9ce52c16e47d7e9b3d16f5483d986f8188ec79d65c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ja/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ja/thunderbird-78.2.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "160c2a1c36ef34339270abd59fed13b37414f8c37edd60463e0945e6751a0c74"; + sha256 = "1dbdc30ec3a06f2e7e7d38d9036fb90a2fdaad42356e9386ecc710d9a51f94b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ka/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ka/thunderbird-78.2.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "e822a28e62aae6d6e84e6788d5311af45396248f48cc60152b4273d75359dd8f"; + sha256 = "2db1fa86ac87e0b8001b99c0eea30589db515c58e10548565533014481b1be9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kab/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kab/thunderbird-78.2.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "2ea58cc79b80966b5bbc310fa32bd27621f95d4ffbd3646bf9e04f922c36ca6e"; + sha256 = "8499d0d8a0372617800b039c9198cc372783b8ff4ce385fc692e39b1dca22576"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/kk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/kk/thunderbird-78.2.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "a874bc02f065be73a54b70567b7a04be5fc6a9f766f3b054b12555763361ea2a"; + sha256 = "29b228042a7f06c22300b123cc0fcdf7a86005d0d4c3c282c97635ebc25ce826"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ko/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ko/thunderbird-78.2.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "d9678f72569dfde84544fcb9afa7cb8d5a4a35baa52d4e560aa2b082a418ab00"; + sha256 = "a7af79975107cb32b408c7dd26827793c3c11f998705bc711c60f3dd6b7a1173"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/lt/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/lt/thunderbird-78.2.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "1d7ec489dc52fae0f7597e40f8505bdd6a57a717389c75b66481749e85e2fab6"; + sha256 = "7a5010761d0af24a6852f32b1ebd6b543b1e1011888ded3f4a4297fc35f455b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ms/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ms/thunderbird-78.2.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "5d0c7cc00139c39a69dfc9ba1dc5c83b56973f26679860d048952bcf09baa737"; + sha256 = "8573dc35bd69ff20d05aa06484a2243f5a35ec78c1c31dbccc067f0cb9e6617a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nb-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nb-NO/thunderbird-78.2.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e72a25e7d53e6e0d470632c487d31e08afdb6c27543d50c93ff72ecac3f70bc6"; + sha256 = "722c0a4ce2a0d774f8971707ff553d9f2e62af10267ef491e670b020a2d8a49c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nl/thunderbird-78.2.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "19efd7323e671fe25b64ee44c85f698f608e6c2b18fdbfc9f0cc95b9cd8cd149"; + sha256 = "63a08123e795ab8e51a2c98f33b0b6424c1f5f2c09a5d1683585f9762813afaf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/nn-NO/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/nn-NO/thunderbird-78.2.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "b4be21281c6a13de05e5d0b96e43454bab662140a00d3837f609e23f14360c90"; + sha256 = "8968de35faf9fe304631ece4e08a9944342a08dc518ac1eec0ba2d5c1ff268ed"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pa-IN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pa-IN/thunderbird-78.2.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "f2795a504616404616f7d22022e105e9e4ea54025d60e262c405b867cb9c7936"; + sha256 = "57685a05321195019ef4d3c489dbb14ac0f1bd5ce51fda1f7573392de215e4e3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pl/thunderbird-78.2.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "52f80b074dc168ec00d0fd78f6376c1dfd357c2b7e7ed78bb1b9cf17536508a6"; + sha256 = "d98967c9d54f9314faae53472b9d1506576761cd3de09747d3b407e1f26931e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-BR/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-BR/thunderbird-78.2.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "d02867899a54eebffb2b6e600f7e6260b960d686a8bcd61ce705e9d0bbebe377"; + sha256 = "14fa89b2d8f659a90e19068130ce1a2da83137b7fb9a5a009d2363ccc2415009"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/pt-PT/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/pt-PT/thunderbird-78.2.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "659a7ff3a0dcbb4f3fec32eda6b5a2087191c8d49ea310662ad540433d869180"; + sha256 = "279f325e75157e0cedffe6a455e731373b077078f70b89bba76e12e2439350d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/rm/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/rm/thunderbird-78.2.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "d9ee3c5e3cf2d7eedced9d12bf4d499ae931c262be166af6a14bbd4a2538788a"; + sha256 = "7432093e7516625957c3dcb90e8668fab1e22c0edba0411e3e2106d49e052fdf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ro/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ro/thunderbird-78.2.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c3db9965a25d52d25cde0b52bffcc274ae32862fb29be368f27b102774d0971b"; + sha256 = "f5d5f564cf56c66d1f2f9717df7c7f021532dc1912384c9921ca286030f7d82c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/ru/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/ru/thunderbird-78.2.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "f0356ef5eadccfcdfc694d0bed9b1e4027e4883095f9c117403a68f1cb2810c8"; + sha256 = "4c4e31e74c4d10d88044fc49c24b3ae3ffb0b18e4a23295b60ac2d38d723753a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/si/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/si/thunderbird-78.2.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "5b5d17a2b098fbe1c2d8686ab0e1adb7c72efedc38365ca9b39b1e122302c85c"; + sha256 = "689be324633f6a872a09d6498d8772562dceca9bca96f7029830c965ad2e4138"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sk/thunderbird-78.2.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "b39bd41a38947ea467e1a89c5a173fd07cbce09562c10e6a60adb2150b04c9cf"; + sha256 = "194ff5a23a3a40ba98fb1968965c79f99246c6d93b81254d11df5d22530f1d86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sl/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sl/thunderbird-78.2.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "602e0feffc5b786930005c376ca3e8819b834a0cfc9a649bc46d86c27999144d"; + sha256 = "9746db435fe3dbf5ab51603780d52862a6afda0e40c1ebc915b309ac93e75e25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sq/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sq/thunderbird-78.2.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "fb265490d00c3a844f73e8f531b7c73f3787cb4e4ddc7cdcde72017fd7f3d612"; + sha256 = "86f675921cdf0de41855d5e2c3d2d56c163d915ac8a0f8cc9678d1a55f87e069"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sr/thunderbird-78.2.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "1574eaee6effc4df2c88fc94597e295f352455a9f68501080385c08cb4ab7e35"; + sha256 = "587e4c867dd43621c8e5e04461c4a2dcf2b0f256476b5b72d8fc6722e573e347"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/sv-SE/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/sv-SE/thunderbird-78.2.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "8d55df4937fe28f7b9d0fcaebcde3fb9650de9f0b74f677111f339ae2365b822"; + sha256 = "a46294d3dafc8bfaaa7f5376c2db2402f31f24664e73045c653ea8660079b879"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/th/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/th/thunderbird-78.2.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "6a872a6c332c7b3bfc24721bf1114c85475a73ae5c7b16d8637b0eb0045e112d"; + sha256 = "6105278c11c3e586240d50c9612730e75caecd08765b5b5cfe010f37d71c971d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/tr/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/tr/thunderbird-78.2.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "26d2b8493a1508591b45f9ecc43598e244856c0d9bc3c185721a7239679c4e63"; + sha256 = "4bdd2c91e8f361d1b2ade88cec06accb244adf3d7f1d714feea3e4004ed31968"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uk/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uk/thunderbird-78.2.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "ddb4b5fab55ded8f7bc2ae914f41af42b3b69c738727b055efd5e05b253ac872"; + sha256 = "40e2012a5b5dc05cb887a6c4cbb0c8f7bbc25cebd2de1247e5e8dc355cad78fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/uz/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/uz/thunderbird-78.2.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "dce93fab320f90ece938ae2b2343c1d27a1143b0183318a9d9e0cbbcfb607982"; + sha256 = "15f4aafba6b2bcb102683d9a665d208ab21c5767cf6d59c45d996fa26ef1e12a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/vi/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/vi/thunderbird-78.2.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "cf1b4f96ef1a510d21b232e748ace6e567d27e382393a7d7f51ab392f026d55c"; + sha256 = "32640a1c8e42cc79774a3b75539010dfb65e32c703992001eb03916d4fb46e91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-CN/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-CN/thunderbird-78.2.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "574acd0743a1202b6629883618278eb3ce113c518bc9c39f3d90e2dc12d4f644"; + sha256 = "09b52b6ebf0033738444bacfb53b84b1c98f7d3e10b32c001356083afbe4e89e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.1.1/linux-i686/zh-TW/thunderbird-78.1.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.2.1/linux-i686/zh-TW/thunderbird-78.2.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "51ccc5a4696841b3391a5dd9fb9ff1f55a9f6ccd6fbd86587ffb86c5f664f10f"; + sha256 = "606e416a158023f674eda141bf67f9b3956e3e231ba85605173d73cad0d22a59"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/68.nix b/pkgs/applications/networking/mailreaders/thunderbird/68.nix index 3143c7f62bb..fef707b7293 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/68.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/68.nix @@ -71,13 +71,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "68.11.0"; + version = "68.12.0"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1rdxizg1mpagh17fhnrbkilyv1i2zfcr6z62jf3ng31ns94za9kdg9f580srkp63png67jaj3b1kc33v5vb8wavl09n5d38g113x2m9"; + "33350vjgzvsg6sdhdld92z75k1xcf1wmngdcvzsj4f3y3aal73pyw03mlvgg6y36bm0j8fhaxvgbbg5zm7hxhn779z78970m4v9amg7"; }; nativeBuildInputs = [ @@ -307,7 +307,7 @@ stdenv.mkDerivation rec { # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? postFixup = '' local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul + patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 53d337067d7..7a10c7f1d2a 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -69,13 +69,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.1.1"; + version = "78.2.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "1lf15zl3p8y1vxv4s04y088flkspf0r0c6j8gfrlfzla5ckfcsbad3zbygh6y73m35j882g7fbacby5a4hiw891zq2kji5dn3nbahyi"; + "2iya9a5qaini524wrdrnxx6wsrgb8fa2b1m42mlypskxjjgb7n66vpxlbpi9x9mqzc63ca2ag36fjpbpsvbv5ppxvpfwk2j1zbfvb5w"; }; nativeBuildInputs = [ @@ -301,7 +301,7 @@ stdenv.mkDerivation rec { # package a Thunderbird >=71.0 since XUL shouldn't be anymore (in use)? postFixup = '' local xul="$out/lib/thunderbird/libxul.so" - patchelf --set-rpath "${libnotify}/lib:${systemd.lib}/lib:$(patchelf --print-rpath $xul)" $xul + patchelf --set-rpath "${libnotify}/lib:${lib.getLib systemd}/lib:$(patchelf --print-rpath $xul)" $xul ''; doInstallCheck = true; diff --git a/pkgs/applications/networking/modem-manager-gui/default.nix b/pkgs/applications/networking/modem-manager-gui/default.nix index 38662bf7f69..64b1be363f3 100644 --- a/pkgs/applications/networking/modem-manager-gui/default.nix +++ b/pkgs/applications/networking/modem-manager-gui/default.nix @@ -1,15 +1,14 @@ { stdenv , pkgconfig , python3 -, fetchhg -, fetchpatch +, fetchFromGitLab , gtk3 , glib , gdbm , gtkspell3 , ofono , itstool -, libappindicator-gtk3 +, libayatana-appindicator-gtk3 , perlPackages , glibcLocales , meson @@ -18,22 +17,16 @@ stdenv.mkDerivation rec { pname = "modem-manager-gui"; - version = "0.0.19.1"; + version = "0.0.20"; - src = fetchhg { - url = "https://linuxonly@bitbucket.org/linuxonly/modem-manager-gui"; - rev = "version ${version}"; - sha256 = "11iibh36567814h2bz41sa1072b86p1l13xyj670pwkh9k8kw8fd"; + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "modem-manager-gui"; + rev = "upstream%2F${version}"; + sha256 = "1pjx4rbsxa7gcs628yjkwb0zqrm5xq8pkmp0cfk4flfk1ryflmgr"; }; - patches = [ - # Fix docs build - (fetchpatch { - url = "https://bitbucket.org/linuxonly/modem-manager-gui/commits/68fb09c12413b7de9b7477cbf4241c3527568325/raw"; - sha256 = "033nrlhjlk0zvadv5g9n2id53ajagswf77mda0ixnrskyi7wiig7"; - }) - ]; - nativeBuildInputs = [ pkgconfig python3 @@ -49,7 +42,7 @@ stdenv.mkDerivation rec { gdbm gtkspell3 ofono - libappindicator-gtk3 + libayatana-appindicator-gtk3 ]; postPatch = '' @@ -66,7 +59,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://linuxonly.ru/page/modem-manager-gui"; license = licenses.gpl3; - maintainers = with maintainers; [ ahuzik ]; + maintainers = with maintainers; [ ahuzik galagora ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix index e21cd5b3f0f..ee5ea9d7e03 100644 --- a/pkgs/applications/networking/msmtp/default.nix +++ b/pkgs/applications/networking/msmtp/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation rec { pname = "msmtp"; - version = "1.8.11"; + version = "1.8.12"; src = fetchurl { url = "https://marlam.de/${pname}/releases/${pname}-${version}.tar.xz"; - sha256 = "0q0fg235qk448l1xjcwyxr7vcpzk6w57jzhjbkb0m7nffyhhypzj"; + sha256 = "0m33m5bc7ajmgy7vivnzj3mhybg37259hx79xypj769kfyafyvx8"; }; patches = [ diff --git a/pkgs/applications/networking/mullvad-vpn/default.nix b/pkgs/applications/networking/mullvad-vpn/default.nix index 265c8add278..aa7aaab29ac 100644 --- a/pkgs/applications/networking/mullvad-vpn/default.nix +++ b/pkgs/applications/networking/mullvad-vpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, fetchurl, dpkg +{ stdenv, lib, makeWrapper, fetchurl, dpkg , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype , gdk-pixbuf, glib, gnome2, pango, nspr, nss, gtk3 , xorg, autoPatchelfHook, systemd, libnotify, libappindicator @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { unpackPhase = "dpkg-deb -x $src ."; - runtimeDependencies = [ systemd.lib libnotify libappindicator ]; + runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ]; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/ncgopher/default.nix b/pkgs/applications/networking/ncgopher/default.nix new file mode 100644 index 00000000000..2e5e840d50d --- /dev/null +++ b/pkgs/applications/networking/ncgopher/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, pkg-config +, ncurses6 +, openssl +, sqlite +}: + +rustPlatform.buildRustPackage rec { + pname = "ncgopher"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "jansc"; + repo = "ncgopher"; + rev = "v${version}"; + sha256 = "1mv89sanmr49b9za95jl5slpq960b246j2054r8xfafzqmbp44af"; + }; + + cargoSha256 = "12r4vgrg2bkr3p61yxcsg02kppg84vn956l0v1vb08i94rxzc8zk"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ + ncurses6 + openssl + sqlite + ]; + + meta = with lib; { + description = "A gopher and gemini client for the modern internet"; + homepage = "https://github.com/jansc/ncgopher"; + license = licenses.bsd2; + maintainers = with maintainers; [ shamilton ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/networking/nextdns/default.nix b/pkgs/applications/networking/nextdns/default.nix index e6bb229b118..de3ff40e43c 100644 --- a/pkgs/applications/networking/nextdns/default.nix +++ b/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "15xw8d6b9rv0lalzfllixm8n89clz9j8ag1gk4r16k7yv5l6xrpd"; + sha256 = "001swxmf7ga2g0ri3gsnwvgjcarwdhfg476ymblg34kk9wclidmy"; }; vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj"; diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index a487da6f5ad..d990dfb39d2 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "owncloud-client"; - version = "2.5.4.11654"; + version = "2.6.3.14058"; src = fetchurl { url = "https://download.owncloud.com/desktop/stable/owncloudclient-${version}.tar.xz"; - sha256 = "0gsnry0786crbnpgg3f1vcqw6mwbz6svhm6mw3767qi4lb33jm31"; + sha256 = "1xcklhvbyg34clm9as2rjnjfwxpwq77lmdxj6qc0w7q43viqvlz3"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/networking/p2p/tixati/default.nix b/pkgs/applications/networking/p2p/tixati/default.nix index 2e14bd0eb0f..f8a70d322f0 100644 --- a/pkgs/applications/networking/p2p/tixati/default.nix +++ b/pkgs/applications/networking/p2p/tixati/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tixati"; - version = "2.73"; + version = "2.74"; src = fetchurl { url = "https://download2.tixati.com/download/tixati-${version}-1.x86_64.manualinstall.tar.gz"; - sha256 = "1ncrfc4wgf02la2h3zpdcz07b980n9232lg5f62q7ab79fjrcrfr"; + sha256 = "1slsrqv97hnj1vxx3hw32dhqckbr05w622samjbrimh4dv8yrd29"; }; installPhase = '' diff --git a/pkgs/applications/networking/p2p/tremc/default.nix b/pkgs/applications/networking/p2p/tremc/default.nix new file mode 100644 index 00000000000..37f2a3584ee --- /dev/null +++ b/pkgs/applications/networking/p2p/tremc/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, python3Packages +, x11Support ? !stdenv.isDarwin +, xclip ? null +, pbcopy ? null +, useGeoIP ? false # Require /var/lib/geoip-databases/GeoIP.dat +}: +let + wrapperPath = with stdenv.lib; makeBinPath ( + optional x11Support xclip ++ + optional stdenv.isDarwin pbcopy + ); +in +python3Packages.buildPythonPackage rec { + version = "0.9.1"; + pname = "tremc"; + + src = fetchFromGitHub { + owner = "tremc"; + repo = pname; + rev = "0.9.1"; + sha256 = "1yhwvlcyv1s830p5a7q5x3mkb3mbvr5cn5nh7y62l5b6iyyynlvm"; + }; + + buildInputs = with python3Packages; [ + python + wrapPython + ]; + + pythonPath = with python3Packages; [ + ipy + pyperclip + ] ++ + stdenv.lib.optional useGeoIP GeoIP; + + phases = [ "unpackPhase" "installPhase" ]; + + makeWrapperArgs = ["--prefix PATH : ${wrapperPath}"]; + + installPhase = '' + make DESTDIR=$out install + wrapPythonPrograms + ''; + + meta = with stdenv.lib; { + description = "Curses interface for transmission"; + homepage = "https://github.com/tremc/tremc"; + license = licenses.gpl3; + }; +} diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/applications/networking/remote/citrix-workspace/generic.nix index 36ae194a165..c19cb585952 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/applications/networking/remote/citrix-workspace/generic.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { openssl' pango speex - systemd.lib + (lib.getLib systemd) stdenv.cc.cc xorg.libXaw xorg.libXmu diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index a857abcfed1..9c3ed826a2d 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.5.6"; + version = "15.8.3"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "12dzrg9qf5gj9srv482n3jsjar8jhs3s5kkp6v5pvfp8kbmwcbib"; + sha256 = "1c947yxgs0mv5x6qvy40dypbbhhjbglma1pwl66z39gzg51n2dmc"; }; unpackPhase = '' diff --git a/pkgs/applications/networking/scaleft/default.nix b/pkgs/applications/networking/scaleft/default.nix index 864f10553ee..b1a754193eb 100644 --- a/pkgs/applications/networking/scaleft/default.nix +++ b/pkgs/applications/networking/scaleft/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "scaleft"; - version = "1.45.3"; + version = "1.45.4"; src = fetchurl { url = "http://pkg.scaleft.com/rpm/scaleft-client-tools-${version}-1.x86_64.rpm"; - sha256 = "02hsn64kg22pgga5ldjwhnqc6jq8w03mwf40dfanln1qz38x9nx1"; + sha256 = "1yskybjba9ljy1wazddgrm7a4cc72i1xbk7sxnjpcq4hdy3b50l0"; }; nativeBuildInputs = [ patchelf rpmextract ]; diff --git a/pkgs/applications/networking/seafile-client/default.nix b/pkgs/applications/networking/seafile-client/default.nix index 0893ee21a55..69b7b432b0a 100644 --- a/pkgs/applications/networking/seafile-client/default.nix +++ b/pkgs/applications/networking/seafile-client/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "seafile-client"; - version = "7.0.7"; + version = "7.0.9"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile-client"; rev = "v${version}"; - sha256 = "0szdyprljyckmbrw5sypizs22j96q84ak6nyidyr2j6gf4grh9mg"; + sha256 = "0pcn6lfzma2hvpwsp9q0002wvym7zabpp8fvq29l101gzirn79m9"; }; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/networking/termius/default.nix b/pkgs/applications/networking/termius/default.nix index 2019e1c2b81..9ce2f1fcfd1 100644 --- a/pkgs/applications/networking/termius/default.nix +++ b/pkgs/applications/networking/termius/default.nix @@ -5,6 +5,7 @@ , makeDesktopItem , makeWrapper , stdenv +, lib , udev , wrapGAppsHook }: @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { cp "${desktopItem}/share/applications/"* "$out/share/applications" ''; - runtimeDependencies = [ udev.lib ]; + runtimeDependencies = [ (lib.getLib udev) ]; postFixup = '' makeWrapper $out/opt/Termius/termius-app $out/bin/termius-app \ diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 6915be9b6d6..40c4b77f1b6 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -7,7 +7,7 @@ knotifications, knotifyconfig, kparts, ktextwidgets, kwallet, kwidgetsaddons, kwindowsystem, kxmlgui, sonnet, threadweaver, kcontacts, akonadi, akonadi-calendar, akonadi-contacts, - eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, libgit2, libodfgen, + eigen, git, gsl, ilmbase, kproperty, kreport, lcms2, marble, pcre, libgit2, libodfgen, librevenge, libvisio, libwpd, libwpg, libwps, okular, openexr, openjpeg, phonon, poppler, pstoedit, qca-qt5, vc # TODO: package Spnav, m2mml LibEtonyek, Libqgit2 @@ -15,18 +15,14 @@ mkDerivation rec { pname = "calligra"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0w782k0hprpb6viixnqz34sp0z5csv3prdby46z22qqkcipcs638"; + sha256 = "sha256-flViKGZdeeZ8Bi/RFz1mdvCw187v3W4bC8+aeB6nCVE="; }; - patches = [ ./qt5_11.patch ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ extra-cmake-modules kdoctools makeWrapper ]; + nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ boost qtwebkit qtx11extras shared-mime-info @@ -35,7 +31,7 @@ mkDerivation rec { kjobwidgets kcmutils kdelibs4support kio kross knotifications knotifyconfig kparts ktextwidgets kwallet kwidgetsaddons kwindowsystem kxmlgui sonnet threadweaver kcontacts akonadi akonadi-calendar akonadi-contacts - eigen git gsl ilmbase kproperty kreport lcms2 marble libgit2 libodfgen librevenge + eigen git gsl ilmbase kproperty kreport lcms2 marble pcre libgit2 libodfgen librevenge libvisio libwpd libwpg libwps okular openexr openjpeg phonon poppler qca-qt5 vc ]; @@ -43,13 +39,10 @@ mkDerivation rec { NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; - postInstall = '' - for i in $out/bin/*; do - wrapProgram $i \ - --prefix PATH ':' "${pstoedit.out}/bin" \ - --prefix XDG_DATA_DIRS ':' "${breeze-icons}/share" - done - ''; + qtWrapperArgs = [ + "--prefix PATH : ${lib.getBin pstoedit}/bin" + "--prefix XDG_DATA_DIRS : ${breeze-icons}/share" + ]; meta = with lib; { description = "A suite of productivity applications"; @@ -64,7 +57,5 @@ mkDerivation rec { maintainers = with maintainers; [ phreedom ebzzry zraexy ]; platforms = platforms.linux; license = with licenses; [ gpl2 lgpl2 ]; - hydraPlatforms = []; - broken = true; # fails to start, kde home not found }; } diff --git a/pkgs/applications/office/espanso/default.nix b/pkgs/applications/office/espanso/default.nix index 04a40875f79..889f363dfb9 100644 --- a/pkgs/applications/office/espanso/default.nix +++ b/pkgs/applications/office/espanso/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "espanso"; - version = "0.6.3"; + version = "0.7.0"; src = fetchFromGitHub { owner = "federico-terzi"; repo = pname; rev = "v${version}"; - sha256 = "1x5p7hniapggqd18rx26mjvdf33z7rm7zz5vsqm2siv3mcl19033"; + sha256 = "11xdnn1iwpx58s3wvjb6dkgfc6dzsblzb6fngc0np5vx8r2pccpg"; }; - cargoSha256 = "0liwwdncymjql5dw7rwhhimcr7qdbyvfgmsd0bawvi0ym7m1v408"; + cargoSha256 = "1yjpqjfrixscg52yhalybgp734w3sdqg5hxka8ppcvz7lp3w5b1s"; nativeBuildInputs = [ extra-cmake-modules diff --git a/pkgs/applications/office/flexibee/default.nix b/pkgs/applications/office/flexibee/default.nix index 452fc7aecdb..f33eb98a48b 100644 --- a/pkgs/applications/office/flexibee/default.nix +++ b/pkgs/applications/office/flexibee/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, makeWrapper, jre }: let - version = "2020.2.1.2"; + version = "2020.2.3.1"; majorVersion = builtins.substring 0 6 version; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.flexibee.eu/download/${majorVersion}/${version}/${pname}-${version}.tar.gz"; - sha256 = "1a382lwyscvl5gdax5vs0shzmbnhjgggrv0hcwid8kf2s98diw5n"; + sha256 = "05wzg7f6mzz7r6azzb8k2g5fakkqh6762y4q9qkmrzbixvxh4lz9"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/office/gnumeric/default.nix b/pkgs/applications/office/gnumeric/default.nix index 40351ba64a1..b0609863c5a 100644 --- a/pkgs/applications/office/gnumeric/default.nix +++ b/pkgs/applications/office/gnumeric/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, perlPackages +{ stdenv, fetchurl, pkg-config, intltool, perlPackages , goffice, gnome3, wrapGAppsHook, gtk3, bison, python3Packages , itstool }: @@ -7,16 +7,16 @@ let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { pname = "gnumeric"; - version = "1.12.47"; + version = "1.12.48"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1khrf72kiq50y8b5prbj2207k9shn36h2b2i588cc4wa28s9y5a0"; + sha256 = "14556b0vyxdvdwjlin0rv7jk0vq4nplbmvp9j89bhkfk84xf7k2p"; }; configureFlags = [ "--disable-component" ]; - nativeBuildInputs = [ pkgconfig intltool bison itstool wrapGAppsHook ]; + nativeBuildInputs = [ pkg-config intltool bison itstool wrapGAppsHook ]; # ToDo: optional libgda, introspection? buildInputs = [ diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index 73f50998f63..310f57d7cda 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.47.0"; + version = "0.48.0"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0l328wvikdmm2i0kbpv9qwd0mkbs24y89cgfg28swhcvpywjpk36"; + sha256 = "12skl08isz2f1a6ksmcw7sm82xk909y636ch8jp80lglb21i0q1j"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index d9f901ff463..634a696a73e 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -1,14 +1,26 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage +, fetchurl -callPackage ./generic.nix (args // rec { - pname = "freeoffice"; + # This is a bit unusual, but makes version and hash easily + # overridable. This is useful when the upstream archive was replaced + # and nixpkgs is not in sync yet. +, officeVersion ? { version = "976"; edition = "2018"; + sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl"; +} + +, ... } @ args: + +callPackage ./generic.nix (args // rec { + inherit (officeVersion) version edition; + + pname = "freeoffice"; suiteName = "FreeOffice"; src = fetchurl { + inherit (officeVersion) sha256; url = "https://www.softmaker.net/down/softmaker-freeoffice-${version}-amd64.tgz"; - sha256 = "13yh4lyqakbdqf4r8vw8imy5gwpfva697iqfd85qmp3wimqvzskl"; }; archive = "freeoffice${edition}.tar.lzma"; diff --git a/pkgs/applications/office/softmaker/softmaker_office.nix b/pkgs/applications/office/softmaker/softmaker_office.nix index 39a6c9288b4..6aaa8c6745a 100644 --- a/pkgs/applications/office/softmaker/softmaker_office.nix +++ b/pkgs/applications/office/softmaker/softmaker_office.nix @@ -1,14 +1,27 @@ -{ callPackage, fetchurl, ... } @ args: +{ callPackage +, fetchurl + + # This is a bit unusual, but makes version and hash easily + # overridable. This is useful when people have an older version of + # Softmaker Office or when the upstream archive was replaced and + # nixpkgs is not in sync yet. +, officeVersion ? { + version = "1018"; + edition = "2021"; + sha256 = "1g9mcn0z7s3xw7d5bcjxbnamh6knzndcysahydskfcds6czdxg0c"; +} + +, ... } @ args: callPackage ./generic.nix (args // rec { + inherit (officeVersion) version edition; + pname = "softmaker-office"; - version = "1016"; - edition = "2021"; suiteName = "SoftMaker Office"; src = fetchurl { + inherit (officeVersion) sha256; url = "https://www.softmaker.net/down/softmaker-office-${edition}-${version}-amd64.tgz"; - sha256 = "0s8kzpc6w2cjkfqmhb2p1pkmkiq9vk9gnc7z2992kijaf9bwk3qz"; }; archive = "office${edition}.tar.lzma"; diff --git a/pkgs/applications/office/todo.txt-cli/default.nix b/pkgs/applications/office/todo.txt-cli/default.nix index d711440fc34..489b759f48c 100644 --- a/pkgs/applications/office/todo.txt-cli/default.nix +++ b/pkgs/applications/office/todo.txt-cli/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl }: let - version = "2.11.0"; + version = "2.12.0"; in stdenv.mkDerivation { pname = "todo.txt-cli"; inherit version; src = fetchurl { url = "https://github.com/ginatrapani/todo.txt-cli/releases/download/v${version}/todo.txt_cli-${version}.tar.gz"; - sha256 = "0majx8lcvhh8ji54qi0sxr833wchdss95fjc92byd8g3lfz27rsz"; + sha256 = "0gni8nj3wwdf7nl98d1bpx064bz5xari65hb998qqr92h0n9pnp6"; }; installPhase = '' diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index c0690415d67..567508c3675 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -35,11 +35,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.88"; + version = "5.0.89"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "19r9jmakr04raqripfnqm2b9gwpi52lklrrqgqyb1x35a4xvnj62"; + sha256 = "18p4qnnfx9f2frk7f2nk1d7jr4cjzg9z7lfzrk7vq11qgbjdpqbl"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix index 377619f5088..8fb719567d5 100644 --- a/pkgs/applications/radio/chirp/default.nix +++ b/pkgs/applications/radio/chirp/default.nix @@ -4,11 +4,11 @@ }: python2.pkgs.buildPythonApplication rec { pname = "chirp-daily"; - version = "20200430"; + version = "20200807"; src = fetchurl { url = "https://trac.chirp.danplanet.com/chirp_daily/daily-${version}/${pname}-${version}.tar.gz"; - sha256 = "060fzplgmpfrk6wkfaasx7phpfk90mmylk6drbwzk4f9r1655vda"; + sha256 = "60b682793698e6427ad485546eae3a044b8290a220f190633158a2fb0e942fa0"; }; propagatedBuildInputs = with python2.pkgs; [ diff --git a/pkgs/applications/radio/fldigi/default.nix b/pkgs/applications/radio/fldigi/default.nix index b4815803ccd..af93b7ee65d 100644 --- a/pkgs/applications/radio/fldigi/default.nix +++ b/pkgs/applications/radio/fldigi/default.nix @@ -2,12 +2,12 @@ libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "4.1.13"; + version = "4.1.14"; pname = "fldigi"; src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0mlq4z5k3h466plij8hg9xn5xbjxk557g4pw13cplpf32fhng224"; + sha256 = "0hr6xbv01xf7z4r2jxxhn8xjdmca2198q4m9glh4877dllvfq6xj"; }; buildInputs = [ libXinerama gettext hamlib fltk14 libjpeg libpng portaudio diff --git a/pkgs/applications/radio/inspectrum/default.nix b/pkgs/applications/radio/inspectrum/default.nix index a205cec714d..f55c78ea26b 100644 --- a/pkgs/applications/radio/inspectrum/default.nix +++ b/pkgs/applications/radio/inspectrum/default.nix @@ -8,20 +8,21 @@ , gnuradio , liquid-dsp , qtbase +, wrapQtAppsHook }: -mkDerivation { +mkDerivation rec { pname = "inspectrum"; - version = "unstable-2017-05-31"; + version = "0.2.2"; src = fetchFromGitHub { owner = "miek"; repo = "inspectrum"; - rev = "a89d1337efb31673ccb6a6681bb89c21894c76f7"; - sha256 = "1fvnr8gca25i6s9mg9b2hyqs0zzr4jicw13mimc9dhrgxklrr1yv"; + rev = "v${version}"; + sha256 = "1a517y7s1xi66y5kjrpjay450pad9nc228pa8801mxq1c7m1lamm"; }; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig wrapQtAppsHook ]; buildInputs = [ fftwFloat boost diff --git a/pkgs/applications/radio/noaa-apt/default.nix b/pkgs/applications/radio/noaa-apt/default.nix new file mode 100644 index 00000000000..55703ea44d6 --- /dev/null +++ b/pkgs/applications/radio/noaa-apt/default.nix @@ -0,0 +1,64 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, atk +, cairo +, gdk-pixbuf +, glib +, gtk3 +, openssl +, pango +}: + +rustPlatform.buildRustPackage rec { + pname = "noaa-apt"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "martinber"; + repo = "noaa-apt"; + rev = "v${version}"; + sha256 = "0fqki4a9c54rixdz5bpswvn433f9saw6yazgw4av3xdd7g2fdvvj"; + }; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + atk + cairo + gdk-pixbuf + glib + gtk3 + openssl + pango + ]; + + cargoSha256 = "1pzcq31inazmc9cz31fspzqkp0lpkjid8ai3g17sin1pfzby5jlh"; + + preBuild = '' + # Used by macro pointing to resource location at compile time. + export NOAA_APT_RES_DIR=$out/share/noaa-apt + ''; + + postInstall = '' + # Resources. + mkdir -p $out/share/noaa-apt + cp -R $src/res/* $out/share/noaa-apt/ + + # Desktop icon. + install -Dm644 -t $out/share/applications $src/debian/ar.com.mbernardi.noaa-apt.desktop + install -Dm644 -t $out/share/icons/hicolor/48x48/apps $src/debian/noaa-apt.png + install -Dm644 -t $out/share/icons/hicolor/scalable/apps $src/debian/noaa-apt.svg + ''; + + meta = with lib; { + description = "NOAA APT image decoder."; + homepage = "http://noaa-apt.mbernardi.com.ar/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ trepetti ]; + changelog = "https://github.com/martinber/noaa-apt/releases/tag/v${version}"; + }; +} diff --git a/pkgs/applications/science/biology/igv/default.nix b/pkgs/applications/science/biology/igv/default.nix index aa6c95071b7..bc4f1677fc9 100644 --- a/pkgs/applications/science/biology/igv/default.nix +++ b/pkgs/applications/science/biology/igv/default.nix @@ -1,32 +1,34 @@ -{ stdenv, fetchurl, unzip, jre }: +{ stdenv, fetchzip, jdk11 }: stdenv.mkDerivation rec { pname = "igv"; - version = "2.4.19"; - - src = fetchurl { - url = "https://data.broadinstitute.org/igv/projects/downloads/2.4/IGV_${version}.zip"; - sha256 = "048dgrhxcb854d24kyjkqz12bw04bsv49i5jawb75yzkswwfkb0z"; + version = "2.8.9"; + src = fetchzip { + url = "https://data.broadinstitute.org/igv/projects/downloads/2.8/IGV_${version}.zip"; + sha256 = "1874w1xprv91caz1ymfxilq6inhj36xzx8j9m0mcyp0qfvfvyjp7"; }; - buildInputs = [ unzip jre ]; - installPhase = '' mkdir -pv $out/{share,bin} cp -Rv * $out/share/ sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igv.sh - sed -i 's#java#${jre}/bin/java#g' $out/share/igv.sh + sed -i 's#java#${jdk11}/bin/java#g' $out/share/igv.sh + + sed -i "s#prefix=.*#prefix=$out/share#g" $out/share/igvtools + sed -i 's#java#${jdk11}/bin/java#g' $out/share/igvtools ln -s $out/share/igv.sh $out/bin/igv + ln -s $out/share/igvtools $out/bin/igvtools chmod +x $out/bin/igv + chmod +x $out/bin/igvtools ''; meta = with stdenv.lib; { homepage = "https://www.broadinstitute.org/igv/"; description = "A visualization tool for interactive exploration of genomic datasets"; - license = licenses.lgpl21; + license = licenses.mit; platforms = platforms.unix; maintainers = [ maintainers.mimame ]; }; diff --git a/pkgs/applications/science/chemistry/marvin/default.nix b/pkgs/applications/science/chemistry/marvin/default.nix index 88a55b52b5c..e8cd077afd2 100644 --- a/pkgs/applications/science/chemistry/marvin/default.nix +++ b/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.16.0"; + version = "20.17.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "0wfg5zd8dvjy6x6al58jd5d53gar3ds326q3b6771h5p5jzv0x2g"; + sha256 = "0ip6ma9ivk5b74s9najn2rrkiha7hya1rjhgyrc71kwsj5gqgli0"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix index b7ab5fa70d9..2fd4c122041 100644 --- a/pkgs/applications/science/electronics/kicad/base.nix +++ b/pkgs/applications/science/electronics/kicad/base.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { i18n = libraries.i18n; pname = "kicad-base"; - version = "${versions.${baseName}.kicadVersion.version}"; + version = "${builtins.substring 0 10 versions.${baseName}.kicadVersion.src.rev}"; src = fetchFromGitLab ( { diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index a8340a2c22c..e5ce1f0092e 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -9,7 +9,7 @@ , oceSupport ? false, opencascade , withOCCT ? true, opencascade-occt , ngspiceSupport ? true, libngspice -, scriptingSupport ? false, swig, python3 +, scriptingSupport ? true, swig, python3 , debug ? false, valgrind , with3d ? true , withI18n ? true diff --git a/pkgs/applications/science/electronics/kicad/libraries.nix b/pkgs/applications/science/electronics/kicad/libraries.nix index 4dde2a0a122..91ce30de5f0 100644 --- a/pkgs/applications/science/electronics/kicad/libraries.nix +++ b/pkgs/applications/science/electronics/kicad/libraries.nix @@ -15,7 +15,9 @@ let mkLib = name: stdenv.mkDerivation { pname = "kicad-${name}"; - version = "${version}"; + # Use the revision instead of `version` (which is an ISO 8601 date) + # to prevent duplicating the library when just the date changed + version = "${builtins.substring 0 10 libSources.${name}.rev}"; src = fetchFromGitHub ( { owner = "KiCad"; @@ -50,7 +52,7 @@ in i18n = let name = "i18n"; in stdenv.mkDerivation { pname = "kicad-${name}"; - version = "${version}"; + version = "${builtins.substring 0 10 libSources.${name}.rev}"; src = fetchFromGitLab ( { group = "kicad"; diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 7299e8ee907..d001cc43367 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -27,25 +27,25 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2020-07-21"; + version = "2020-08-22"; src = { - rev = "9a801d8b72f24e297a7d9d6e8cee2eef6cab2988"; - sha256 = "0yilmmng7y3rz1bxw2b0s0aqs8hdqr7ach2r45bx8v1f4bih4ka9"; + rev = "a2341f0f335b0abb9fc8cb86d19cbe6f9b38fade"; + sha256 = "0167yb39f800xarq3khn7sbdkgcx9j2ayhy8c7lhhks6kh7459g0"; }; }; libVersion = { - version = "2020-07-21"; + version = "2020-08-22"; libSources = { - i18n.rev = "a311975d139caf8be9848dd613a9800570adc245"; - i18n.sha256 = "1bkn2hhwcg8xdpn9yfm9nnqsg02c1nizhpxd4yhpxgifhh4psz1g"; - symbols.rev = "18572c4c118fe8ef779edf3131eebf2c33c6fa46"; - symbols.sha256 = "0hqx0aznzrnlbdkpsnl8mbs9bdgiv029d6zjh10nyjzcw27q3hxz"; + i18n.rev = "cbbb1efd940094bf0c3168280698b2b059a8c509"; + i18n.sha256 = "1q4jakn6m8smnr2mg7jgb520nrb6fag9mdvlcpx3smp3qbxka818"; + symbols.rev = "9ca6a5348cdeb88e699582d4ed051ff7303b44d3"; + symbols.sha256 = "13w6pb34rhz96rnar25z7kiscy6q1fm8l39hq1bpb8g9yn86ssz4"; templates.rev = "ae16953b81055855bcede4a33305413599d86a15"; templates.sha256 = "1pkv90p3liy3bj4nklxsvpzh9m56p0k5ldr22armvgqfaqaadx9v"; - footprints.rev = "4835f80b4a52256aa7a3eb650e6e0fef33a77d0d"; - footprints.sha256 = "00rc6phxmkry35i0xzry14axvh2akvvkly45s3xxi06vaydaw7i5"; - packages3d.rev = "9b560cf94a35b692ca516d37bdaf392ce10e549d"; - packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; + footprints.rev = "f94c2d5d619d16033f69a555b449f59604d97865"; + footprints.sha256 = "1g71sk77jvqaf9xvgq6dkyvd9pij2lb4n0bn0dqnwddhwam935db"; + packages3d.rev = "f699b0e3c13fe75618086913e39279c85da14cc7"; + packages3d.sha256 = "0m5rb5axa946v729z35ga84in76y4zpk32qzi0hwqx957zy72hs9"; }; }; }; diff --git a/pkgs/applications/science/electronics/openhantek6022/default.nix b/pkgs/applications/science/electronics/openhantek6022/default.nix index 5a70831d824..ad8fa3c7a7a 100644 --- a/pkgs/applications/science/electronics/openhantek6022/default.nix +++ b/pkgs/applications/science/electronics/openhantek6022/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "openhantek6022"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "OpenHantek"; repo = "OpenHantek6022"; rev = version; - sha256 = "17b0qmz7g0nk7n7jhbh5xhs135dpj9kv41n42vvpdzwr6z5rk4qm"; + sha256 = "104j7d3i5y6jd20c2z3l10sr6sgdy8iki3g9mlwhddnr8x6nzc03"; }; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/electronics/verilator/default.nix b/pkgs/applications/science/electronics/verilator/default.nix index 0613e22bbda..9c59ad3a394 100644 --- a/pkgs/applications/science/electronics/verilator/default.nix +++ b/pkgs/applications/science/electronics/verilator/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl, perl, flex, bison }: +{ stdenv, fetchurl +, perl, flex, bison +}: stdenv.mkDerivation rec { pname = "verilator"; - version = "4.036"; + version = "4.040"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "1sy02pgq3kvk8548l57hsh08vfbqdg8dghj8mwlybdi8fdjz4z1h"; + sha256 = "1qy0wllsmxva3c838spxwmacxx36r3njxwhgp172m4l3829785bf"; }; enableParallelBuilding = true; - buildInputs = [ perl flex bison ]; + buildInputs = [ perl ]; + nativeBuildInputs = [ flex bison ]; - meta = { + # these tests need some interpreter paths patched early on... + doCheck = false; + checkTarget = "test"; + + meta = with stdenv.lib; { description = "Fast and robust (System)Verilog simulator/compiler"; homepage = "https://www.veripool.org/wiki/verilator"; - license = stdenv.lib.licenses.lgpl3; - platforms = stdenv.lib.platforms.unix; - maintainers = with stdenv.lib.maintainers; [ thoughtpolice ]; + license = licenses.lgpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index e396f1c4a91..519b1f98138 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -2,29 +2,27 @@ let pname = "alt-ergo"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "https://alt-ergo.ocamlpro.com/http/alt-ergo-${version}/alt-ergo-${version}.tar.gz"; - sha256 = "130hisjzkaslygipdaaqib92spzx9rapsd45dbh5ssczjn5qnhb9"; + sha256 = "124k2a4ikk4wdpmvgjpgl97x9skvr9qznk8m68dzsynzpv6yksaj"; }; - preConfigure = "patchShebangs ./configure"; - nativeBuildInputs = [ which ]; in let alt-ergo-lib = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-lib"; - inherit version src preConfigure nativeBuildInputs; + inherit version src nativeBuildInputs; configureFlags = pname; propagatedBuildInputs = with ocamlPackages; [ num ocplib-simplex stdlib-shims zarith ]; }; in let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { pname = "alt-ergo-parsers"; - inherit version src preConfigure nativeBuildInputs; + inherit version src nativeBuildInputs; configureFlags = pname; buildInputs = with ocamlPackages; [ menhir ]; propagatedBuildInputs = [ alt-ergo-lib ] ++ (with ocamlPackages; [ camlzip psmt2-frontend ]); @@ -32,7 +30,7 @@ let alt-ergo-parsers = ocamlPackages.buildDunePackage rec { ocamlPackages.buildDunePackage { - inherit pname version src preConfigure nativeBuildInputs; + inherit pname version src nativeBuildInputs; configureFlags = pname; diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix index d2e49d81783..a12d75eabbe 100644 --- a/pkgs/applications/science/logic/isabelle/default.nix +++ b/pkgs/applications/science/logic/isabelle/default.nix @@ -3,18 +3,18 @@ stdenv.mkDerivation rec { pname = "isabelle"; - version = "2018"; + version = "2020"; dirname = "Isabelle${version}"; src = if stdenv.isDarwin then fetchurl { - url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg"; - sha256 = "0jwnvsf5whklq14ihaxs7b9nbic94mm56nvxljrdbvl6y628j9r5"; + url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_macos.tar.gz"; + sha256 = "1sfr5filsaqj93g5y4p9n8g5652dhr4whj25x4lifdxr2pp560xx"; } else fetchurl { url = "https://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz"; - sha256 = "1928lwrw1v1p9s23kix30ncpqm8djmrnjixj82f3ni2a8sc3hrsp"; + sha256 = "1bibabhlsvf6qsjjkgxcpq3cvl1z7r8yfcgqbhbvsiv69n3gyfk3"; }; buildInputs = [ perl polyml z3 ] @@ -42,14 +42,14 @@ stdenv.mkDerivation rec { ML_SOURCES="\$POLYML_HOME/src" EOF - cat >contrib/jdk/etc/settings <<EOF + cat >contrib/jdk*/etc/settings <<EOF ISABELLE_JAVA_PLATFORM=${stdenv.system} ISABELLE_JDK_HOME=${java} EOF echo ISABELLE_LINE_EDITOR=${rlwrap}/bin/rlwrap >>etc/settings - for comp in contrib/jdk contrib/polyml-* contrib/z3-*; do + for comp in contrib/jdk* contrib/polyml-* contrib/z3-*; do rm -rf $comp/x86* done '' + (if ! stdenv.isLinux then "" else '' @@ -66,7 +66,7 @@ stdenv.mkDerivation rec { bin/isabelle install $out/bin ''; - meta = { + meta = with stdenv.lib; { description = "A generic proof assistant"; longDescription = '' @@ -74,9 +74,9 @@ stdenv.mkDerivation rec { to be expressed in a formal language and provides tools for proving those formulas in a logical calculus. ''; - homepage = "http://isabelle.in.tum.de/"; - license = "LGPL"; - maintainers = [ stdenv.lib.maintainers.jwiegley ]; - platforms = stdenv.lib.platforms.linux; + homepage = "https://isabelle.in.tum.de/"; + license = licenses.bsd3; + maintainers = [ maintainers.jwiegley ]; + platforms = platforms.linux; }; } diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index 224795f2a66..32a75cabc13 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.18.4"; + version = "3.19.0"; src = fetchFromGitHub { owner = "leanprover-community"; repo = "lean"; rev = "v${version}"; - sha256 = "1pmc2wi1pa346w89ayrrjv9xk6v6myg2zmx1wj4pd9qxv7ivrbsn"; + sha256 = "1dybq6104vc62x620izgblfd8dqc4ynaiw8ml07km78lq38anm6v"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/science/logic/mcy/default.nix b/pkgs/applications/science/logic/mcy/default.nix index bbdcacf2b50..eba910e07eb 100644 --- a/pkgs/applications/science/logic/mcy/default.nix +++ b/pkgs/applications/science/logic/mcy/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation { pname = "mcy"; - version = "2020.07.06"; + version = "2020.08.03"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "mcy"; - rev = "6e8433ed9acbface5e080719110a957d89d849df"; - sha256 = "1vbzg0rgmf7kp735m6p4msxc51vpsrdwk24ir7z0zxsb8lv53gg7"; + rev = "62048e69df13f8e03670424626755ae8ef4c36ff"; + sha256 = "15xxgzx1zxzx5kshqyrxnfx33cz6cjzxcdcn6z98jhs9bwyvf96f"; }; buildInputs = [ python ]; diff --git a/pkgs/applications/science/logic/symbiyosys/default.nix b/pkgs/applications/science/logic/symbiyosys/default.nix index b3ae4580256..9cf8b0845d4 100644 --- a/pkgs/applications/science/logic/symbiyosys/default.nix +++ b/pkgs/applications/science/logic/symbiyosys/default.nix @@ -1,20 +1,20 @@ { stdenv, fetchFromGitHub , bash, python3, yosys -, yices, boolector, aiger +, yices, boolector, z3, aiger }: stdenv.mkDerivation { pname = "symbiyosys"; - version = "2020.07.03"; + version = "2020.08.22"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "SymbiYosys"; - rev = "06e80194c77f5cc38c6999b1d3047a2d6ca82e15"; - sha256 = "1hl03qy98pgq24ijyimf9pf7qxp42l7cki66wx48jys4m1s6n8v9"; + rev = "33b0bb7d836fe2a73dc7b10587222f2a718beef4"; + sha256 = "03rbrbwsji1sqcp2yhgbc0fca04zsryv2g4izjhdzv64nqjzjyhn"; }; - buildInputs = [ python3 ]; + buildInputs = [ ]; patchPhase = '' patchShebangs . @@ -26,14 +26,15 @@ stdenv.mkDerivation { # Fix various executable references substituteInPlace sbysrc/sby_core.py \ --replace '"/usr/bin/env", "bash"' '"${bash}/bin/bash"' \ - --replace ': "btormc"' ': "${boolector}/bin/btormc"' \ - --replace ': "yosys"' ': "${yosys}/bin/yosys"' \ - --replace ': "yosys-smtbmc"' ': "${yosys}/bin/yosys-smtbmc"' \ - --replace ': "yosys-abc"' ': "${yosys}/bin/yosys-abc"' \ - --replace ': "aigbmc"' ': "${aiger}/bin/aigbmc"' \ + --replace ', "btormc"' ', "${boolector}/bin/btormc"' \ + --replace ', "aigbmc"' ', "${aiger}/bin/aigbmc"' + + substituteInPlace sbysrc/sby_core.py \ + --replace '##yosys-program-prefix##' '"${yosys}/bin/"' ''; buildPhase = "true"; + installPhase = '' mkdir -p $out/bin $out/share/yosys/python3 @@ -43,6 +44,10 @@ stdenv.mkDerivation { chmod +x $out/bin/sby ''; + doCheck = false; # not all provers are yet packaged... + checkInputs = [ python3 yosys boolector yices z3 aiger ]; + checkPhase = "make test"; + meta = { description = "Tooling for Yosys-based verification flows"; homepage = "https://symbiyosys.readthedocs.io/"; diff --git a/pkgs/applications/science/math/R/default.nix b/pkgs/applications/science/math/R/default.nix index 52da3b4a1ac..717b240c1cc 100644 --- a/pkgs/applications/science/math/R/default.nix +++ b/pkgs/applications/science/math/R/default.nix @@ -12,11 +12,11 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { - name = "R-4.0.0"; + name = "R-4.0.2"; src = fetchurl { url = "https://cran.r-project.org/src/base/R-4/${name}.tar.gz"; - sha256 = "0h1995smlyiyhx7gpg9paxsfqrcn6g9bbp5h9r47i6an3clv1gh6"; + sha256 = "0xdy3dy2bzdiba8z94hjykyra8si8a5q15s0bri7c26scjrymg6k"; }; dontUseImakeConfigure = true; diff --git a/pkgs/applications/science/math/mathematica/l10ns.nix b/pkgs/applications/science/math/mathematica/l10ns.nix index c75c91be059..8ec6ac5048d 100644 --- a/pkgs/applications/science/math/mathematica/l10ns.nix +++ b/pkgs/applications/science/math/mathematica/l10ns.nix @@ -8,6 +8,12 @@ let allVersions = with lib; flip map # N.B. Versions in this list should be ordered from newest to oldest. [ { + version = "12.1.1"; + lang = "en"; + language = "English"; + sha256 = "02mk8gmv8idnakva1nc7r7mx8ld02lk7jgsj1zbn962aps3bhixd"; + } + { version = "12.1.0"; lang = "en"; language = "English"; diff --git a/pkgs/applications/science/math/nasc/default.nix b/pkgs/applications/science/math/nasc/default.nix index 002acbf3875..9d14df5a798 100644 --- a/pkgs/applications/science/math/nasc/default.nix +++ b/pkgs/applications/science/math/nasc/default.nix @@ -1,7 +1,9 @@ { stdenv , fetchFromGitHub -, fetchpatch , pkgconfig +, python3 +, meson +, ninja , vala , gtk3 , glib @@ -9,52 +11,67 @@ , libsoup , gtksourceview , libgee -, cmake +, nix-update-script +, webkitgtk , libqalculate -, cln +, intltool +, gnuplot , wrapGAppsHook }: stdenv.mkDerivation rec { pname = "nasc"; - version = "0.5.4"; + version = "0.7.5"; src = fetchFromGitHub { owner = "parnold-x"; repo = pname; rev = version; - sha256 = "036v3dx8yasp19j88lflibqnpfi5d0nk7qkcnr80zn1lvawf4wgn"; + sha256 = "kSRc5RLkI6SBJirUYw6swZi8IJhaL3y74b2Zw8kh2XA="; + fetchSubmodules = true; }; - patches = [ - # fix build with gcc9 - (fetchpatch { - url = "https://github.com/parnold-x/nasc/commit/46b9b80e228b6b86001bded45d85e073a9411549.patch"; - sha256 = "1sm2aw0xhw2chk036r231nmp2f2ypxcmzggwljkn7wfzgg3h1mx3"; - }) - ]; - nativeBuildInputs = [ - cmake - vala + glib # post_install.py + gtk3 # post_install.py + intltool # for libqalculate + meson + ninja pkgconfig + python3 + vala wrapGAppsHook ]; buildInputs = [ - cln - libsoup - gtk3 glib + gtk3 gtksourceview libgee - libqalculate pantheon.elementary-icon-theme pantheon.granite - ]; + webkitgtk + # We add libqalculate's runtime dependencies because nasc has it as a modified subproject. + ] ++ libqalculate.buildInputs ++ libqalculate.propagatedBuildInputs; + + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + + # patch subproject. same code in libqalculate expression + substituteInPlace subprojects/libqalculate/libqalculate/Calculator-plot.cc \ + --replace 'commandline = "gnuplot"' 'commandline = "${gnuplot}/bin/gnuplot"' \ + --replace '"gnuplot - ' '"${gnuplot}/bin/gnuplot - ' + ''; + + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; meta = with stdenv.lib; { - description = "Do maths like a normal person"; + description = "Do maths like a normal person, designed for elementary OS"; longDescription = '' It’s an app where you do maths like a normal person. It lets you type whatever you want and smartly figures out what is math and @@ -63,7 +80,7 @@ stdenv.mkDerivation rec { the equations it’s used in. ''; homepage = "https://github.com/parnold-x/nasc"; - maintainers = with maintainers; [ samdroid-apps ]; + maintainers = pantheon.maintainers; platforms = platforms.linux; license = licenses.gpl3Plus; }; diff --git a/pkgs/applications/science/math/nauty/default.nix b/pkgs/applications/science/math/nauty/default.nix index c1d408213b9..d75fc9731cd 100644 --- a/pkgs/applications/science/math/nauty/default.nix +++ b/pkgs/applications/science/math/nauty/default.nix @@ -10,15 +10,13 @@ stdenv.mkDerivation rec { sha256 = "1nym0p2djws8ylkpr0kgpxfa6fxdlh46cmvz0gn5vd02jzgs0aww"; }; outputs = [ "out" "dev" ]; - configureFlags = { + configureFlags = [ # Prevent nauty from sniffing some cpu features. While those are very # widely available, it can lead to nasty bugs when they are not available: # https://groups.google.com/forum/#!topic/sage-packaging/Pe4SRDNYlhA - default = [ "--disable-clz" "--disable-popcnt" ]; - westmere = [ "--disable-clz" ]; - sandybridge = [ "--disable-clz" ]; - ivybridge = [ "--disable-clz" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} or []; + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-popcnt" + "--${if stdenv.hostPlatform.sse4_aSupport then "enable" else "disable"}-clz" + ]; installPhase = '' mkdir -p "$out"/{bin,share/doc/nauty} "$dev"/{lib,include/nauty} diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index d1ab05d4cde..df622e7303d 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -12,7 +12,11 @@ stdenv.mkDerivation rec { }; patchPhase = '' + # The gnome-search-provider2.c file generated by gdbus-codegen depends + # on gio-unix-2.0, which is a Requires.private of gtk+-3.0, + # and private dependencies are dropped in our default patched pkg-config. # https://github.com/Qalculate/qalculate-gtk/pull/178 + # https://github.com/NixOS/nixpkgs/issues/292 substituteInPlace configure.ac --replace 'libxml-2.0' 'libxml-2.0 gio-unix-2.0' # https://github.com/Qalculate/qalculate-gtk/pull/179 diff --git a/pkgs/applications/science/math/rofi-calc/default.nix b/pkgs/applications/science/math/rofi-calc/default.nix index 84adb2358d2..40b2711ff65 100644 --- a/pkgs/applications/science/math/rofi-calc/default.nix +++ b/pkgs/applications/science/math/rofi-calc/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "rofi-calc"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "046x2zpvza7n0m81s75qkvmnpkvsvvyqqqjxcqzj7by0llpqs7wa"; + sha256 = "0vwb9c3xvd2cms6cw8j8parg7w4bsxvvrd1wgggr8sz2p8rrvy5p"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index a6afc95ac09..7a81a0d679a 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "wxmaxima"; - version = "20.04.0"; + version = "20.06.6"; src = fetchFromGitHub { owner = "wxMaxima-developers"; repo = "wxmaxima"; rev = "Version-${version}"; - sha256 = "0vrjxzfgmjdzm1rgl0crz4b4badl14jwh032y3xkcdvjl5j67lp3"; + sha256 = "054f7n5kx75ng5j20rd5q27n9xxk03mrd7sbxyym1lsswzimqh4w"; }; buildInputs = [ wxGTK maxima gnome3.adwaita-icon-theme ]; diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index d23728a060f..b34220c2635 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "fossil"; - version = "2.11.1"; + version = "2.12.1"; src = fetchurl { urls = @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { "https://www.fossil-scm.org/index.html/uv/fossil-src-${version}.tar.gz" ]; name = "${pname}-${version}.tar.gz"; - sha256 = "1sxq1hn87fdikhbg9y3v4sjy4gxaifnx4dig8nx6xwd5mm7z74dk"; + sha256 = "00v6gmn2wpfms5jzf103hkm5s8i3bfs5mzacmznlhdzdrzzjc8w2"; }; buildInputs = [ zlib openssl readline sqlite which ed ] diff --git a/pkgs/applications/version-management/gerrit/default.nix b/pkgs/applications/version-management/gerrit/default.nix index 6412a6da9a6..5b4808e87a6 100644 --- a/pkgs/applications/version-management/gerrit/default.nix +++ b/pkgs/applications/version-management/gerrit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "gerrit"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war"; - sha256 = "08i6rb8hawj44gg57mbhwjjmfn7mc45racl8gjsyrcyb8jm6zj1s"; + sha256 = "0hdxbn5qqqjzpqfcydz33nc351zanxp0j2k0ivizx4dn40fnavd7"; }; buildCommand = '' diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 41ef3cce465..657ae4605eb 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -98,7 +98,7 @@ let git-fame = callPackage ./git-fame {}; - git-fast-export = callPackage ./fast-export { }; + git-fast-export = callPackage ./fast-export { mercurial = mercurial_4; }; git-filter-repo = callPackage ./git-filter-repo { pythonPackages = python3Packages; diff --git a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix index 22009f10d44..80f048d0575 100644 --- a/pkgs/applications/version-management/git-and-tools/fast-export/default.nix +++ b/pkgs/applications/version-management/git-and-tools/fast-export/default.nix @@ -1,13 +1,14 @@ -{stdenv, fetchgit, mercurial, makeWrapper}: +{stdenv, fetchFromGitHub, git, mercurial, makeWrapper}: stdenv.mkDerivation rec { pname = "fast-export"; - version = "190107"; + version = "200213"; - src = fetchgit { - url = "git://repo.or.cz/fast-export.git"; + src = fetchFromGitHub { + owner = "frej"; + repo = pname; rev = "v${version}"; - sha256 = "14azfps9jd5anivcvfwflgsvqdyy6gm9jy284kzx2ng9f7871d14"; + sha256 = "0hzyh66rlawxip4n2pvz7pbs0cq82clqv1d6c7hf60v1drjxw287"; }; buildInputs = [mercurial.python mercurial makeWrapper]; @@ -27,11 +28,34 @@ stdenv.mkDerivation rec { for script in $out/bin/*.sh; do wrapProgram $script \ - --prefix PATH : "${mercurial.python}/bin":$libexec \ + --prefix PATH : "${git}/bin":"${mercurial.python}/bin":$libexec \ --prefix PYTHONPATH : "${mercurial}/${mercurial.python.sitePackages}":$sitepackagesPath done ''; + doInstallCheck = true; + # deliberately not adding git or hg into installCheckInputs - package should + # be able to work without them in runtime env + installCheckPhase = '' + mkdir repo-hg + pushd repo-hg + ${mercurial}/bin/hg init + echo foo > bar + ${mercurial}/bin/hg add bar + ${mercurial}/bin/hg commit --message "baz" + popd + + mkdir repo-git + pushd repo-git + ${git}/bin/git init + ${git}/bin/git config core.ignoreCase false # for darwin + $out/bin/hg-fast-export.sh -r ../repo-hg/ --hg-hash + for s in "foo" "bar" "baz" ; do + (${git}/bin/git show | grep $s > /dev/null) && echo $s found + done + popd + ''; + meta = with stdenv.lib; { description = "Import mercurial into git"; homepage = "https://repo.or.cz/w/fast-export.git"; diff --git a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index 76c991f2283..a7d8080708e 100644 --- a/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.3"; + version = "2.15.4"; src = fetchPypi { inherit pname version; - sha256 = "0kpfi1w1jnn7v7mny71jil3sc9mm08lz47l9v3hzgs5z3ham98jb"; + sha256 = "0n2lrsjs3flfv7650yfhck1c96wkn41cv49440m7csy5yw16zlim"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json index fe211d1b87f..9389934ffc6 100644 --- a/pkgs/applications/version-management/gitlab/data.json +++ b/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.0.12", - "repo_hash": "0m9pn1alxdib9ppf878wf186bvn0llik7vcpqijzcdzc18q9cldq", + "version": "13.0.14", + "repo_hash": "15is18x631ifsj4iwmrs1s9lc3i99hwsxxf5v42qldbmsys31l1k", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.0.12-ee", + "rev": "v13.0.14-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.0.12", + "GITALY_SERVER_VERSION": "13.0.14", "GITLAB_PAGES_VERSION": "1.18.0", "GITLAB_SHELL_VERSION": "13.2.0", "GITLAB_WORKHORSE_VERSION": "8.31.2" } -} +} \ No newline at end of file diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix index 5f3fa345d85..84cf1e500a2 100644 --- a/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -19,14 +19,14 @@ let }; }; in buildGoPackage rec { - version = "13.0.12"; + version = "13.0.14"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "00jzrib8f51b3wkl0zy9a9cr5j9kp6cmm49vxm27zgxpyz8k1axw"; + sha256 = "16ynkwiv0faa60msashj5w1bc4rdh7yv2qjmpcbf7dwq54gqmlbv"; }; # Fix a check which assumes that hook files are writeable by their diff --git a/pkgs/applications/version-management/sparkleshare/default.nix b/pkgs/applications/version-management/sparkleshare/default.nix new file mode 100644 index 00000000000..d4ae8a95b3e --- /dev/null +++ b/pkgs/applications/version-management/sparkleshare/default.nix @@ -0,0 +1,87 @@ +{ + appindicator-sharp, + coreutils, + fetchFromGitHub, + git, + glib, + gtk-sharp-3_0, + lib, + makeWrapper, + meson, + mono, + ninja, + notify-sharp, + openssh, + openssl, + pkg-config, + stdenv, + symlinkJoin, + webkit2-sharp, + xdg_utils, +}: + +stdenv.mkDerivation rec { + pname = "sparkleshare"; + version = "3.28"; + + src = fetchFromGitHub { + owner = "hbons"; + repo = "SparkleShare"; + rev = version; + sha256 = "sha256:1x5nv2f3mrsr4a336bz5kc2lzkzilfh43bxy2yqhhjp2dgb20497"; + }; + + nativeBuildInputs = [ + makeWrapper + meson + mono + ninja + pkg-config + ]; + + buildInputs = [ + appindicator-sharp + gtk-sharp-3_0 + notify-sharp + webkit2-sharp + ]; + + patchPhase = '' + # Nix will manage the icon cache. + echo '#!/bin/sh' >scripts/post-install.sh + ''; + + postInstall = '' + wrapProgram $out/bin/sparkleshare \ + --set PATH ${symlinkJoin { + name = "mono-path"; + paths = [ + coreutils + git + glib + mono + openssh + openssl + xdg_utils + ]; + }}/bin \ + --set MONO_GAC_PREFIX ${lib.concatStringsSep ":" [ + appindicator-sharp + gtk-sharp-3_0 + webkit2-sharp + ]} \ + --set LD_LIBRARY_PATH ${lib.makeLibraryPath [ + appindicator-sharp + gtk-sharp-3_0.gtk3 + webkit2-sharp + webkit2-sharp.webkitgtk + ]} + ''; + + meta = { + description = "Share and collaborate by syncing with any Git repository instantly. Linux, macOS, and Windows."; + homepage = "https://sparkleshare.org"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/pkgs/applications/version-management/yadm/default.nix b/pkgs/applications/version-management/yadm/default.nix index fab89d663fa..37fd8055662 100644 --- a/pkgs/applications/version-management/yadm/default.nix +++ b/pkgs/applications/version-management/yadm/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, git, gnupg }: -let version = "2.4.0"; in +let version = "2.5.0"; in stdenv.mkDerivation { pname = "yadm"; inherit version; @@ -11,7 +11,7 @@ stdenv.mkDerivation { owner = "TheLocehiliosan"; repo = "yadm"; rev = version; - sha256 = "0kpahznrkxkyj92vrhwjvldg2affi1askgwvpgbs4mg40f92szlp"; + sha256 = "128qlx8mp7h5ifapqqgsj3fwghn3q6x6ya0y33h5r7gnassd3njr"; }; dontConfigure = true; diff --git a/pkgs/applications/video/electronplayer/electronplayer.nix b/pkgs/applications/video/electronplayer/electronplayer.nix new file mode 100644 index 00000000000..577c85c6b27 --- /dev/null +++ b/pkgs/applications/video/electronplayer/electronplayer.nix @@ -0,0 +1,33 @@ +{ appimageTools, stdenv, fetchurl }: +let + pname = "electronplayer"; + version = "2.0.8"; + name = "${pname}-${version}"; + + #TODO: remove the -rc4 from the tag in the url when possible + src = fetchurl { + url = "https://github.com/oscartbeaumont/ElectronPlayer/releases/download/v${version}-rc4/${name}.AppImage"; + sha256 = "wAsmSFdbRPnYnDyWQSbtyj+GLJLN7ibksUE7cegfkhI="; + }; + + appimageContents = appimageTools.extractType2 { inherit name src; }; +in appimageTools.wrapType2 { + inherit name src; + + extraInstallCommands = '' + mv $out/bin/${name} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop $out/share/applications/${pname}.desktop + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=ElectronPlayer' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + + meta = with stdenv.lib; { + description = "An electron based web video services player"; + homepage = "https://github.com/oscartbeaumont/ElectronPlayer"; + license = licenses.mit; + maintainers = with maintainers; [ extends ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/applications/virtualization/charliecloud/default.nix b/pkgs/applications/virtualization/charliecloud/default.nix index a316952a010..54663f9c5e6 100644 --- a/pkgs/applications/virtualization/charliecloud/default.nix +++ b/pkgs/applications/virtualization/charliecloud/default.nix @@ -1,22 +1,32 @@ -{ stdenv, fetchFromGitHub, python }: +{ stdenv, fetchFromGitHub, python3, python3Packages, docker, autoreconfHook, coreutils, makeWrapper, gnused, gnutar, gzip, findutils, sudo, nixosTests }: stdenv.mkDerivation rec { - version = "0.12"; + version = "0.18"; pname = "charliecloud"; src = fetchFromGitHub { owner = "hpc"; repo = "charliecloud"; rev = "v${version}"; - sha256 = "177rcf1klcxsp6x9cw75cmz3y2izgd1hvi1rb9vc6iz9qx1nmk3v"; + sha256 = "0x2kvp95ld0yii93z9i0k9sknfx7jkgy4rkw9l369fl7f73ghsiq"; }; - buildInputs = [ python ]; + nativeBuildInputs = [ autoreconfHook makeWrapper ]; + buildInputs = [ + docker + (python3.withPackages (ps: [ ps.lark-parser ps.requests ])) + ]; + + configureFlags = let + pythonEnv = python3.withPackages (ps: [ ps.lark-parser ps.requests ]); + in [ + "--with-python=${pythonEnv}/bin/python3" + ]; preConfigure = '' - substituteInPlace Makefile --replace '/bin/bash' '${stdenv.shell}' patchShebangs test/ + substituteInPlace configure.ac --replace "/usr/bin/env" "${coreutils}/bin/env" ''; makeFlags = [ @@ -24,12 +34,16 @@ stdenv.mkDerivation rec { "LIBEXEC_DIR=lib/charliecloud" ]; + # Charliecloud calls some external system tools. + # Here we wrap those deps so they are resolved inside nixpkgs. postInstall = '' - mkdir -p $out/share/charliecloud - mv $out/lib/charliecloud/examples $out/share/charliecloud - mv $out/lib/charliecloud/test $out/share/charliecloud + for file in $out/bin/* ; do \ + wrapProgram $file --prefix PATH : ${stdenv.lib.makeBinPath [ coreutils docker gnused gnutar gzip findutils sudo ]} + done ''; + passthru.tests.charliecloud = nixosTests.charliecloud; + meta = { description = "User-defined software stacks (UDSS) for high-performance computing (HPC) centers"; longDescription = '' diff --git a/pkgs/applications/virtualization/conmon/default.nix b/pkgs/applications/virtualization/conmon/default.nix index 675d713f4b4..064500fde7f 100644 --- a/pkgs/applications/virtualization/conmon/default.nix +++ b/pkgs/applications/virtualization/conmon/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=$(out)" ]; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with stdenv.lib; { homepage = "https://github.com/containers/conmon"; diff --git a/pkgs/applications/virtualization/containerd/default.nix b/pkgs/applications/virtualization/containerd/default.nix index 4210994f435..e6595a207b8 100644 --- a/pkgs/applications/virtualization/containerd/default.nix +++ b/pkgs/applications/virtualization/containerd/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "containerd"; - version = "1.2.13"; + version = "1.4.0"; # git commit for the above version's tag commit = "7ad184331fa3e55e52b890ea95e65ba581ae3429"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "containerd"; repo = "containerd"; rev = "v${version}"; - sha256 = "1rac3iak3jpz57yarxc72bxgxvravwrl0j6s6w2nxrmh2m3kxqzn"; + sha256 = "1ajns679ck5yp6vmf39pyshzf8jijw5fcg5biixkj54jhj3bv1sq"; }; goPackagePath = "github.com/containerd/containerd"; diff --git a/pkgs/applications/virtualization/cri-o/default.nix b/pkgs/applications/virtualization/cri-o/default.nix index 9ec34e1b54a..d0c8938e6de 100644 --- a/pkgs/applications/virtualization/cri-o/default.nix +++ b/pkgs/applications/virtualization/cri-o/default.nix @@ -10,6 +10,7 @@ , libselinux , lvm2 , pkg-config +, nixosTests }: buildGoModule rec { @@ -57,6 +58,8 @@ buildGoModule rec { installManPage docs/*.[1-9] ''; + passthru.tests = { inherit (nixosTests) cri-o; }; + meta = with stdenv.lib; { homepage = "https://cri-o.io"; description = '' diff --git a/pkgs/applications/virtualization/cri-o/wrapper.nix b/pkgs/applications/virtualization/cri-o/wrapper.nix index 1578eaf4f58..298bec6550e 100644 --- a/pkgs/applications/virtualization/cri-o/wrapper.nix +++ b/pkgs/applications/virtualization/cri-o/wrapper.nix @@ -27,7 +27,7 @@ let in runCommand cri-o.name { name = "${cri-o.pname}-wrapper-${cri-o.version}"; - inherit (cri-o) pname version; + inherit (cri-o) pname version passthru; meta = builtins.removeAttrs cri-o.meta [ "outputsToInstall" ]; diff --git a/pkgs/applications/virtualization/crun/default.nix b/pkgs/applications/virtualization/crun/default.nix index 4c5699419eb..5f002f5ddc8 100644 --- a/pkgs/applications/virtualization/crun/default.nix +++ b/pkgs/applications/virtualization/crun/default.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { doCheck = true; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) podman; }; meta = with lib; { description = "A fast and lightweight fully featured OCI runtime and C library for running containers"; diff --git a/pkgs/applications/virtualization/docker-slim/default.nix b/pkgs/applications/virtualization/docker-slim/default.nix index c68c0d47e39..058f6fd8ccc 100644 --- a/pkgs/applications/virtualization/docker-slim/default.nix +++ b/pkgs/applications/virtualization/docker-slim/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { pname = "docker-slim"; - version = "1.31.0"; + version = "1.32.0"; goPackagePath = "github.com/docker-slim/docker-slim"; @@ -14,7 +14,7 @@ buildGoPackage rec { owner = "docker-slim"; repo = "docker-slim"; rev = version; - sha256 = "0kj97kwyjs9hksaas0zic4m7w8b17c1d7c8vhiq2862w97ngxrsk"; + sha256 = "0pd2v7df176ca923c4nw9ns5gz442jkb0jhzqjl53rwfwz1vxy9h"; }; subPackages = [ "cmd/docker-slim" "cmd/docker-slim-sensor" ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index e9fc96986a8..78d6631c2dc 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig +{ stdenv, lib, fetchFromGitHub, fetchpatch, buildGoPackage +, makeWrapper, removeReferencesTo, installShellFiles, pkgconfig , go-md2man, go, containerd, runc, docker-proxy, tini, libtool , sqlite, iproute, lvm2, systemd , btrfs-progs, iptables, e2fsprogs, xz, utillinux, xfsprogs, git @@ -56,7 +57,7 @@ rec { NIX_CFLAGS_COMPILE = "-DMINIMAL=ON"; }); in - stdenv.mkDerivation ((optionalAttrs (stdenv.isLinux) { + buildGoPackage ((optionalAttrs (stdenv.isLinux) { inherit docker-runc docker-containerd docker-proxy docker-tini; @@ -66,7 +67,7 @@ rec { ++ optional (lvm2 == null) "exclude_graphdriver_devicemapper" ++ optional (libseccomp != null) "seccomp"; - }) // { + }) // rec { inherit version rev; name = "docker-${version}"; @@ -78,9 +79,19 @@ rec { sha256 = sha256; }; - nativeBuildInputs = [ installShellFiles pkgconfig ]; + patches = [ + # Replace hard-coded cross-compiler with $CC + (fetchpatch { + url = https://github.com/docker/docker-ce/commit/2fdfb4404ab811cb00227a3de111437b829e55cf.patch; + sha256 = "1af20bzakhpfhaixc29qnl9iml9255xdinxdnaqp4an0n1xa686a"; + }) + ]; + + goPackagePath = "github.com/docker/docker-ce"; + + nativeBuildInputs = [ pkgconfig go-md2man go libtool removeReferencesTo installShellFiles ]; buildInputs = [ - makeWrapper removeReferencesTo go-md2man go libtool + makeWrapper ] ++ optionals (stdenv.isLinux) [ sqlite lvm2 btrfs-progs systemd libseccomp ]; @@ -91,7 +102,7 @@ rec { export GOCACHE="$TMPDIR/go-cache" '' + (optionalString (stdenv.isLinux) '' # build engine - cd ./components/engine + cd ./go/src/${goPackagePath}/components/engine export AUTO_GOPATH=1 export DOCKER_GITCOMMIT="${rev}" export VERSION="${version}" @@ -99,7 +110,7 @@ rec { cd - '') + '' # build cli - cd ./components/cli + cd ./go/src/${goPackagePath}/components/cli # Mimic AUTO_GOPATH mkdir -p .gopath/src/github.com/docker/ ln -sf $PWD .gopath/src/github.com/docker/cli @@ -113,7 +124,7 @@ rec { ''; # systemd 230 no longer has libsystemd-journal as a separate entity from libsystemd - patchPhase = '' + postPatch = '' substituteInPlace ./components/cli/scripts/build/.variables --replace "set -eu" "" '' + optionalString (stdenv.isLinux) '' patchShebangs . @@ -125,7 +136,13 @@ rec { extraPath = optionals (stdenv.isLinux) (makeBinPath [ iproute iptables e2fsprogs xz xfsprogs procps utillinux git ]); - installPhase = optionalString (stdenv.isLinux) '' + installPhase = '' + cd ./go/src/${goPackagePath} + install -Dm755 ./components/cli/docker $out/libexec/docker/docker + + makeWrapper $out/libexec/docker/docker $out/bin/docker \ + --prefix PATH : "$out/libexec/docker:$extraPath" + '' + optionalString (stdenv.isLinux) '' install -Dm755 ./components/engine/bundles/dynbinary-daemon/dockerd $out/libexec/docker/dockerd makeWrapper $out/libexec/docker/dockerd $out/bin/dockerd \ @@ -141,24 +158,20 @@ rec { # systemd install -Dm644 ./components/engine/contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service '' + '' - install -Dm755 ./components/cli/docker $out/libexec/docker/docker - - makeWrapper $out/libexec/docker/docker $out/bin/docker \ - --prefix PATH : "$out/libexec/docker:$extraPath" - # completion (cli) installShellCompletion --bash ./components/cli/contrib/completion/bash/docker installShellCompletion --fish ./components/cli/contrib/completion/fish/docker.fish installShellCompletion --zsh ./components/cli/contrib/completion/zsh/_docker # Include contributed man pages (cli) + cd ./components/cli + '' + lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' # Generate man pages from cobra commands echo "Generate man pages from cobra" - cd ./components/cli mkdir -p ./man/man1 go build -o ./gen-manpages github.com/docker/cli/man ./gen-manpages --root . --target ./man/man1 - + '' + '' # Generate legacy pages from markdown echo "Generate legacy manpages" ./man/md2man-all.sh -q @@ -167,7 +180,7 @@ rec { ''; preFixup = '' - find $out -type f -exec remove-references-to -t ${go} -t ${stdenv.cc.cc} '{}' + + find $out -type f -exec remove-references-to -t ${stdenv.cc.cc} '{}' + '' + optionalString (stdenv.isLinux) '' find $out -type f -exec remove-references-to -t ${stdenv.glibc.dev} '{}' + ''; diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index cc805aefc9f..871592c88c2 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -16,13 +16,13 @@ buildGoModule rec { pname = "podman"; - version = "2.0.4"; + version = "2.0.6"; src = fetchFromGitHub { owner = "containers"; repo = "podman"; rev = "v${version}"; - sha256 = "0rnli16nh5m3a8jjkkm1k4f896yk1k1rg48rjiajqhfrr98qwr0f"; + sha256 = "1kl8cfsqwfbjl14mbp58wrxfm90y2w58x6138zq0sn4jzwwpy1a4"; }; vendorSha256 = null; @@ -60,7 +60,7 @@ buildGoModule rec { MANDIR=$man/share/man make install.man-nobuild ''; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) podman; }; meta = with stdenv.lib; { homepage = "https://podman.io/"; diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 7cbc3e4c619..535f8371153 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -18,6 +18,7 @@ , openGLSupport ? sdlSupport, mesa, epoxy, libdrm , virglSupport ? openGLSupport, virglrenderer , smbdSupport ? false, samba +, tpmSupport ? true , hostCpuOnly ? false , hostCpuTargets ? (if hostCpuOnly then (stdenv.lib.optional stdenv.isx86_64 "i386-softmmu" @@ -127,6 +128,7 @@ stdenv.mkDerivation rec { ++ optional cephSupport "--enable-rbd" ++ optional openGLSupport "--enable-opengl" ++ optional virglSupport "--enable-virglrenderer" + ++ optional tpmSupport "--enable-tpm" ++ optional smbdSupport "--smbd=${samba}/bin/smbd"; doCheck = false; # tries to access /dev diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix index ecd282d6f7d..fd3d914af66 100644 --- a/pkgs/applications/virtualization/runc/default.nix +++ b/pkgs/applications/virtualization/runc/default.nix @@ -45,7 +45,7 @@ buildGoPackage rec { installManPage man/*/*.[1-9] ''; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) cri-o podman; }; meta = with lib; { homepage = "https://github.com/opencontainers/runc"; diff --git a/pkgs/applications/virtualization/singularity/default.nix b/pkgs/applications/virtualization/singularity/default.nix index 8cec24534d4..bfa0e0e5446 100644 --- a/pkgs/applications/virtualization/singularity/default.nix +++ b/pkgs/applications/virtualization/singularity/default.nix @@ -18,11 +18,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.6.1"; + version = "3.6.2"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "070jj6kbiw23sd2p4xhvmyb8gd83imwgisdf18ahkwp7dq85db3c"; + sha256 = "16sd08bfa2b1qgpnd3q6k7glw0w1wyrqyf47fz2220yafrryrmyz"; }; goPackagePath = "github.com/sylabs/singularity"; @@ -67,10 +67,6 @@ buildGoPackage rec { runHook postInstall ''; - postFixup = '' - find $out/libexec/ -type f -executable -exec remove-references-to -t ${go} '{}' + || true - ''; - meta = with stdenv.lib; { homepage = "http://www.sylabs.io/"; description = "Application containers for linux"; diff --git a/pkgs/applications/virtualization/tini/default.nix b/pkgs/applications/virtualization/tini/default.nix index db3fb1c96eb..e3b1ccd4ce2 100644 --- a/pkgs/applications/virtualization/tini/default.nix +++ b/pkgs/applications/virtualization/tini/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-DPR_SET_CHILD_SUBREAPER=36 -DPR_GET_CHILD_SUBREAPER=37"; - buildInputs = [ cmake glibc glibc.static ]; + nativeBuildInputs = [ cmake ]; + buildInputs = [ glibc glibc.static ]; meta = with stdenv.lib; { description = "A tiny but valid init for containers"; diff --git a/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix new file mode 100644 index 00000000000..f6e24d979a4 --- /dev/null +++ b/pkgs/applications/window-managers/i3/lock-fancy-rapid.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, xorg, i3lock }: + +stdenv.mkDerivation rec { + pname = "i3lock-fancy-rapid"; + version = "2019-10-09"; + src = fetchFromGitHub { + owner = "yvbbrjdr"; + repo = "i3lock-fancy-rapid"; + rev = "c67f09bc8a48798c7c820d7d4749240b10865ce0"; + sha256 = "0jhvlj6v6wx70239pgkjxd42z1s2bzfg886ra6n1rzsdclf4rkc6"; + }; + + buildInputs = [ xorg.libX11 ]; + propagatedBuildInputs = [ i3lock ]; + + postPatch = '' + substituteInPlace i3lock-fancy-rapid.c \ + --replace '"i3lock"' '"${i3lock}/bin/i3lock"' + ''; + + installPhase = '' + install -D i3lock-fancy-rapid $out/bin/i3lock-fancy-rapid + ''; + + meta = with stdenv.lib; { + description = "A faster implementation of i3lock-fancy"; + homepage = "https://github.com/yvbbrjdr/i3lock-fancy-rapid"; + maintainers = with maintainers; [ nickhu ]; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 2404129b165..ac28abc31d3 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "sxhkd"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "baskerville"; repo = "sxhkd"; rev = version; - sha256 = "0j7bl2l06r0arrjzpz7al9j6cwzc730knbsijp7ixzz96pq7xa2h"; + sha256 = "1winwzdy9yxvxnrv8gqpigl9y0c2px27mnms62bdilp4x6llrs9r"; }; buildInputs = [ asciidoc libxcb xcbutil xcbutilkeysyms xcbutilwm ]; diff --git a/pkgs/applications/window-managers/windowchef/default.nix b/pkgs/applications/window-managers/windowchef/default.nix new file mode 100644 index 00000000000..08a30b6085c --- /dev/null +++ b/pkgs/applications/window-managers/windowchef/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, libxcb, libXrandr +, xcbutil, xcbutilkeysyms, xcbutilwm, xcbproto +}: + +stdenv.mkDerivation rec { + pname = "windowchef"; + version = "0.5.0"; + + src = fetchFromGitHub { + owner = "tudurom"; + repo = "windowchef"; + rev = "v${version}"; + sha256 = "02fvb8fxnkpzb0vpbsl6rf7ssdrvw6mlm43qvl2sxq7zb88zdw96"; + }; + + buildInputs = [ libxcb libXrandr xcbutil xcbutilkeysyms xcbutilwm xcbproto]; + + makeFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "A stacking window manager that cooks windows with orders from the Waitron"; + homepage = "https://github.com/tudurom/windowchef"; + maintainers = with maintainers; [ bhougland ]; + license = licenses.isc; + platforms = platforms.linux; + }; +} diff --git a/pkgs/build-support/alternatives/blas/default.nix b/pkgs/build-support/alternatives/blas/default.nix index 9e1aacfaf82..5ebbc737e11 100644 --- a/pkgs/build-support/alternatives/blas/default.nix +++ b/pkgs/build-support/alternatives/blas/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { exit 1 fi - nm -an "$libblas" | cut -f3 -d' ' > symbols + $NM -an "$libblas" | cut -f3 -d' ' > symbols for symbol in ${toString blasFortranSymbols}; do grep -q "^$symbol_$" symbols || { echo "$symbol" was not found in "$libblas"; exit 1; } done diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 4f3680f2197..bfb15f2f783 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -64,18 +64,26 @@ let # older compilers (for example bootstrap's GCC 5) fail with -march=too-modern-cpu isGccArchSupported = arch: if isGNU then - { skylake = versionAtLeast ccVersion "6.0"; + { # Intel + skylake = versionAtLeast ccVersion "6.0"; skylake-avx512 = versionAtLeast ccVersion "6.0"; cannonlake = versionAtLeast ccVersion "8.0"; icelake-client = versionAtLeast ccVersion "8.0"; icelake-server = versionAtLeast ccVersion "8.0"; knm = versionAtLeast ccVersion "8.0"; + # AMD + znver1 = versionAtLeast ccVersion "6.0"; + znver2 = versionAtLeast ccVersion "9.0"; }.${arch} or true else if isClang then - { cannonlake = versionAtLeast ccVersion "5.0"; + { # Intel + cannonlake = versionAtLeast ccVersion "5.0"; icelake-client = versionAtLeast ccVersion "7.0"; icelake-server = versionAtLeast ccVersion "7.0"; knm = versionAtLeast ccVersion "7.0"; + # AMD + znver1 = versionAtLeast ccVersion "4.0"; + znver2 = versionAtLeast ccVersion "9.0"; }.${arch} or true else false; @@ -209,6 +217,7 @@ stdenv.mkDerivation { wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77 + export named_fc=${targetPrefix}gfortran '' + optionalString cc.langJava or false '' @@ -227,8 +236,8 @@ stdenv.mkDerivation { setupHooks = [ ../setup-hooks/role.bash - ./setup-hook.sh - ]; + ] ++ stdenv.lib.optional (cc.langC or true) ./setup-hook.sh + ++ stdenv.lib.optional (cc.langFortran or false) ./fortran-hook.sh; postFixup = # Ensure flags files exists, as some other programs cat them. (That these diff --git a/pkgs/build-support/cc-wrapper/fortran-hook.sh b/pkgs/build-support/cc-wrapper/fortran-hook.sh new file mode 100644 index 00000000000..d72f314c01c --- /dev/null +++ b/pkgs/build-support/cc-wrapper/fortran-hook.sh @@ -0,0 +1,11 @@ +getTargetRole +getTargetRoleWrapper + +export FC${role_post}=@named_fc@ + +# If unset, assume the default hardening flags. +# These are different for fortran. +: ${NIX_HARDENING_ENABLE="stackprotector pic strictoverflow relro bindnow"} +export NIX_HARDENING_ENABLE + +unset -v role_post diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh index 68d840f1614..3f895d9cfed 100644 --- a/pkgs/build-support/kernel/modules-closure.sh +++ b/pkgs/build-support/kernel/modules-closure.sh @@ -68,7 +68,17 @@ done mkdir -p $out/lib/firmware for module in $(cat closure); do - for i in $(modinfo -F firmware $module); do + # for builtin modules, modinfo will reply with a wrong output looking like: + # $ modinfo -F firmware unix + # name: unix + # + # There is a pending attempt to fix this: + # https://github.com/NixOS/nixpkgs/pull/96153 + # https://lore.kernel.org/linux-modules/20200823215433.j5gc5rnsmahpf43v@blumerang/T/#u + # + # For now, the workaround is just to filter out the extraneous lines out + # of its output. + for i in $(modinfo -b $kernel --set-version "$version" -F firmware $module | grep -v '^name:'); do mkdir -p "$out/lib/firmware/$(dirname "$i")" echo "firmware for $module: $i" cp "$firmware/lib/firmware/$i" "$out/lib/firmware/$i" 2>/dev/null || if test -z "$allowMissing"; then exit 1; fi diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix index c292b8ea4d4..f270fe97326 100644 --- a/pkgs/build-support/rust/default.nix +++ b/pkgs/build-support/rust/default.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation (args // { "CXX_${rust.toRustTarget stdenv.buildPlatform}"="${cxxForBuild}" \ "CC_${rust.toRustTarget stdenv.hostPlatform}"="${ccForHost}" \ "CXX_${rust.toRustTarget stdenv.hostPlatform}"="${cxxForHost}" \ - cargo build \ + cargo build -j $NIX_BUILD_CORES \ ${stdenv.lib.optionalString (buildType == "release") "--release"} \ --target ${rustTarget} \ --frozen ${concatStringsSep " " cargoBuildFlags} @@ -208,7 +208,7 @@ stdenv.mkDerivation (args // { ${stdenv.lib.optionalString (buildAndTestSubdir != null) "pushd ${buildAndTestSubdir}"} runHook preCheck echo "Running cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+''${checkFlagsArray[@]}}" - cargo test ${argstr} -- ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} + cargo test -j $NIX_BUILD_CORES ${argstr} -- --test-threads=$NIX_BUILD_CORES ''${checkFlags} ''${checkFlagsArray+"''${checkFlagsArray[@]}"} runHook postCheck ${stdenv.lib.optionalString (buildAndTestSubdir != null) "popd"} ''); diff --git a/pkgs/build-support/rust/fetchcrate.nix b/pkgs/build-support/rust/fetchcrate.nix index 95dfd38b12a..4e6c38b032c 100644 --- a/pkgs/build-support/rust/fetchcrate.nix +++ b/pkgs/build-support/rust/fetchcrate.nix @@ -1,10 +1,13 @@ { lib, fetchurl, unzip }: -{ crateName +{ crateName ? args.pname +, pname ? null , version , sha256 , ... } @ args: +assert pname == null || pname == crateName; + lib.overrideDerivation (fetchurl ({ name = "${crateName}-${version}.tar.gz"; @@ -30,6 +33,6 @@ lib.overrideDerivation (fetchurl ({ fi mv "$unpackDir/$fn" "$out" ''; -} // removeAttrs args [ "crateName" "version" ])) +} // removeAttrs args [ "crateName" "pname" "version" ])) # Hackety-hack: we actually need unzip hooks, too (x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) diff --git a/pkgs/data/fonts/clearlyU/default.nix b/pkgs/data/fonts/clearlyU/default.nix index 62002b14dd5..84cf3ebc538 100644 --- a/pkgs/data/fonts/clearlyU/default.nix +++ b/pkgs/data/fonts/clearlyU/default.nix @@ -20,19 +20,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' - # install bdf fonts + # install otb and bdf fonts fontDir="$out/share/fonts" - install -m 644 -D *.bdf -t "$fontDir" - mkfontdir "$fontDir" - - # install otb fonts - fontDir="$otb/share/fonts" - install -m 644 -D *.otb -t "$fontDir" + install -m 644 -D *.bdf *.otb -t "$fontDir" mkfontdir "$fontDir" ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "A Unicode font"; license = licenses.mit; diff --git a/pkgs/data/fonts/creep/default.nix b/pkgs/data/fonts/creep/default.nix index 2e66ac468b0..7c7ad4d5aa9 100644 --- a/pkgs/data/fonts/creep/default.nix +++ b/pkgs/data/fonts/creep/default.nix @@ -20,14 +20,10 @@ stdenv.mkDerivation rec { ''; installPhase = '' - install -D -m644 creep.bdf "$out/share/fonts/misc/creep.bdf" + install -D -m644 creep.otb creep.bdf -t "$out/share/fonts/misc/" mkfontdir "$out/share/fonts/misc" - install -D -m644 creep.otb "$otb/share/fonts/misc/creep.otb" - mkfontdir "$otb/share/fonts/misc" ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "A pretty sweet 4px wide pixel font"; homepage = "https://github.com/romeovs/creep"; diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix index 49c21947820..1a8ac344a53 100644 --- a/pkgs/data/fonts/dina/default.nix +++ b/pkgs/data/fonts/dina/default.nix @@ -41,15 +41,13 @@ stdenv.mkDerivation { ''; installPhase = '' - install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz + install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz *.otb install -D -m 644 -t "$bdf/share/fonts/misc" *.bdf - install -D -m 644 -t "$otb/share/fonts/misc" *.otb mkfontdir "$out/share/fonts/misc" mkfontdir "$bdf/share/fonts/misc" - mkfontdir "$otb/share/fonts/misc" ''; - outputs = [ "out" "bdf" "otb" ]; + outputs = [ "out" "bdf" ]; meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; diff --git a/pkgs/data/fonts/envypn-font/default.nix b/pkgs/data/fonts/envypn-font/default.nix index c26569166a3..0d69b812c4c 100644 --- a/pkgs/data/fonts/envypn-font/default.nix +++ b/pkgs/data/fonts/envypn-font/default.nix @@ -25,14 +25,10 @@ stdenv.mkDerivation { ''; installPhase = '' - install -D -m 644 -t "$out/share/fonts/misc" *.pcf.gz - install -D -m 644 -t "$otb/share/fonts/misc" *.otb + install -D -m 644 -t "$out/share/fonts/misc" *.otb *.pcf.gz mkfontdir "$out/share/fonts/misc" - mkfontdir "$otb/share/fonts/misc" ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = '' Readable bitmap font inspired by Envy Code R diff --git a/pkgs/data/fonts/gohufont/default.nix b/pkgs/data/fonts/gohufont/default.nix index e2361ef8163..ac82c82ae3d 100644 --- a/pkgs/data/fonts/gohufont/default.nix +++ b/pkgs/data/fonts/gohufont/default.nix @@ -52,19 +52,12 @@ stdenv.mkDerivation rec { fontDir="$out/share/consolefonts" install -D -m 644 -t "$fontDir" psf/*.psf - # install the pcf fonts (for xorg applications) + # install the pcf and otb fonts (for X11,GTK applications) fontDir="$out/share/fonts/misc" - install -D -m 644 -t "$fontDir" *.pcf - mkfontdir "$fontDir" - - # install the otb fonts (for gtk applications) - fontDir="$otb/share/fonts/misc" - install -D -m 644 -t "$fontDir" *.otb + install -D -m 644 -t "$fontDir" *.pcf *.otb mkfontdir "$fontDir" ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = '' A monospace bitmap font well suited for programming and terminal use diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index ee1bd74faf5..0f88aa05e4c 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -1,7 +1,7 @@ { stdenv, fetchzip }: let - version = "3.4.1"; + version = "3.4.6"; in fetchzip { name = "iosevka-bin-${version}"; @@ -12,7 +12,7 @@ in fetchzip { unzip -j $downloadedFile \*.ttc -d $out/share/fonts/truetype ''; - sha256 = "0qqzgfplib6jdn1fra7fwx25jkzlw21brj45q8gn3gxvndvqabvd"; + sha256 = "1nab49gkpxahwvvw39xcc32q425qkccr7ffmz87jbcdv71qy7pp9"; meta = with stdenv.lib; { homepage = "https://be5invis.github.io/Iosevka/"; diff --git a/pkgs/data/fonts/jetbrains-mono/default.nix b/pkgs/data/fonts/jetbrains-mono/default.nix index f81c0ed90f9..b198486327d 100644 --- a/pkgs/data/fonts/jetbrains-mono/default.nix +++ b/pkgs/data/fonts/jetbrains-mono/default.nix @@ -1,14 +1,14 @@ { lib, fetchzip }: let - version = "2.001"; + version = "2.002"; in fetchzip { name = "JetBrainsMono-${version}"; - url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrains.Mono.${version}.zip"; + url = "https://github.com/JetBrains/JetBrainsMono/releases/download/v${version}/JetBrainsMono-${version}.zip"; - sha256 = "06rh8dssq6qzgb9rri3an2ka24j47c0i8yhgq81yyg471spc39h1"; + sha256 = "018lhxi9m8aprls6cnpndzdg5snijwzm22m2pxxi6zcqxrcxh8vb"; postFetch = '' mkdir -p $out/share/fonts @@ -21,7 +21,7 @@ fetchzip { meta = with lib; { description = "A typeface made for developers"; homepage = "https://jetbrains.com/mono/"; - license = licenses.asl20; + license = licenses.ofl; maintainers = [ maintainers.marsam ]; platforms = platforms.all; }; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index e077fc30344..40a6c887439 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -6,11 +6,12 @@ , fetchzip , optipng , cairo -, python3Packages +, python3 , pkgconfig , pngquant , which , imagemagick +, zopfli }: let @@ -110,25 +111,36 @@ in }; noto-fonts-emoji = let - version = "unstable-2019-10-22"; + version = "unstable-2020-08-20"; + emojiPythonEnv = + python3.withPackages (p: with p; [ fonttools nototools ]); in stdenv.mkDerivation { pname = "noto-fonts-emoji"; inherit version; src = fetchFromGitHub { - owner = "googlei18n"; + owner = "googlefonts"; repo = "noto-emoji"; - rev = "018aa149d622a4fea11f01c61a7207079da301bc"; - sha256 = "0qmnnjpp5lza6g5m3ki6hj46p891h9vl42k3acd0qw8i0jj5yn2c"; + rev = "1bc491419fa2925d018f27bfe702792031be0e68"; + sha256 = "1vak4s1p4wlwzpnqfb1c2sg62q82gnjpnmqrfz8xl6bd0z55imzy"; }; - buildInputs = [ cairo ]; - nativeBuildInputs = [ pngquant optipng which cairo pkgconfig imagemagick ] - ++ (with python3Packages; [ python fonttools nototools ]); + nativeBuildInputs = [ + cairo + imagemagick + zopfli + pngquant + which + pkgconfig + emojiPythonEnv + ]; postPatch = '' - sed -i 's,^PNGQUANT :=.*,PNGQUANT := ${pngquant}/bin/pngquant,' Makefile - patchShebangs flag_glyph_name.py + patchShebangs *.py + patchShebangs third_party/color_emoji/*.py + # remove check for virtualenv, since we handle + # python requirements using python.withPackages + sed -i '/ifndef VIRTUAL_ENV/,+2d' Makefile ''; enableParallelBuilding = true; @@ -141,7 +153,7 @@ in meta = with lib; { inherit version; description = "Color and Black-and-White emoji fonts"; - homepage = "https://github.com/googlei18n/noto-emoji"; + homepage = "https://github.com/googlefonts/noto-emoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ mathnerd314 ]; @@ -165,7 +177,7 @@ in meta = with stdenv.lib; { description = "Noto Emoji with extended Blob support"; - homepage = https://github.com/C1710/blobmoji; + homepage = "https://github.com/C1710/blobmoji"; license = with licenses; [ ofl asl20 ]; platforms = platforms.all; maintainers = with maintainers; [ rileyinman ]; diff --git a/pkgs/data/fonts/noto-fonts/tools.nix b/pkgs/data/fonts/noto-fonts/tools.nix index 3cc1570161e..6ea26f7c79d 100644 --- a/pkgs/data/fonts/noto-fonts/tools.nix +++ b/pkgs/data/fonts/noto-fonts/tools.nix @@ -1,32 +1,62 @@ -{ fetchFromGitHub, lib, fetchpatch, buildPythonPackage, isPy3k, fonttools, numpy, pillow, six, bash }: +{ fetchFromGitHub, lib, buildPythonPackage, pythonOlder +, afdko, appdirs, attrs, black, booleanoperations, brotlipy, click +, defcon, fontmath, fontparts, fontpens, fonttools, fs, lxml +, mutatormath, pathspec, psautohint, pyclipper, pytz, regex, scour +, toml, typed-ast, ufonormalizer, ufoprocessor, unicodedata2, zopfli +, pillow, six, bash, setuptools_scm }: buildPythonPackage rec { pname = "nototools"; - version = "unstable-2019-10-21"; + version = "0.2.12"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "googlefonts"; repo = "nototools"; - rev = "cae92ce958bee37748bf0602f5d7d97bb6db98ca"; - sha256 = "1jqr0dz23rjqiyxw1w69l6ry16dwdcf3c6cysiy793g2v7pir2yi"; + rev = "v${version}"; + sha256 = "0drmx1asni3g6616fa4gjn5n43qkcf7icvxq9y2krpjxq78wcmc5"; }; - propagatedBuildInputs = [ fonttools numpy ]; - - patches = lib.optionals isPy3k [ - # Additional Python 3 compat https://github.com/googlefonts/nototools/pull/497 - (fetchpatch { - url = "https://github.com/googlefonts/nototools/commit/ded1f311b3260f015b5c5b80f05f7185392c4eff.patch"; - sha256 = "0bn0rlbddxicw0h1dnl0cibgj6xjalja2qcm563y7kk3z5cdwhgq"; - }) - ]; - postPatch = '' - sed -ie "s^join(_DATA_DIR_PATH,^join(\"$out/third_party/ucd\",^" nototools/unicode_data.py + sed -i 's/use_scm_version=.*,/version="${version}",/' setup.py ''; + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + afdko + appdirs + attrs + black + booleanoperations + brotlipy + click + defcon + fontmath + fontparts + fontpens + fonttools + lxml + mutatormath + pathspec + psautohint + pyclipper + pytz + regex + scour + toml + typed-ast + ufonormalizer + ufoprocessor + unicodedata2 + zopfli + ]; + checkInputs = [ - pillow six bash + pillow + six + bash ]; checkPhase = '' diff --git a/pkgs/data/fonts/profont/default.nix b/pkgs/data/fonts/profont/default.nix index cba08309fac..6297a8fbb20 100644 --- a/pkgs/data/fonts/profont/default.nix +++ b/pkgs/data/fonts/profont/default.nix @@ -28,15 +28,10 @@ stdenv.mkDerivation { gzip -n -9 -c "$f" > "$out/share/fonts/misc/$f.gz" done install -D -m 644 LICENSE -t "$out/share/doc/$pname" + install -D -m 644 "$srcOtb/profontn.otb" -t $out/share/fonts/misc mkfontdir "$out/share/fonts/misc" - - cd $srcOtb - install -D -m 644 profontn.otb -t $otb/share/fonts/misc - mkfontdir "$otb/share/fonts/misc" ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { homepage = "https://tobiasjung.name/profont/"; description = "A monospaced font created to be a most readable font for programming"; diff --git a/pkgs/data/fonts/recursive/default.nix b/pkgs/data/fonts/recursive/default.nix index 7f3b9562e89..9fc4b46c952 100644 --- a/pkgs/data/fonts/recursive/default.nix +++ b/pkgs/data/fonts/recursive/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip }: let - version = "1.057"; + version = "1.062"; in fetchzip { name = "recursive-${version}"; - url = "https://github.com/arrowtype/recursive/releases/download/${version}/Recursive-${version}.zip"; + url = "https://github.com/arrowtype/recursive/releases/download/${version}/ArrowType-Recursive-${version}.zip"; postFetch = '' mkdir -p $out/share/fonts/ @@ -15,7 +15,7 @@ fetchzip { unzip -j $downloadedFile \*.woff2 -d $out/share/fonts/woff2 ''; - sha256 = "0qsqldnhgl93h1izminjajjymvyxsw91ngdbxlhgbqvadg77325y"; + sha256 = "06qilfa0c897shh7m7rpwia02nay8cjwnizzzba27ylzy5pwd96r"; meta = with lib; { homepage = "https://recursive.design/"; diff --git a/pkgs/data/fonts/siji/default.nix b/pkgs/data/fonts/siji/default.nix index d1e53bbb757..fb13f82263d 100644 --- a/pkgs/data/fonts/siji/default.nix +++ b/pkgs/data/fonts/siji/default.nix @@ -24,15 +24,13 @@ stdenv.mkDerivation rec { ''; postInstall = '' - install -m 644 -D pcf/* -t "$out/share/fonts/misc" + install -m 644 -D *.otb pcf/* -t "$out/share/fonts/misc" install -m 644 -D bdf/* -t "$bdf/share/fonts/misc" - install -m 644 -D *.otb -t "$otb/share/fonts/misc" mkfontdir "$out/share/fonts/misc" mkfontdir "$bdf/share/fonts/misc" - mkfontdir "$otb/share/fonts/misc" ''; - outputs = [ "out" "bdf" "otb" ]; + outputs = [ "out" "bdf" ]; meta = with stdenv.lib; { homepage = "https://github.com/stark/siji"; diff --git a/pkgs/data/fonts/tamsyn/default.nix b/pkgs/data/fonts/tamsyn/default.nix index 2738925478f..4d1e58a6bb3 100644 --- a/pkgs/data/fonts/tamsyn/default.nix +++ b/pkgs/data/fonts/tamsyn/default.nix @@ -29,15 +29,11 @@ in stdenv.mkDerivation { ''; installPhase = '' - install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc" + install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts/misc" install -m 644 -D *.psf.gz -t "$out/share/consolefonts" - install -m 644 -D *.otb -t "$otb/share/fonts/misc" mkfontdir "$out/share/fonts/misc" - mkfontdir "$otb/share/fonts/misc" ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "A monospace bitmap font aimed at programmers"; longDescription = ''Tamsyn is a monospace bitmap font, primarily aimed at diff --git a/pkgs/data/fonts/tamzen/default.nix b/pkgs/data/fonts/tamzen/default.nix index 6ecc03d7310..026ec63d670 100644 --- a/pkgs/data/fonts/tamzen/default.nix +++ b/pkgs/data/fonts/tamzen/default.nix @@ -14,15 +14,11 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ mkfontscale ]; installPhase = '' - install -m 644 -D pcf/*.pcf -t "$out/share/fonts/misc" + install -m 644 -D otb/*.otb pcf/*.pcf -t "$out/share/fonts/misc" install -m 644 -D psf/*.psf -t "$out/share/consolefonts" - install -m 644 -D otb/*.otb -t "$otb/share/fonts/misc" mkfontdir "$out/share/fonts/misc" - mkfontdir "$otb/share/fonts/misc" ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "Bitmapped programming font based on Tamsyn"; longDescription = '' diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index fb120e5eec6..bbde1dd252c 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -35,14 +35,12 @@ stdenv.mkDerivation rec { postInstall = '' # install otb fonts (for GTK applications) - install -m 644 -D *.otb -t "$otb/share/fonts/misc"; - mkfontdir "$otb/share/fonts/misc" + install -m 644 -D *.otb -t "$out/share/fonts/misc"; + mkfontdir "$out/share/fonts/misc" ''; installTargets = [ "install" "fontdir" ]; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "A clean fixed width font"; longDescription = '' diff --git a/pkgs/data/fonts/tewi/default.nix b/pkgs/data/fonts/tewi/default.nix index 7b67c1dd52d..7821cc66041 100644 --- a/pkgs/data/fonts/tewi/default.nix +++ b/pkgs/data/fonts/tewi/default.nix @@ -38,16 +38,10 @@ stdenv.mkDerivation rec { installPhase = '' fontDir="$out/share/fonts/misc" - install -m 644 -D out/* -t "$fontDir" - mkfontdir "$fontDir" - - fontDir="$otb/share/fonts/misc" - install -m 644 -D *.otb -t "$fontDir" + install -m 644 -D *.otb out/* -t "$fontDir" mkfontdir "$fontDir" ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "A nice bitmap font, readable even at small sizes"; longDescription = '' diff --git a/pkgs/data/fonts/twitter-color-emoji/default.nix b/pkgs/data/fonts/twitter-color-emoji/default.nix index ac3930853cf..8435957fe20 100644 --- a/pkgs/data/fonts/twitter-color-emoji/default.nix +++ b/pkgs/data/fonts/twitter-color-emoji/default.nix @@ -3,9 +3,8 @@ { stdenv , fetchFromGitHub -, fetchpatch , cairo -, graphicsmagick +, imagemagick , pkg-config , pngquant , python3 @@ -15,7 +14,7 @@ }: let - version = "12.1.5"; + version = "13.0.1"; twemojiSrc = fetchFromGitHub { name = "twemoji"; @@ -25,6 +24,9 @@ let sha256 = "0acinlv2l3s1jga2i9wh16mvgkxw4ipzgvjx8c80zd104lpdpgd9"; }; + pythonEnv = + python3.withPackages (p: [ p.fonttools p.nototools ]); + in stdenv.mkDerivation rec { pname = "twitter-color-emoji"; @@ -44,23 +46,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cairo - graphicsmagick + imagemagick pkg-config pngquant - python3 - python3.pkgs.nototools + pythonEnv which zopfli ]; - patches = [ - # ImageMagick -> GraphicsMagick - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/twitter-twemoji-fonts/raw/07778605d50696f6aa929020e82611a01d254c90/f/noto-emoji-use-gm.patch"; - sha256 = "06vg16z79s5adyjy8r3mr8fd391b1hi4xkqvbzkmnjwaai7p08lk"; - }) - ]; - postPatch = let templateSubstitutions = stdenv.lib.concatStringsSep "; " [ ''s#Noto Color Emoji#Twitter Color Emoji#'' @@ -74,7 +67,7 @@ stdenv.mkDerivation rec { ''s#http://scripts.sil.org/OFL#http://creativecommons.org/licenses/by/4.0/#'' ]; in '' - patchShebangs ./flag_glyph_name.py + ${noto-fonts-emoji.postPatch} sed '${templateSubstitutions}' NotoColorEmoji.tmpl.ttx.tmpl > TwitterColorEmoji.tmpl.ttx.tmpl pushd ${twemojiSrc.name}/assets/72x72/ @@ -88,6 +81,8 @@ stdenv.mkDerivation rec { "EMOJI=TwitterColorEmoji" "EMOJI_SRC_DIR=${twemojiSrc.name}/assets/72x72" "BODY_DIMENSIONS=76x72" + # twemoji contains some codepoints noto doesn't like + "BYPASS_SEQUENCE_CHECK=True" ]; enableParallelBuilding = true; diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix index 7168607ce09..71c42c46b5d 100644 --- a/pkgs/data/fonts/ucs-fonts/default.nix +++ b/pkgs/data/fonts/ucs-fonts/default.nix @@ -42,16 +42,14 @@ stdenv.mkDerivation { ''; installPhase = '' - install -m 644 -D *.pcf.gz -t "$out/share/fonts/misc" - install -m 644 -D *.bdf -t "$bdf/share/fonts/misc" - install -m 644 -D *.otb -t "$otb/share/fonts/misc" + install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts/misc" + install -m 644 -D *.bdf -t "$bdf/share/fonts/misc" mkfontdir "$out/share/fonts/misc" mkfontdir "$bdf/share/fonts/misc" - mkfontdir "$otb/share/fonts/misc" ''; - outputs = [ "out" "bdf" "otb" ]; + outputs = [ "out" "bdf" ]; meta = with stdenv.lib; { homepage = "https://www.cl.cam.ac.uk/~mgk25/ucs-fonts.html"; diff --git a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix index 5b07adf822e..b1da06ccd8b 100644 --- a/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix +++ b/pkgs/data/fonts/ultimate-oldschool-pc-font-pack/default.nix @@ -1,12 +1,12 @@ { lib, fetchzip }: let - version = "1.0"; + version = "2.0"; in fetchzip { name = "ultimate-oldschool-pc-font-pack-${version}"; - url = "https://int10h.org/oldschool-pc-fonts/download/ultimate_oldschool_pc_font_pack_v${version}.zip"; - sha256 = "0hid4dgqfy2w26734vcw2rxmpacd9vd1r2qpdr9ww1n3kgc92k9y"; + url = "https://int10h.org/oldschool-pc-fonts/download/oldschool_pc_font_pack_v${version}_ttf.zip"; + sha256 = "0z0fw6ni7iq806y4m83xrfx46r14xxxql09ch2gxjqi062awqyh8"; postFetch= '' mkdir -p $out/share/fonts/truetype diff --git a/pkgs/data/fonts/uni-vga/default.nix b/pkgs/data/fonts/uni-vga/default.nix index 58a5dbcfdbc..65db46ca2ca 100644 --- a/pkgs/data/fonts/uni-vga/default.nix +++ b/pkgs/data/fonts/uni-vga/default.nix @@ -34,23 +34,20 @@ stdenv.mkDerivation { ''; installPhase = '' - # install pcf (for X11 applications) - install -m 644 -D *.pcf.gz -t "$out/share/fonts" + # install pcf and otb (for X11 and GTK applications) + install -m 644 -D *.otb *.pcf.gz -t "$out/share/fonts" mkfontdir "$out/share/fonts" # install bdf font install -m 644 -D *.bdf -t "$bdf/share/fonts" mkfontdir "$bdf/share/fonts" - # install otb font (for GTK applications) - install -m 644 -D *.otb -t "$otb/share/fonts" - mkfontdir "$otb/share/fonts" '' + optionalString stdenv.isLinux '' # install psf (for linux virtual terminal) install -m 644 -D *.psf.gz -t "$out/share/consolefonts" ''; - outputs = [ "out" "bdf" "otb" ]; + outputs = [ "out" "bdf" ]; meta = { description = "Unicode VGA font"; diff --git a/pkgs/data/fonts/unifont/default.nix b/pkgs/data/fonts/unifont/default.nix index 460efc2c581..685b5c452f2 100644 --- a/pkgs/data/fonts/unifont/default.nix +++ b/pkgs/data/fonts/unifont/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { installPhase = '' # install otb fonts - install -m 644 -D unifont.otb "$otb/share/fonts/unifont.otb" - mkfontdir "$otb/share/fonts" + install -m 644 -D unifont.otb "$out/share/fonts/unifont.otb" + mkfontdir "$out/share/fonts" # install pcf and ttf fonts install -m 644 -D ${pcf} $out/share/fonts/unifont.pcf.gz @@ -41,8 +41,6 @@ stdenv.mkDerivation rec { mkfontscale ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "Unicode font for Base Multilingual Plane"; homepage = "http://unifoundry.com/unifont.html"; diff --git a/pkgs/data/fonts/uw-ttyp0/default.nix b/pkgs/data/fonts/uw-ttyp0/default.nix index 96cde444d2b..b0e58faed60 100644 --- a/pkgs/data/fonts/uw-ttyp0/default.nix +++ b/pkgs/data/fonts/uw-ttyp0/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { install -m 644 -D psf/*.psf -t "$fontDir" # install otb fonts - fontDir="$otb/share/fonts/X11/misc" + fontDir="$out/share/fonts/X11/misc" install -m 644 -D otb/*.otb -t "$fontDir" mkfontdir "$fontDir" ''; @@ -80,8 +80,6 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - outputs = [ "out" "otb" ]; - meta = with stdenv.lib; { description = "Monospace bitmap screen fonts for X11"; homepage = "https://people.mpi-inf.mpg.de/~uwe/misc/uw-ttyp0/"; diff --git a/pkgs/data/misc/cldr-emoji-annotation/default.nix b/pkgs/data/misc/cldr-emoji-annotation/default.nix index f2dc4213e00..8164012b69a 100644 --- a/pkgs/data/misc/cldr-emoji-annotation/default.nix +++ b/pkgs/data/misc/cldr-emoji-annotation/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "cldr-emoji-annotation"; - version = "37.0_13.0_0_1"; + version = "37.0_13.0_0_2"; src = fetchFromGitHub { owner = "fujiwarat"; repo = "cldr-emoji-annotation"; rev = version; - sha256 = "19cqxyrap3p7djzzs99pndjbcvzmdv86n2m1sw2zqiwpirw7y1sy"; + sha256 = "0la3h6l58j9jfjvzwz65x56ijx7sppirwpqbqc06if4c2g0kzswj"; }; nativeBuildInputs = [ diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 6426f2a222f..5f09927e15c 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "7.4.2"; + version = "7.5.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0kq7d8nqp8m0kbh2k9s0yybfdkyfkhbkjsv22lplnzh1p84pnlx7"; + sha256 = "0ig5wc6dkbly6yrvd13h4lyr8x0y7k3d9iv4rhg0pnjgcpna83mw"; }; buildInputs = [ @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { runHook preInstall mkdir -p $out/share/themes cp -a Marwaita* $out/share/themes - rm $out/share/themes/*/COPYING runHook postInstall ''; diff --git a/pkgs/data/themes/venta/default.nix b/pkgs/data/themes/venta/default.nix new file mode 100644 index 00000000000..1086aaeb709 --- /dev/null +++ b/pkgs/data/themes/venta/default.nix @@ -0,0 +1,47 @@ +{ stdenv +, fetchFromGitHub +, gdk-pixbuf +, gtk-engine-murrine +, gtk_engines +, librsvg +}: + +stdenv.mkDerivation rec { + pname = "venta"; + version = "2020-08-20"; + + src = fetchFromGitHub { + owner = "darkomarko42"; + repo = pname; + rev = "f9b7ea560def5c9d25a14015d265ba559d3501ca"; + sha256 = "13rdavspz1q3zk2h04jpd77hxdcifg42kd71qq13ryg4b5yzqqgb"; + }; + + buildInputs = [ + gdk-pixbuf + gtk_engines + librsvg + ]; + + propagatedUserEnvPkgs = [ + gtk-engine-murrine + ]; + + dontBuild = true; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/themes + cp -a Venta* $out/share/themes + rm $out/share/themes/*/COPYING + runHook postInstall + ''; + + meta = with stdenv.lib; { + description = "Gtk theme based on windows 10 style"; + homepage = "https://www.pling.com/p/1386774/"; + license = licenses.gpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/desktops/deepin/dde-api/default.nix b/pkgs/desktops/deepin/dde-api/default.nix deleted file mode 100644 index 95e38a86416..00000000000 --- a/pkgs/desktops/deepin/dde-api/default.nix +++ /dev/null @@ -1,128 +0,0 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -, pkgconfig -, alsaLib -, bc -, blur-effect -, coreutils -, deepin -, deepin-gettext-tools -, fontconfig -, go -, go-dbus-factory -, go-gir-generator -, go-lib -, grub2 -, gtk3 -, libcanberra -, libgudev -, librsvg -, poppler -, pulseaudio -, rfkill -, xcur2png -}: - -buildGoPackage rec { - pname = "dde-api"; - version = "5.0.0"; - - goPackagePath = "pkg.deepin.io/dde/api"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0iv4krj6dqdknwvmax7aj40k1h96259kqcfnljadrwpl7cvsvp5p"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ - pkgconfig - deepin-gettext-tools # build - deepin.setupHook - - # TODO: using $PATH to find run time executable does not work with cross compiling - bc # run (to adjust grub theme?) - blur-effect # run (is it really needed?) - coreutils # run (is it really needed?) - fontconfig # run (is it really needed?) - rfkill # run - xcur2png # run - grub2 # run (is it really needed?) - ]; - - buildInputs = [ - go-dbus-factory # needed - go-gir-generator # needed - go-lib # build - - alsaLib # needed - #glib # ? arch - gtk3 # build run - libcanberra # build run - libgudev # needed - librsvg # build run - poppler # build run - pulseaudio # needed - #locales # run (locale-helper needs locale-gen, which is unavailable on NixOS?) - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - fixPath $out /usr/lib/deepin-api \ - lunar-calendar/main.go \ - misc/services/com.deepin.api.CursorHelper.service \ - misc/services/com.deepin.api.Graphic.service \ - misc/services/com.deepin.api.LunarCalendar.service \ - misc/services/com.deepin.api.Pinyin.service \ - misc/system-services/com.deepin.api.Device.service \ - misc/system-services/com.deepin.api.LocaleHelper.service \ - misc/system-services/com.deepin.api.SoundThemePlayer.service \ - misc/systemd/system/deepin-shutdown-sound.service \ - theme_thumb/gtk/gtk.go \ - thumbnails/gtk/gtk.go - fixPath $out /boot/grub Makefile # TODO: confirm where to install grub themes - fixPath $out /var Makefile - - # This package wants to install polkit local authority files into - # /var/lib. Nix does not allow a package to install files into /var/lib - # because it is outside of the Nix store and should contain applications - # state information (persistent data modified by programs as they - # run). Polkit looks for them in both /etc/polkit-1 and - # /var/lib/polkit-1 (with /etc having priority over /var/lib). An - # work around is to install them to $out/etc and simlnk them to - # /etc in the deepin module. - - sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile - ''; - - buildPhase = '' - export GOCACHE="$TMPDIR/go-cache"; - make -C go/src/${goPackagePath} - ''; - - installPhase = '' - make install PREFIX="$out" SYSTEMD_LIB_DIR="$out/lib" -C go/src/${goPackagePath} - mv $out/share/gocode $out/share/go - remove-references-to -t ${go} $out/lib/deepin-api/* - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Go-lang bindings for dde-daemon"; - homepage = "https://github.com/linuxdeepin/dde-api"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - broken = true; # 2020-08-22 https://hydra.nixos.org/build/125354866/nixlog/2 - }; -} diff --git a/pkgs/desktops/deepin/dde-api/deps.nix b/pkgs/desktops/deepin/dde-api/deps.nix deleted file mode 100644 index 5ebe1f6af95..00000000000 --- a/pkgs/desktops/deepin/dde-api/deps.nix +++ /dev/null @@ -1,102 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; - sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; - }; - } - { - goPackagePath = "github.com/cryptix/wav"; - fetch = { - type = "git"; - url = "https://github.com/cryptix/wav"; - rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; - sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; - }; - } - { - goPackagePath = "github.com/disintegration/imaging"; - fetch = { - type = "git"; - url = "https://github.com/disintegration/imaging"; - rev = "9aab30e6aa535fe3337b489b76759ef97dfaf362"; - sha256 = "015amm3x989hl3r4gxnixj602fl9j8z53n0lrq804cbfbk7a31fw"; - }; - } - { - goPackagePath = "github.com/fogleman/gg"; - fetch = { - type = "git"; - url = "https://github.com/fogleman/gg"; - rev = "4dc34561c649343936bb2d29e23959bd6d98ab12"; - sha256 = "1x1finzdrr80dd3r7wvf7zb184yjf4dawz7s581p2dr64dcialww"; - }; - } - { - goPackagePath = "github.com/golang/freetype"; - fetch = { - type = "git"; - url = "https://github.com/golang/freetype"; - rev = "e2365dfdc4a05e4b8299a783240d4a7d5a65d4e4"; - sha256 = "194w3djc6fv1rgcjqds085b9fq074panc5vw582bcb8dbfzsrqxc"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-x11-client"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; - sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; - }; - } - { - goPackagePath = "github.com/nfnt/resize"; - fetch = { - type = "git"; - url = "https://github.com/nfnt/resize"; - rev = "83c6a9932646f83e3267f353373d47347b6036b2"; - sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24"; - sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "daa7c04131f568e31c51927b359a2d197a357058"; - sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/desktops/deepin/dde-calendar/default.nix b/pkgs/desktops/deepin/dde-calendar/default.nix deleted file mode 100644 index 094f3447c6b..00000000000 --- a/pkgs/desktops/deepin/dde-calendar/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, qttools -, deepin-gettext-tools -, dtkcore -, dtkwidget -, deepin -}: - -mkDerivation rec { - pname = "dde-calendar"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1zzr3crkz4l5l135y0m53vqhv7fkrbvbspk8295swz9gsm3f7ah9"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - deepin-gettext-tools - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - patchShebangs translate_desktop.sh - - fixPath $out /usr com.deepin.Calendar.service - - sed -i translate_desktop.sh \ - -e "s,/usr/bin/deepin-desktop-ts-convert,deepin-desktop-ts-convert," - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Calendar for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-calendar"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-control-center/default.nix b/pkgs/desktops/deepin/dde-control-center/default.nix deleted file mode 100644 index 850e39b9367..00000000000 --- a/pkgs/desktops/deepin/dde-control-center/default.nix +++ /dev/null @@ -1,150 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, deepin -, qttools -, qtdeclarative -, networkmanager -, qtsvg -, qtx11extras -, dtkcore -, dtkwidget -, geoip -, gsettings-qt -, dde-network-utils -, networkmanager-qt -, xorg -, mtdev -, fontconfig -, freetype -, dde-api -, dde-daemon -, qt5integration -, deepin-desktop-base -, deepin-desktop-schemas -, dbus -, systemd -, dde-qt-dbus-factory -, qtmultimedia -, qtbase -, glib -, gnome3 -, which -, substituteAll -, tzdata -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-control-center"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "10bx8bpvi3ib32a3l4nyb1j0iq3bch8jm9wfm6d5v0ym1zb92x3b"; - }; - - nativeBuildInputs = [ - cmake - deepin.setupHook - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - dde-api - dde-daemon - dde-network-utils - dde-qt-dbus-factory - deepin-desktop-base - deepin-desktop-schemas - dtkcore - dtkwidget - fontconfig - freetype - geoip - glib - gnome3.networkmanager-l2tp - gnome3.networkmanager-openconnect - gnome3.networkmanager-openvpn - gnome3.networkmanager-vpnc - gsettings-qt - mtdev - networkmanager-qt - qt5integration - qtbase - qtdeclarative - qtmultimedia - qtsvg - qttools - qtx11extras - xorg.libX11 - xorg.libXext - xorg.libXrandr - xorg.libxcb - ]; - - cmakeFlags = [ - "-DDISABLE_SYS_UPDATE=YES" - "-DDCC_DISABLE_GRUB=YES" - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - nmcli = "${networkmanager}/bin/nmcli"; - which = "${which}/bin/which"; - # not packaged - # dman = "${deepin-manual}/bin/dman"; - inherit tzdata; - # exclusive to deepin linux? - # allows to synchronize configuration files to cloud networks - # deepin_sync = "${deepin-sync}"; - }) - ]; - - postPatch = '' - searchHardCodedPaths - - patchShebangs translate_ts2desktop.sh - patchShebangs translate_generation.sh - patchShebangs translate_desktop2ts.sh - - fixPath $out /usr dde-control-center-autostart.desktop \ - com.deepin.dde.ControlCenter.service \ - src/frame/widgets/utils.h - - substituteInPlace dde-control-center.desktop \ - --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace com.deepin.controlcenter.addomain.policy \ - --replace "/bin/systemctl" "/run/current-system/sw/bin/systemctl" - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # debuging - searchForUnresolvedDLL $out - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Control panel of Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-control-center"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch b/pkgs/desktops/deepin/dde-control-center/fix-paths.patch deleted file mode 100644 index 2c6e204d343..00000000000 --- a/pkgs/desktops/deepin/dde-control-center/fix-paths.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff --git a/src/frame/frame.cpp b/src/frame/frame.cpp -index 90d06f8..7cdad04 100644 ---- a/src/frame/frame.cpp -+++ b/src/frame/frame.cpp -@@ -375,7 +375,7 @@ void Frame::keyPressEvent(QKeyEvent *e) - #ifdef QT_DEBUG - case Qt::Key_Escape: qApp->quit(); break; - #endif -- case Qt::Key_F1: QProcess::startDetached("dman", QStringList("dde")); break; -+ case Qt::Key_F1: QProcess::startDetached("@dman@", QStringList("dde")); break; - default:; - } - } -diff --git a/src/frame/modules/datetime/timezone_dialog/timezone.cpp b/src/frame/modules/datetime/timezone_dialog/timezone.cpp -index 3dd4aad..5f1b363 100644 ---- a/src/frame/modules/datetime/timezone_dialog/timezone.cpp -+++ b/src/frame/modules/datetime/timezone_dialog/timezone.cpp -@@ -46,7 +46,7 @@ namespace installer { - namespace { - - // Absolute path to zone.tab file. --const char kZoneTabFile[] = "/usr/share/zoneinfo/zone.tab"; -+const char kZoneTabFile[] = "@tzdata@/share/zoneinfo/zone.tab"; - - // Absolute path to backward timezone file. - const char kTimezoneAliasFile[] = "/timezone_alias"; -diff --git a/src/frame/modules/network/connectionvpneditpage.cpp b/src/frame/modules/network/connectionvpneditpage.cpp -index e292865..95c5a2b 100644 ---- a/src/frame/modules/network/connectionvpneditpage.cpp -+++ b/src/frame/modules/network/connectionvpneditpage.cpp -@@ -215,7 +215,7 @@ void ConnectionVpnEditPage::exportConnConfig() - qDebug() << Q_FUNC_INFO << args; - - QProcess p; -- p.start("nmcli", args); -+ p.start("@nmcli@", args); - p.waitForFinished(); - qDebug() << p.readAllStandardOutput(); - qDebug() << p.readAllStandardError(); -diff --git a/src/frame/modules/network/vpnpage.cpp b/src/frame/modules/network/vpnpage.cpp -index 521a603..450d1a6 100644 ---- a/src/frame/modules/network/vpnpage.cpp -+++ b/src/frame/modules/network/vpnpage.cpp -@@ -224,7 +224,7 @@ void VpnPage::importVPN() - qDebug() << args; - - QProcess p; -- p.start("nmcli", args); -+ p.start("@nmcli@", args); - p.waitForFinished(); - const auto stat = p.exitCode(); - const QString output = p.readAllStandardOutput(); -diff --git a/src/frame/modules/sync/syncworker.cpp b/src/frame/modules/sync/syncworker.cpp -index 3f929bf..6f240d9 100644 ---- a/src/frame/modules/sync/syncworker.cpp -+++ b/src/frame/modules/sync/syncworker.cpp -@@ -24,7 +24,7 @@ SyncWorker::SyncWorker(SyncModel *model, QObject *parent) - - m_model->setSyncIsValid( - QProcess::execute( -- "which", QStringList() << "/usr/lib/deepin-sync-daemon/deepin-sync-daemon") == -+ "@which@", QStringList() << "@deepin_sync@/lib/deepin-sync-daemon/deepin-sync-daemon") == - 0 && - valueByQSettings<bool>(DCC_CONFIG_FILES, "CloudSync", "AllowCloudSync", false)); - } diff --git a/pkgs/desktops/deepin/dde-daemon/default.nix b/pkgs/desktops/deepin/dde-daemon/default.nix deleted file mode 100644 index c4edcef15af..00000000000 --- a/pkgs/desktops/deepin/dde-daemon/default.nix +++ /dev/null @@ -1,159 +0,0 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -, fetchpatch -, pkgconfig -, go-dbus-factory -, go-gir-generator -, go-lib -, deepin-gettext-tools -, gettext -, dde-api -, deepin-desktop-schemas -, deepin-wallpapers -, deepin-desktop-base -, alsaLib -, glib -, gtk3 -, libgudev -, libinput -, libnl -, librsvg -, linux-pam -, networkmanager -, pulseaudio -, python3 -, hicolor-icon-theme -, glibc -, tzdata -, go -, deepin -, makeWrapper -, xkeyboard_config -, wrapGAppsHook -}: - -buildGoPackage rec { - pname = "dde-daemon"; - version = "5.0.0"; - - goPackagePath = "pkg.deepin.io/dde/daemon"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "08jri31bvzbaxaq78rpp46ndv0li2dij63hakvd9b9gs786srql1"; - }; - - patches = [ - # https://github.com/linuxdeepin/dde-daemon/issues/51 - (fetchpatch { - url = "https://github.com/jouyouyun/tap-gesture-patches/raw/master/patches/dde-daemon_3.8.0.patch"; - sha256 = "1ampdsp9zlg263flswdw9gj10n7gxh7zi6w6z9jgh29xlai05pvh"; - }) - ]; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ - pkgconfig - deepin-gettext-tools - gettext - networkmanager - networkmanager.dev - python3 - makeWrapper - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - go-dbus-factory - go-gir-generator - go-lib - linux-pam - - alsaLib - dde-api - deepin-desktop-base - deepin-desktop-schemas - deepin-wallpapers - glib - libgudev - gtk3 - hicolor-icon-theme - libinput - libnl - librsvg - pulseaudio - tzdata - xkeyboard_config - ]; - - postPatch = '' - searchHardCodedPaths # debugging - patchShebangs network/nm_generator/gen_nm_consts.py - - fixPath $out /usr/share/dde/data launcher/manager.go dock/dock_manager_init.go - fixPath $out /usr/share/dde-daemon launcher/manager.go gesture/config.go - fixPath ${networkmanager.dev} /usr/share/gir-1.0/NM-1.0.gir network/nm_generator/Makefile - fixPath ${glibc.bin} /usr/bin/getconf systeminfo/utils.go - fixPath ${deepin-desktop-base} /etc/deepin-version systeminfo/version.go accounts/deepinversion.go - fixPath ${tzdata} /usr/share/zoneinfo timedate/zoneinfo/zone.go - fixPath ${dde-api} /usr/lib/deepin-api grub2/modify_manger.go accounts/image_blur.go - fixPath ${deepin-wallpapers} /usr/share/wallpapers appearance/background/list.go accounts/user.go - fixPath ${xkeyboard_config} /usr/share/X11/xkb inputdevices/layout_list.go - - # TODO: deepin-system-monitor comes from dde-extra - - sed -i -e "s|{DESTDIR}/etc|{DESTDIR}$out/etc|" Makefile - sed -i -e "s|{DESTDIR}/lib|{DESTDIR}$out/lib|" Makefile - sed -i -e "s|{DESTDIR}/var|{DESTDIR}$out/var|" Makefile - - find -type f -exec sed -i -e "s,/usr/lib/deepin-daemon,$out/lib/deepin-daemon," {} + - - # This package wants to install polkit local authority files into - # /var/lib. Nix does not allow a package to install files into /var/lib - # because it is outside of the Nix store and should contain applications - # state information (persistent data modified by programs as they - # run). Polkit looks for them in both /etc/polkit-1 and - # /var/lib/polkit-1 (with /etc having priority over /var/lib). An - # work around is to install them to $out/etc and simlnk them to - # /etc in the deepin module. - - sed -i -e "s,/var/lib/polkit-1,/etc/polkit-1," Makefile - ''; - - buildPhase = '' - export PAM_MODULE_DIR="$out/lib/security" - # compilation of the nm module is failing - #make -C go/src/${goPackagePath}/network/nm_generator gen-nm-code - make -C go/src/${goPackagePath} - ''; - - installPhase = '' - make install PREFIX="$out" -C go/src/${goPackagePath} - remove-references-to -t ${go} $out/lib/deepin-daemon/* - searchHardCodedPaths $out - ''; - - postFixup = '' - # wrapGAppsHook does not work with binaries outside of $out/bin or $out/libexec - for binary in $out/lib/deepin-daemon/*; do - wrapGApp "$binary" - done - - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Daemon for handling Deepin Desktop Environment session settings"; - homepage = "https://github.com/linuxdeepin/dde-daemon"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-daemon/deps.nix b/pkgs/desktops/deepin/dde-daemon/deps.nix deleted file mode 100644 index bcc5ab81808..00000000000 --- a/pkgs/desktops/deepin/dde-daemon/deps.nix +++ /dev/null @@ -1,111 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "fb15b899a75114aa79cc930e33c46b577cc664b1"; - sha256 = "1vlasv4dgycydh5wx6jdcvz40zdv90zz1h7836z7lhsi2ymvii26"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "f65c72e2690dc4b403c8bd637baf4611cd4c069b"; - sha256 = "04jyqm7m3m01ppfy1f9xk4qvrwvs78q9zml6llyf2b3v5k6b2bbc"; - }; - } - { - goPackagePath = "github.com/axgle/mahonia"; - fetch = { - type = "git"; - url = "https://github.com/axgle/mahonia"; - rev = "3358181d7394e26beccfae0ffde05193ef3be33a"; - sha256 = "0b8wsrxmv8a0cqbnsg55lpf29pxy2zw8azvgh3ck664lqpcfybhq"; - }; - } - { - goPackagePath = "github.com/cryptix/wav"; - fetch = { - type = "git"; - url = "https://github.com/cryptix/wav"; - rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; - sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; - }; - } - { - goPackagePath = "github.com/gosexy/gettext"; - fetch = { - type = "git"; - url = "https://github.com/gosexy/gettext"; - rev = "74466a0a0c4a62fea38f44aa161d4bbfbe79dd6b"; - sha256 = "0asphx8nd7zmp88wk6aakk5292np7yw73akvfdvlvs9q5r5ahkgi"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-x11-client"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; - sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; - }; - } - { - goPackagePath = "github.com/msteinert/pam"; - fetch = { - type = "git"; - url = "https://github.com/msteinert/pam"; - rev = "f29b9f28d6f9a1f6c4e6fd5db731999eb946574b"; - sha256 = "1v5z51mgyz2glm7v0mg60xs1as88wx6cqhys2khc5d3khkr8q0qp"; - }; - } - { - goPackagePath = "github.com/nfnt/resize"; - fetch = { - type = "git"; - url = "https://github.com/nfnt/resize"; - rev = "83c6a9932646f83e3267f353373d47347b6036b2"; - sha256 = "005cpiwq28krbjf0zjwpfh63rp4s4is58700idn24fs3g7wdbwya"; - }; - } - { - goPackagePath = "golang.org/x/image"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/image"; - rev = "e7c1f5e7dbb87d8921928a6d9fc52fb31ce73b24"; - sha256 = "0czp897aicqw1dgybj0hc2zzwb20rhqkdqm7siqci3yk7yk9cymf"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "daa7c04131f568e31c51927b359a2d197a357058"; - sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "4b67af870c6ffd08258ef1202f371aebccaf7b68"; - sha256 = "01mhy1xs2dh18kp6wdk1xnb34lbzv2qkvdwj7w5ha2qgm5rrm4ik"; - }; - } - { - goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/alecthomas/kingpin.v2"; - rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; - sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; - }; - } -] diff --git a/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch b/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch deleted file mode 100644 index 87b76045b43..00000000000 --- a/pkgs/desktops/deepin/dde-dock/dde-dock.plugins-dir.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c48867b73485b34b95f14e9b9bbb54507fc77648 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> -Date: Fri, 19 Apr 2019 18:21:49 -0300 -Subject: [PATCH] Use an environment variable for the plugins directory - ---- - frame/controller/dockpluginscontroller.cpp | 2 +- - plugins/tray/system-trays/systemtrayscontroller.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/frame/controller/dockpluginscontroller.cpp b/frame/controller/dockpluginscontroller.cpp -index 32a5885..efd53c8 100644 ---- a/frame/controller/dockpluginscontroller.cpp -+++ b/frame/controller/dockpluginscontroller.cpp -@@ -126,7 +126,7 @@ void DockPluginsController::startLoader() - { - QString pluginsDir("../plugins"); - if (!QDir(pluginsDir).exists()) { -- pluginsDir = "/usr/lib/dde-dock/plugins"; -+ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins"); - } - qDebug() << "using dock plugins dir:" << pluginsDir; - -diff --git a/plugins/tray/system-trays/systemtrayscontroller.cpp b/plugins/tray/system-trays/systemtrayscontroller.cpp -index 0c8ca88..7c47d25 100644 ---- a/plugins/tray/system-trays/systemtrayscontroller.cpp -+++ b/plugins/tray/system-trays/systemtrayscontroller.cpp -@@ -159,7 +159,7 @@ void SystemTraysController::startLoader() - { - QString pluginsDir("../plugins/system-trays"); - if (!QDir(pluginsDir).exists()) { -- pluginsDir = "/usr/lib/dde-dock/plugins/system-trays"; -+ pluginsDir = QProcessEnvironment::systemEnvironment().value("DDE_DOCK_PLUGINS_DIR", "@out@/lib/dde-dock/plugins") + "/system-trays"; - } - qDebug() << "using system tray plugins dir:" << pluginsDir; - --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-dock/default.nix b/pkgs/desktops/deepin/dde-dock/default.nix deleted file mode 100644 index 68f2caa6319..00000000000 --- a/pkgs/desktops/deepin/dde-dock/default.nix +++ /dev/null @@ -1,116 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, cmake -, pkgconfig -, qttools -, qtx11extras -, qtsvg -, polkit -, gsettings-qt -, dtkcore -, dtkwidget -, dde-qt-dbus-factory -, dde-network-utils -, dde-daemon -, deepin-desktop-schemas -, xorg -, glib -, wrapGAppsHook -, deepin -, plugins ? [ ] -, symlinkJoin -, makeWrapper -, libdbusmenu -}: - -let - unwrapped = mkDerivation rec { - pname = "dde-dock"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "12dshsqhzajnxm7r53qg0c84b6xlj313qnssnx2m25z4jdp5i7pr"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dde-daemon - dde-network-utils - dde-qt-dbus-factory - deepin-desktop-schemas - dtkcore - dtkwidget - glib - gsettings-qt - libdbusmenu - polkit - qtsvg - qtx11extras - xorg.libXdmcp - xorg.libXtst - xorg.libpthreadstubs - ]; - - patches = [ - ./dde-dock.plugins-dir.patch - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - fixPath $out /etc/dde-dock plugins/keyboard-layout/CMakeLists.txt - fixPath $out /usr cmake/DdeDock/DdeDockConfig.cmake - fixPath $out /usr dde-dock.pc - fixPath $out /usr/bin/dde-dock frame/com.deepin.dde.Dock.service - fixPath $out /usr/share/dbus-1 CMakeLists.txt - fixPath ${dde-daemon} /usr/lib/deepin-daemon frame/item/showdesktopitem.cpp - fixPath ${dde-network-utils} /usr/share/dde-network-utils frame/main.cpp - fixPath ${polkit} /usr/bin/pkexec plugins/overlay-warning/overlay-warning-plugin.cpp - - substituteInPlace frame/controller/dockpluginscontroller.cpp --subst-var-by out $out - substituteInPlace plugins/tray/system-trays/systemtrayscontroller.cpp --subst-var-by out $out - ''; - - cmakeFlags = [ "-DDOCK_TRAY_USE_NATIVE_POPUP=YES" ]; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Dock for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-dock"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; - }; - -in -if plugins == [ ] -then unwrapped -else import ./wrapper.nix { - inherit makeWrapper symlinkJoin plugins; - dde-dock = unwrapped; -} diff --git a/pkgs/desktops/deepin/dde-dock/wrapper.nix b/pkgs/desktops/deepin/dde-dock/wrapper.nix deleted file mode 100644 index 1690230a99e..00000000000 --- a/pkgs/desktops/deepin/dde-dock/wrapper.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ makeWrapper -, symlinkJoin -, dde-dock -, plugins -}: - -symlinkJoin { - name = "dde-dock-with-plugins-${dde-dock.version}"; - - paths = [ dde-dock ] ++ plugins; - - buildInputs = [ makeWrapper ]; - - postBuild = '' - wrapProgram $out/bin/dde-dock \ - --set DDE_DOCK_PLUGINS_DIR "$out/lib/dde-dock/plugins" - - rm $out/share/dbus-1/services/com.deepin.dde.Dock.service - - substitute ${dde-dock}/share/dbus-1/services/com.deepin.dde.Dock.service $out/share/dbus-1/services/com.deepin.dde.Dock.service \ - --replace ${dde-dock} $out - ''; - - inherit (dde-dock) meta; -} diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch deleted file mode 100644 index 253a67b04ec..00000000000 --- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-mime-cache-paths.patch +++ /dev/null @@ -1,323 +0,0 @@ -From 29f4ad88e2294ae70b10180e7361d135c4e5c896 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> -Date: Mon, 13 May 2019 00:09:42 -0300 -Subject: [PATCH 2/2] Use XDG to look for mime cache - ---- - .../shutil/mimesappsmanager.cpp | 230 ++++++++++-------- - .../shutil/mimesappsmanager.h | 6 +- - 2 files changed, 125 insertions(+), 111 deletions(-) - -diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -index c9e53630..7a21df51 100644 ---- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp -+++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -@@ -552,14 +552,20 @@ QString MimesAppsManager::getMimeAppsCacheFile() - return QString("%1/%2").arg(DFMStandardPaths::location(DFMStandardPaths::CachePath), "MimeApps.json"); - } - --QString MimesAppsManager::getMimeInfoCacheFilePath() -+QStringList MimesAppsManager::getMimeInfoCacheFilePath() - { -- return "/usr/share/applications/mimeinfo.cache"; -+ QStringList paths; -+ for (const QString dir : getMimeInfoCacheFileRootPath() ) -+ paths.append(dir + QDir::separator() + "mimeinfo.cache"); -+ qDebug() << "getMimeInfoCacheFilePath: " << paths; -+ return paths; - } - --QString MimesAppsManager::getMimeInfoCacheFileRootPath() -+QStringList MimesAppsManager::getMimeInfoCacheFileRootPath() - { -- return "/usr/share/applications"; -+ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "getMimeInfoCacheFileRootPath: " << paths; -+ return paths; - } - - QString MimesAppsManager::getDesktopFilesCacheFile() -@@ -574,23 +580,27 @@ QString MimesAppsManager::getDesktopIconsCacheFile() - - QStringList MimesAppsManager::getDesktopFiles() - { -- QStringList desktopFiles; -+ QStringList desktopFiles; - -- foreach (QString desktopFolder, getApplicationsFolders()) { -- QDirIterator it(desktopFolder, QStringList("*.desktop"), -- QDir::Files | QDir::NoDotAndDotDot, -- QDirIterator::Subdirectories); -- while (it.hasNext()) { -- it.next(); -- desktopFiles.append(it.filePath()); -- } -- } -- return desktopFiles; -+ foreach (QString desktopFolder, getApplicationsFolders()) { -+ QDirIterator it(desktopFolder, QStringList("*.desktop"), -+ QDir::Files | QDir::NoDotAndDotDot, -+ QDirIterator::Subdirectories); -+ while (it.hasNext()) { -+ it.next(); -+ desktopFiles.append(it.filePath()); -+ } -+ } -+ return desktopFiles; - } - --QString MimesAppsManager::getDDEMimeTypeFile() -+QStringList MimesAppsManager::getDDEMimeTypeFile() - { -- return QString("%1/%2/%3").arg(getMimeInfoCacheFileRootPath(), "deepin", "dde-mimetype.list"); -+ QStringList paths; -+ for (const QString path : getMimeInfoCacheFileRootPath()) -+ paths.append(QString("%1/%2/%3").arg(path, "deepin", "dde-mimetype.list")); -+ qDebug() << "getDDEMimeTypeFile: " << paths; -+ return paths; - } - - QMap<QString, DesktopFile> MimesAppsManager::getDesktopObjs() -@@ -663,124 +673,128 @@ void MimesAppsManager::initMimeTypeApps() - MimeApps.insert(key, orderApps); - } - -- //check mime apps from cache -- QFile f(getMimeInfoCacheFilePath()); -- if(!f.open(QIODevice::ReadOnly)){ -- qDebug () << "failed to read mime info cache file:" << f.errorString(); -- return; -- } -- - QStringList audioDesktopList; - QStringList imageDeksopList; - QStringList textDekstopList; - QStringList videoDesktopList; - -- while (!f.atEnd()) { -- QString data = f.readLine(); -- QString _desktops = data.split("=").last(); -- QString mimeType = data.split("=").first(); -- QStringList desktops = _desktops.split(";"); -- -- foreach (const QString desktop, desktops) { -- if(desktop.isEmpty() || audioDesktopList.contains(desktop)) -- continue; -+ //check mime apps from cache -+ for (const QString path : getMimeInfoCacheFilePath()) { -+ QFile f(path); -+ if(!f.open(QIODevice::ReadOnly)){ -+ qDebug () << "failed to read mime info cache file:" << f.errorString(); -+ return; -+ } - -- if(mimeType.startsWith("audio")){ -- if(!audioDesktopList.contains(desktop)) -- audioDesktopList << desktop; -- } else if(mimeType.startsWith("image")){ -- if(!imageDeksopList.contains(desktop)) -- imageDeksopList << desktop; -- } else if(mimeType.startsWith("text")){ -- if(!textDekstopList.contains(desktop)) -- textDekstopList << desktop; -- } else if(mimeType.startsWith("video")){ -- if(!videoDesktopList.contains(desktop)) -- videoDesktopList << desktop; -+ while (!f.atEnd()) { -+ QString data = f.readLine(); -+ QString _desktops = data.split("=").last(); -+ QString mimeType = data.split("=").first(); -+ QStringList desktops = _desktops.split(";"); -+ -+ foreach (const QString desktop, desktops) { -+ if(desktop.isEmpty() || audioDesktopList.contains(desktop)) -+ continue; -+ -+ if(mimeType.startsWith("audio")){ -+ if(!audioDesktopList.contains(desktop)) -+ audioDesktopList << desktop; -+ } else if(mimeType.startsWith("image")){ -+ if(!imageDeksopList.contains(desktop)) -+ imageDeksopList << desktop; -+ } else if(mimeType.startsWith("text")){ -+ if(!textDekstopList.contains(desktop)) -+ textDekstopList << desktop; -+ } else if(mimeType.startsWith("video")){ -+ if(!videoDesktopList.contains(desktop)) -+ videoDesktopList << desktop; -+ } - } - } -+ f.close(); - } -- f.close(); - -- const QString mimeInfoCacheRootPath = getMimeInfoCacheFileRootPath(); -- foreach (QString desktop, audioDesktopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- AudioMimeApps.insert(path, df); -- } -+ for (const QString mimeInfoCacheRootPath : getMimeInfoCacheFileRootPath()) { -+ foreach (QString desktop, audioDesktopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ AudioMimeApps.insert(path, df); -+ } - -- foreach (QString desktop, imageDeksopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- ImageMimeApps.insert(path, df); -- } -+ foreach (QString desktop, imageDeksopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ ImageMimeApps.insert(path, df); -+ } - -- foreach (QString desktop, textDekstopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- TextMimeApps.insert(path, df); -- } -+ foreach (QString desktop, textDekstopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ TextMimeApps.insert(path, df); -+ } - -- foreach (QString desktop, videoDesktopList) { -- const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -- if(!QFile::exists(path)) -- continue; -- DesktopFile df(path); -- VideoMimeApps.insert(path, df); -+ foreach (QString desktop, videoDesktopList) { -+ const QString path = QString("%1/%2").arg(mimeInfoCacheRootPath,desktop); -+ if(!QFile::exists(path)) -+ continue; -+ DesktopFile df(path); -+ VideoMimeApps.insert(path, df); -+ } - } -- - return; - } - - void MimesAppsManager::loadDDEMimeTypes() - { -- QSettings settings(getDDEMimeTypeFile(), QSettings::IniFormat); -- qDebug() << settings.childGroups(); -+ for (const QString path : getDDEMimeTypeFile()) { -+ QSettings settings(path, QSettings::IniFormat); -+ qDebug() << settings.childGroups(); - -- QFile file(getDDEMimeTypeFile()); -- if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { -- return; -- } -+ QFile file(path); -+ if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { -+ continue; -+ } -+ -+ // Read propeties -+ QTextStream in(&file); -+ QString desktopKey; -+ while (!in.atEnd()) { - -- // Read propeties -- QTextStream in(&file); -- QString desktopKey; -- while (!in.atEnd()) { -+ // Read new line -+ QString line = in.readLine(); - -- // Read new line -- QString line = in.readLine(); -+ // Skip empty line or line with invalid format -+ if (line.trimmed().isEmpty()) { -+ continue; -+ } - -- // Skip empty line or line with invalid format -- if (line.trimmed().isEmpty()) { -- continue; -- } -+ // Read group -+ // NOTE: symbols '[' and ']' can be found not only in group names, but -+ // only group can start with '[' - -- // Read group -- // NOTE: symbols '[' and ']' can be found not only in group names, but -- // only group can start with '[' -+ if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) { -+ QString tmp = line.trimmed().replace("[", "").replace("]", ""); -+ desktopKey = tmp; -+ continue; -+ } - -- if (line.trimmed().startsWith("[") && line.trimmed().endsWith("]")) { -- QString tmp = line.trimmed().replace("[", "").replace("]", ""); -- desktopKey = tmp; -- continue; -- } -- -- // If we are in correct group and line contains assignment then read data -- int first_equal = line.indexOf('='); -- if (!desktopKey.isEmpty() && first_equal >= 0) { -- QString value = line.mid(first_equal + 1); -- QStringList mimetypes = value.split(";"); -- DDE_MimeTypes.insert(desktopKey, mimetypes); -- desktopKey.clear(); -+ // If we are in correct group and line contains assignment then read data -+ int first_equal = line.indexOf('='); -+ if (!desktopKey.isEmpty() && first_equal >= 0) { -+ QString value = line.mid(first_equal + 1); -+ QStringList mimetypes = value.split(";"); -+ DDE_MimeTypes.insert(desktopKey, mimetypes); -+ desktopKey.clear(); -+ } - } -+ file.close(); - } -- file.close(); - } - - bool MimesAppsManager::lessByDateTime(const QFileInfo &f1, const QFileInfo &f2) -diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.h b/dde-file-manager-lib/shutil/mimesappsmanager.h -index 223c80aa..00a61302 100644 ---- a/dde-file-manager-lib/shutil/mimesappsmanager.h -+++ b/dde-file-manager-lib/shutil/mimesappsmanager.h -@@ -101,12 +101,12 @@ public: - - static QStringList getApplicationsFolders(); - static QString getMimeAppsCacheFile(); -- static QString getMimeInfoCacheFilePath(); -- static QString getMimeInfoCacheFileRootPath(); -+ static QStringList getMimeInfoCacheFilePath(); -+ static QStringList getMimeInfoCacheFileRootPath(); - static QString getDesktopFilesCacheFile(); - static QString getDesktopIconsCacheFile(); - static QStringList getDesktopFiles(); -- static QString getDDEMimeTypeFile(); -+ static QStringList getDDEMimeTypeFile(); - static QMap<QString, DesktopFile> getDesktopObjs(); - static void initMimeTypeApps(); - static void loadDDEMimeTypes(); --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch deleted file mode 100644 index 3ced15e7e5a..00000000000 --- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.fix-paths.patch +++ /dev/null @@ -1,89 +0,0 @@ -From e68d983a6befd223087916cb3fe31baee77decc4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> -Date: Sun, 12 May 2019 08:50:07 -0300 -Subject: [PATCH 1/2] Use qt library to determine where to look for application - files - ---- - dde-file-manager-lib/shutil/fileutils.cpp | 34 ++++++++++++------- - .../shutil/mimesappsmanager.cpp | 11 ++---- - 2 files changed, 25 insertions(+), 20 deletions(-) - -diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp -index ae8120d3..d6a0573a 100644 ---- a/dde-file-manager-lib/shutil/fileutils.cpp -+++ b/dde-file-manager-lib/shutil/fileutils.cpp -@@ -242,13 +242,19 @@ bool FileUtils::isArchive(const QString &path) - */ - QStringList FileUtils::getApplicationNames() { - QStringList appNames; -- QDirIterator it("/usr/share/applications", QStringList("*.desktop"), -- QDir::Files | QDir::NoDotAndDotDot, -- QDirIterator::Subdirectories); -- while (it.hasNext()) { -- it.next(); -- appNames.append(it.fileName()); -+ -+ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "dde-file-manager getApplicationNames desktopDirs:" << desktopDirs; -+ for (const QString &dir : desktopDirs) { -+ QDirIterator it(dir, QStringList("*.desktop"), -+ QDir::Files | QDir::NoDotAndDotDot, -+ QDirIterator::Subdirectories); -+ while (it.hasNext()) { -+ it.next(); -+ appNames.append(it.fileName()); -+ } - } -+ - return appNames; - } - //--------------------------------------------------------------------------- -@@ -259,12 +265,16 @@ QStringList FileUtils::getApplicationNames() { - */ - QList<DesktopFile> FileUtils::getApplications() { - QList<DesktopFile> apps; -- QDirIterator it("/usr/share/applications", QStringList("*.desktop"), -- QDir::Files | QDir::NoDotAndDotDot, -- QDirIterator::Subdirectories); -- while (it.hasNext()) { -- it.next(); -- apps.append(DesktopFile(it.filePath())); -+ const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "dde-file-manager getApplications desktopDirs:" << desktopDirs; -+ for (const QString &dir : desktopDirs) { -+ QDirIterator it(dir, QStringList("*.desktop"), -+ QDir::Files | QDir::NoDotAndDotDot, -+ QDirIterator::Subdirectories); -+ while (it.hasNext()) { -+ it.next(); -+ apps.append(DesktopFile(it.filePath())); -+ } - } - return apps; - } -diff --git a/dde-file-manager-lib/shutil/mimesappsmanager.cpp b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -index c6149702..c9e53630 100644 ---- a/dde-file-manager-lib/shutil/mimesappsmanager.cpp -+++ b/dde-file-manager-lib/shutil/mimesappsmanager.cpp -@@ -542,14 +542,9 @@ QStringList MimesAppsManager::getrecommendedAppsFromMimeWhiteList(const DUrl &ur - - QStringList MimesAppsManager::getApplicationsFolders() - { -- QStringList desktopFolders; -- desktopFolders << QString("/usr/share/applications/") -- << QString("/usr/local/share/applications/") -- << QString("/usr/share/gnome/applications/") -- << QString("/var/lib/flatpak/exports/share/applications") -- << QDir::homePath() + QString("/.local/share/flatpak/exports/share/applications") -- << QDir::homePath() + QString( "/.local/share/applications" ); -- return desktopFolders; -+ QStringList paths = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation); -+ qDebug() << "dde-file-manager getApplicationsFolders:" << paths; -+ return paths; - } - - QString MimesAppsManager::getMimeAppsCacheFile() --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch b/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch deleted file mode 100644 index 582760e6db2..00000000000 --- a/pkgs/desktops/deepin/dde-file-manager/dde-file-manager.pixmaps-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 084c3cfcf4995c109ca2e96f042fe341f925b0b4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> -Date: Thu, 16 May 2019 19:00:52 -0300 -Subject: [PATCH 4/4] Use xdg to look for pixmap icons - ---- - dde-file-manager-lib/shutil/fileutils.cpp | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/dde-file-manager-lib/shutil/fileutils.cpp b/dde-file-manager-lib/shutil/fileutils.cpp -index d6a0573a..e912e7c2 100644 ---- a/dde-file-manager-lib/shutil/fileutils.cpp -+++ b/dde-file-manager-lib/shutil/fileutils.cpp -@@ -362,11 +362,16 @@ QIcon FileUtils::searchAppIcon(const DesktopFile &app, - } - - // Last chance -- QDir appIcons("/usr/share/pixmaps","", 0, QDir::Files | QDir::NoDotAndDotDot); -- QStringList iconFiles = appIcons.entryList(); -- QStringList searchIcons = iconFiles.filter(name); -- if (searchIcons.count() > 0) { -- return QIcon("/usr/share/pixmaps/" + searchIcons.at(0)); -+ const QStringList dirs = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); -+ qDebug() << "searchAppIcon: last chance: look for pixmaps at: " << dirs; -+ for (const QString &dir : dirs) { -+ const QString path = dir + QDir::separator() + "pixmaps"; -+ QDir appIcons(path,"", 0, QDir::Files | QDir::NoDotAndDotDot); -+ QStringList iconFiles = appIcons.entryList(); -+ QStringList searchIcons = iconFiles.filter(name); -+ if (searchIcons.count() > 0) { -+ return QIcon(path + QDir::separator() + searchIcons.at(0)); -+ } - } - - // Default icon --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-file-manager/default.nix b/pkgs/desktops/deepin/dde-file-manager/default.nix deleted file mode 100644 index 4258e2aa859..00000000000 --- a/pkgs/desktops/deepin/dde-file-manager/default.nix +++ /dev/null @@ -1,298 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, avfs -, dde-daemon -, dde-dock -, dde-polkit-agent -, dde-qt-dbus-factory -, deepin -, deepin-anything -, deepin-desktop-schemas -, deepin-gettext-tools -, deepin-movie-reborn -, deepin-shortcut-viewer -, deepin-terminal -, disomaster -, dtkcore -, dtkwidget -, ffmpegthumbnailer -, file -, glib -, gnugrep -, gsettings-qt -, gvfs -, jemalloc -, kcodecs -, libX11 -, libsecret -, polkit -, polkit-qt -, poppler -, procps -, qmake -, qt5integration -, qtmultimedia -, qtsvg -, qttools -, qtx11extras -, runtimeShell -, samba -, shadow -, taglib -, udisks2-qt5 -, xdg-user-dirs -, xorg -, zlib -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-file-manager"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0n2nl09anqdq0n5yn688n385rn81lcpybs0sa8m311k3k9ndkkyr"; - }; - - nativeBuildInputs = [ - deepin.setupHook - qmake - qttools - pkgconfig - deepin-gettext-tools - wrapGAppsHook - ]; - - buildInputs = [ - avfs - dde-daemon - dde-dock - dde-polkit-agent - dde-qt-dbus-factory - deepin-anything - deepin-desktop-schemas - deepin-movie-reborn.dev - deepin-shortcut-viewer - deepin-terminal - disomaster - dtkcore - dtkwidget - ffmpegthumbnailer - file - glib - gnugrep - gsettings-qt - gvfs - jemalloc - kcodecs - libsecret - polkit - polkit-qt - poppler - procps - qt5integration - qtmultimedia - qtsvg - qtx11extras - samba - taglib - udisks2-qt5 - xdg-user-dirs - xorg.libX11 - xorg.libxcb - xorg.xcbutil - xorg.xcbutilwm - xorg.xorgproto - zlib - ]; - - patches = [ - ./dde-file-manager.fix-paths.patch - ./dde-file-manager.fix-mime-cache-paths.patch - ./dde-file-manager.pixmaps-paths.patch - ]; - - postPatch = '' - searchHardCodedPaths - - patchShebangs dde-desktop/translate_generation.sh - patchShebangs dde-desktop/translate_ts2desktop.sh - patchShebangs dde-file-manager-lib/generate_translations.sh - patchShebangs dde-file-manager/generate_translations.sh - patchShebangs dde-file-manager/translate_ts2desktop.sh - patchShebangs usb-device-formatter/generate_translations.sh - patchShebangs usb-device-formatter/translate_ts2desktop.sh - - # x-terminal-emulator is a virtual package in Debian systems. The - # terminal emulator is configured by Debian's alternative system. - # It is not available on NixOS. Use deepin-terminal instead - sed -i -e "s,x-terminal-emulator,deepin-terminal," \ - dde-file-manager-lib/shutil/fileutils.cpp - - sed -i -e "s,\$\$\\[QT_INSTALL_LIBS\\],$out/lib," \ - dde-file-manager-lib/dde-file-manager-lib.pro \ - dde-file-thumbnail-tool/common.pri \ - common/common.pri - - sed -i '/^QMAKE_PKGCONFIG_DESTDIR/i QMAKE_PKGCONFIG_PREFIX = $$PREFIX' \ - dde-file-manager-lib/dde-file-manager-lib.pro - - fixPath ${dde-dock} /usr/include/dde-dock \ - dde-dock-plugins/disk-mount/disk-mount.pro - - # treefrog is not available in NixOS, and I am not sure if it is really needed - #fixPath $ {treefrog-framework} /usr/include/treefrog \ - # dde-sharefiles/appbase.pri - - fixPath ${deepin-anything} /usr/share/dbus-1/interfaces \ - dde-file-manager-lib/dbusinterface/dbusinterface.pri - - sed -i -e "s,\$\$system(\$\$PKG_CONFIG --variable libdir deepin-anything-server-lib),$out/lib," \ - deepin-anything-server-plugins/dde-anythingmonitor/dde-anythingmonitor.pro - - fixPath ${dde-daemon} /usr/lib/deepin-daemon/desktop-toggle \ - dde-zone/mainwindow.h - - fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert \ - dde-desktop/translate_desktop2ts.sh \ - dde-desktop/translate_ts2desktop.sh \ - dde-file-manager/translate_desktop2ts.sh \ - dde-file-manager/translate_ts2desktop.sh \ - usb-device-formatter/translate_desktop2ts.sh \ - usb-device-formatter/translate_ts2desktop.sh - - fixPath ${avfs} /usr/bin/mountavfs dde-file-manager-lib/shutil/fileutils.cpp - fixPath ${avfs} /usr/bin/umountavfs dde-file-manager-lib/shutil/fileutils.cpp - - fixPath ${deepin-terminal} /usr/bin/deepin-terminal \ - dde-file-manager-lib/shutil/fileutils.cpp - - fixPath $out /usr/share/dde-file-manager \ - dde-sharefiles/appbase.pri \ - dde-sharefiles/dde-sharefiles.pro - - fixPath $out /usr/share/usb-device-formatter \ - usb-device-formatter/main.cpp - - fixPath $out /usr/share/applications \ - dde-file-manager/mips/dde-file-manager-autostart.desktop \ - dde-desktop/development.pri - - fixPath $out /usr/bin \ - dbusservices/com.deepin.dde.desktop.service \ - dde-desktop/data/com.deepin.dde.desktop.service \ - dde-desktop/dbus/filedialog/com.deepin.filemanager.filedialog.service \ - dde-desktop/dbus/filemanager1/org.freedesktop.FileManager.service \ - dde-file-manager-daemon/dbusservice/com.deepin.filemanager.daemon.service \ - dde-file-manager-daemon/dbusservice/dde-filemanager-daemon.service \ - dde-file-manager-daemon/dde-file-manager-daemon.pro \ - dde-file-manager-lib/dde-file-manager-lib.pro \ - dde-file-manager-lib/pkexec/com.deepin.pkexec.dde-file-manager.policy \ - dde-file-manager/dde-file-manager-xdg-autostart.desktop \ - dde-file-manager/dde-file-manager.desktop \ - dde-file-manager/dde-file-manager.pro \ - dde-file-manager/mips/dde-file-manager-autostart.desktop \ - dde-file-manager/mips/dde-file-manager.desktop \ - dde-file-manager/pkexec/com.deepin.pkexec.dde-file-manager.policy \ - usb-device-formatter/pkexec/com.deepin.pkexec.usb-device-formatter.policy \ - usb-device-formatter/usb-device-formatter.desktop \ - usb-device-formatter/usb-device-formatter.pro - fixPath $out /etc \ - dde-file-manager/dde-file-manager.pro \ - dde-file-manager-daemon/dde-file-manager-daemon.pro - - fixPath $out /usr \ - common/common.pri \ - dde-desktop/dbus/filedialog/filedialog.pri \ - dde-desktop/dbus/filemanager1/filemanager1.pri \ - dde-desktop/development.pri \ - dde-dock-plugins/disk-mount/disk-mount.pro \ - dde-file-manager-daemon/dde-file-manager-daemon.pro \ - usb-device-formatter/usb-device-formatter.pro - - sed -i -e "s,xdg-user-dir,${xdg-user-dirs}/bin/xdg-user-dir," \ - dde-file-manager/dde-xdg-user-dirs-update - - sed -i -e "s,Exec=dde-file-manager,Exec=$out/bin/dde-file-manager," \ - dde-file-manager/dde-file-manager.desktop - - sed -i -e "s,Exec=gio,Exec=${glib.bin}/bin/gio," \ - dde-desktop/data/applications/dde-trash.desktop \ - dde-desktop/data/applications/dde-computer.desktop - - sed -i -e "s,/usr/lib/gvfs/gvfsd,${gvfs}/libexec/gvfsd," \ - dde-file-manager-lib/gvfs/networkmanager.cpp - - sed -i -e "s,/usr/sbin/smbd,${samba}/bin/smbd," \ - -e "s,/usr/sbin/groupadd,${shadow}/bin/groupadd," \ - -e "s,/usr/sbin/adduser,${shadow}/bin/adduser," \ - dde-file-manager-daemon/usershare/usersharemanager.cpp - - sed -i -e 's,startDetached("deepin-shortcut-viewer",startDetached("${deepin-shortcut-viewer}/bin/deepin-shortcut-viewer",' \ - dde-file-manager-lib/controllers/appcontroller.cpp - - sed -i -e 's,/bin/bash,${runtimeShell},' \ - -e 's,\<ps\>,${procps}/bin/ps,' \ - -e 's,\<grep\>,${gnugrep}/bin/grep,' \ - utils/utils.cpp \ - dde-file-manager-lib/controllers/fileeventprocessor.cpp - - # The hard coded path in `QString("/etc/xdg/%1/%2")` in - # dde-file-manager-lib/interfaces/dfmsettings.cpp - # does not needed a fix because all the standard locations - # are tried before faling back to /etc/xdg. - - # I do not know yet how to deal with: - # dde-file-manager-lib/sw_label/llsdeepinlabellibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libllsdeeplabel.so"; - # dde-file-manager-lib/sw_label/filemanagerlibrary.h: return "/usr/lib/sw_64-linux-gnu/dde-file-manager/libfilemanager.so"; - # dde-file-manager-lib/sw_label/libinstall.sh:mkdir /usr/lib/sw_64-linux-gnu/dde-file-manager - # dde-file-manager-lib/sw_label/libinstall.sh:cp libfilemanager.so libllsdeeplabel.so /usr/lib/sw_64-linux-gnu/dde-file-manager - # They are not present on my installations of Deepin Linux, Arch Linux and Ubuntu. Can they be ignored? - - # Notes: - # - As file-roller is looked in the path using QStandardPaths::findExecutable, it is not been added as a dependency. - # - deepin-qt5config is a dependency exclusive to the Deepin Linux distribution. No other distribution has it, according to repology. - ''; - - qmakeFlags = [ - "QMAKE_CFLAGS_ISYSTEM=" - - # Disable ffmpeg - "CONFIG+=DISABLE_FFMPEG" - ]; - - preBuild = '' - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${zlib}/lib"; - export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}${libX11}/lib"; - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # debuging - unset LD_LIBRARY_PATH - searchForUnresolvedDLL $out - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "File manager and desktop module for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-file-manager"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch b/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch deleted file mode 100644 index 707eb207409..00000000000 --- a/pkgs/desktops/deepin/dde-kwin/0001-dde-kwin.pc-make-paths-relative.patch +++ /dev/null @@ -1,56 +0,0 @@ -From c4edb65554f90a5abfc2ecbf63587b8c6ef2653d Mon Sep 17 00:00:00 2001 -From: worldofpeace <worldofpeace@protonmail.ch> -Date: Tue, 22 Oct 2019 17:20:24 -0400 -Subject: [PATCH] dde-kwin.pc: make paths relative - -Values like libdir should be relative to the literal ${prefix}. -We also use @ONLY so we don't substitute values like ${prefix} -with CMake resulting in an unintentional replacement. ---- - plugins/kwin-xcb/lib/CMakeLists.txt | 2 +- - plugins/kwin-xcb/lib/dde-kwin.pc.in | 18 +++++++++--------- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/plugins/kwin-xcb/lib/CMakeLists.txt b/plugins/kwin-xcb/lib/CMakeLists.txt -index 0189b74..62e5553 100644 ---- a/plugins/kwin-xcb/lib/CMakeLists.txt -+++ b/plugins/kwin-xcb/lib/CMakeLists.txt -@@ -61,7 +61,7 @@ install_files( - kwinutils.h - ) - --configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc) -+configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY) - if (CMAKE_INSTALL_LIBDIR) - install_files("/${CMAKE_INSTALL_LIBDIR}/pkgconfig" FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc) - elseif (CMAKE_LIBRARY_OUTPUT_DIRECTORY) -diff --git a/plugins/kwin-xcb/lib/dde-kwin.pc.in b/plugins/kwin-xcb/lib/dde-kwin.pc.in -index 9b1d813..1179761 100644 ---- a/plugins/kwin-xcb/lib/dde-kwin.pc.in -+++ b/plugins/kwin-xcb/lib/dde-kwin.pc.in -@@ -1,13 +1,13 @@ --prefix=${CMAKE_INSTALL_PREFIX} --exec_prefix=${CMAKE_INSTALL_PREFIX} --libdir=${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR} --includedir=${INCLUDE_OUTPUT_PATH} -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+includedir=@INCLUDE_OUTPUT_PATH@ - - --Name: ${PROJECT_NAME} -+Name: @PROJECT_NAME@ - Description: DDE KWin plugin library --Version: ${PROJECT_VERSION} --Libs: -l${PROJECT_NAME} --Libs.private: -L/usr/X11R6/lib64 -lQt5X11Extras -lKF5WindowSystem -lQt5Widgets -lQt5Gui -lKF5ConfigCore -lKF5CoreAddons -lQt5Core -lGL -lpthread --Cflags: -I${INCLUDE_OUTPUT_PATH} -+Version: @PROJECT_VERSION@ -+Libs: -l$@PROJECT_NAME@ -+Libs.private: -L/usr/X11R6/lib64 -lQt5X11Extras -lKF5WindowSystem -lQt5Widgets -lQt5Gui -lKF5ConfigCore -lKF5CoreAddons -lQt5Core -lGL -lpthread -+Cflags: -I@INCLUDE_OUTPUT_PATH@ - --- -2.23.0 - diff --git a/pkgs/desktops/deepin/dde-kwin/default.nix b/pkgs/desktops/deepin/dde-kwin/default.nix deleted file mode 100644 index ce1a1a8dda0..00000000000 --- a/pkgs/desktops/deepin/dde-kwin/default.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ stdenv -, mkDerivation -, pkgconfig -, fetchFromGitHub -, deepin -, cmake -, extra-cmake-modules -, qtbase -, libxcb -, kglobalaccel -, kwindowsystem -, kcoreaddons -, kwin -, dtkcore -, gsettings-qt -, fontconfig -, deepin-desktop-schemas -, glib -, libXrender -, mtdev -, qttools -, deepin-gettext-tools -, kwayland -, qtx11extras -, qtquickcontrols2 -, epoxy -, qt5integration -, dde-session-ui -, dbus -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-kwin"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0bvkx9h5ygj46a0j76kfyq3gvk6zn4fx6clhrmcr40hbi2k33cbl"; - }; - - nativeBuildInputs = [ - cmake - deepin-gettext-tools - deepin.setupHook - extra-cmake-modules - pkgconfig - wrapGAppsHook - ]; - - buildInputs = [ - deepin-desktop-schemas - dtkcore - epoxy - fontconfig - glib - gsettings-qt - kcoreaddons - kglobalaccel - kwayland - kwin - kwindowsystem - libXrender - libxcb - mtdev - qtbase - qtquickcontrols2 - qttools - qtx11extras - qt5integration - ]; - - # Need to add kwayland around: - # * https://github.com/linuxdeepin/dde-kwin/blob/5226bb984c844129f9fa589da56e77decb7b39a1/plugins/kwineffects/blur/CMakeLists.txt#L14 - NIX_CFLAGS_COMPILE = [ - "-I${kwayland.dev}/include/KF5" - ]; - - cmakeFlags = [ - "-DKWIN_VERSION=${(builtins.parseDrvName kwin.name).version}" - ]; - - patches = [ - ./0001-dde-kwin.pc-make-paths-relative.patch - ./fix-paths.patch - ]; - - postPatch = '' - searchHardCodedPaths - - patchShebangs translate_ts2desktop.sh \ - translate_generation.sh \ - translate_desktop2ts.sh \ - plugins/kwin-xcb/plugin/translate_generation.sh - - fixPath ${deepin-gettext-tools} /usr/bin/deepin-desktop-ts-convert translate_desktop2ts.sh translate_ts2desktop.sh - - fixPath $out /etc/xdg configures/CMakeLists.txt deepin-wm-dbus/deepinwmfaker.cpp - - # TODO: Need environmental patch - fixPath /run/current-system/sw /usr/lib plugins/kwin-xcb/plugin/main.cpp - - substituteInPlace configures/kwin-wm-multitaskingview.desktop \ - --replace "dbus-send" "${dbus}/bin/dbus-send" - - fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-warning-dialog deepin-wm-dbus/deepinwmfaker.cpp - - # Correct qt plugin installation path to be within dde-kwin prefix. - substituteInPlace CMakeLists.txt \ - --subst-var-by plugin_path "$out/$qtPluginPrefix" - ''; - - postInstall = '' - # Correct invalid path in .pc - substituteInPlace $out/lib/pkgconfig/dde-kwin.pc \ - --replace "-L/usr/X11R6/lib64" "" - - chmod +x $out/bin/kwin_no_scale - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "KWin configuration for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-kwin"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-kwin/fix-paths.patch b/pkgs/desktops/deepin/dde-kwin/fix-paths.patch deleted file mode 100644 index 1bf576e5c1a..00000000000 --- a/pkgs/desktops/deepin/dde-kwin/fix-paths.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index feef49d..ecb7ed2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -26,9 +26,9 @@ macro(query_qmake args output) - endif() - endmacro() - --query_qmake("QT_INSTALL_PLUGINS" QT_INSTALL_PLUGINS) -+set(QT_INSTALL_PLUGINS @plugin_path@) - --set(PLUGIN_INSTALL_PATH ${QT_INSTALL_PLUGINS}/platforms) -+set(PLUGIN_INSTALL_PATH @plugin_path@/platforms) - # Find includes in corresponding build directories - set(CMAKE_INCLUDE_CURRENT_DIR ON) - # Instruct CMake to run moc automatically when needed diff --git a/pkgs/desktops/deepin/dde-launcher/default.nix b/pkgs/desktops/deepin/dde-launcher/default.nix deleted file mode 100644 index 0a50f7177ba..00000000000 --- a/pkgs/desktops/deepin/dde-launcher/default.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, dde-qt-dbus-factory -, dde-session-ui -, deepin -, deepin-desktop-schemas -, deepin-wallpapers -, dtkcore -, dtkwidget -, gsettings-qt -, qtsvg -, qttools -, qtx11extras -, which -, xdg_utils -, wrapGAppsHook -, glib -}: - -mkDerivation rec { - pname = "dde-launcher"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0zh6bb0r3pgjrnw9rba46ghdzza1ka1mv7r1znf8gw24wsjgjcpn"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dde-qt-dbus-factory - dde-session-ui - deepin-desktop-schemas - deepin-wallpapers - dtkcore - dtkwidget - glib - gsettings-qt - qtsvg - qtx11extras - which - xdg_utils - ]; - - postPatch = '' - # debugging - searchHardCodedPaths - - substituteInPlace CMakeLists.txt --replace "/usr/share" "$out/share" - - substituteInPlace src/dbusservices/com.deepin.dde.Launcher.service --replace "/usr" "$out" - - substituteInPlace src/historywidget.cpp --replace "xdg-open" "${xdg_utils}/bin/xdg-open" - substituteInPlace src/widgets/miniframebottombar.cpp --replace "dde-shutdown" "${dde-session-ui}/bin/dde-shutdown" - substituteInPlace src/widgets/miniframerightbar.cpp --replace "which" "${which}/bin/which" - - # Uncomment (and remove space after $) after packaging deepin-manual - #substituteInPlace src/sharedeventfilter.cpp --replace "dman" "$ {deepin-manual}/bin/dman" - - for f in src/boxframe/*.cpp; do - substituteInPlace $f --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg" - done - - # note: `dbus-send` path does not need to be hard coded because it is not used for dtkcore >= 2.0.8.0 - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # debugging - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin Desktop Environment launcher module"; - homepage = "https://github.com/linuxdeepin/dde-launcher"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-network-utils/default.nix b/pkgs/desktops/deepin/dde-network-utils/default.nix deleted file mode 100644 index d54558acf08..00000000000 --- a/pkgs/desktops/deepin/dde-network-utils/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, substituteAll -, qmake -, pkgconfig -, qttools -, dde-qt-dbus-factory -, proxychains -, which -, deepin -}: - -mkDerivation rec { - pname = "dde-network-utils"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0670kfnkplf7skkd1ql6y9x15kmrcbdv1005qwkg4vn8hic6s0z3"; - }; - - nativeBuildInputs = [ - qmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - dde-qt-dbus-factory - proxychains - which - ]; - - patches = [ - (substituteAll { - src = ./fix-paths.patch; - inherit which proxychains; - }) - ]; - - postPatch = '' - searchHardCodedPaths # for debugging - patchShebangs translate_generation.sh - ''; - - postFixup = '' - searchHardCodedPaths $out # for debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin network utils"; - homepage = "https://github.com/linuxdeepin/dde-network-utils"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch b/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch deleted file mode 100644 index 9f7ecd423c5..00000000000 --- a/pkgs/desktops/deepin/dde-network-utils/fix-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -ur dde-network-utils-master.orig/dde-network-utils.pro dde-network-utils-master/dde-network-utils.pro ---- dde-network-utils-master.orig/dde-network-utils.pro 2019-04-04 03:37:46.000000000 -0300 -+++ dde-network-utils-master/dde-network-utils.pro 2019-04-07 05:56:28.283195087 -0300 -@@ -52,6 +52,7 @@ - - QMAKE_PKGCONFIG_NAME = libddenetworkutils - QMAKE_PKGCONFIG_DESCRIPTION = libddenetworkutils -+QMAKE_PKGCONFIG_PREFIX = $$PREFIX - QMAKE_PKGCONFIG_INCDIR = $$includes.path - QMAKE_PKGCONFIG_LIBDIR = $$target.path - QMAKE_PKGCONFIG_DESTDIR = pkgconfig -diff -ur dde-network-utils-master.orig/networkworker.cpp dde-network-utils-master/networkworker.cpp ---- dde-network-utils-master.orig/networkworker.cpp 2019-04-04 03:37:46.000000000 -0300 -+++ dde-network-utils-master/networkworker.cpp 2019-04-07 05:54:28.656479216 -0300 -@@ -80,7 +80,7 @@ - } - } - -- const bool isAppProxyVaild = QProcess::execute("which", QStringList() << "/usr/bin/proxychains4") == 0; -+ const bool isAppProxyVaild = QProcess::execute("@which@/bin/which", QStringList() << "@proxychains@/bin/proxychains4") == 0; - m_networkModel->onAppProxyExistChanged(isAppProxyVaild); - } - diff --git a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch b/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch deleted file mode 100644 index a6941e975eb..00000000000 --- a/pkgs/desktops/deepin/dde-polkit-agent/dde-polkit-agent.plugins-dir.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 4f457d38e9e75bc97ee7dba633bf0cdd61b8cd5b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> -Date: Fri, 19 Apr 2019 22:01:16 -0300 -Subject: [PATCH] Use an environment variable to find plugins - ---- - pluginmanager.cpp | 18 ++++++++++++------ - 1 file changed, 12 insertions(+), 6 deletions(-) - -diff --git a/pluginmanager.cpp b/pluginmanager.cpp -index 0c03237..79bdf86 100644 ---- a/pluginmanager.cpp -+++ b/pluginmanager.cpp -@@ -34,13 +34,19 @@ QList<QButtonGroup*> PluginManager::reduceGetOptions(const QString &actionID) - void PluginManager::load() - { - -- QDir dir("/usr/lib/polkit-1-dde/plugins/"); -- QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so"))); -+ QStringList pluginsDirs = QProcessEnvironment::systemEnvironment().value("DDE_POLKIT_PLUGINS_DIRS").split(QDir::listSeparator(), QString::SkipEmptyParts); -+ pluginsDirs.append("/usr/lib/polkit-1-dde/plugins/"); - -- for (const QFileInfo &pluginFile : pluginFiles) { -- AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath()); -- if (plugin) -- m_plugins << plugin; -+ for (const QString &dirName : pluginsDirs) { -+ QDir dir(dirName); -+ -+ QFileInfoList pluginFiles = dir.entryInfoList((QStringList("*.so"))); -+ -+ for (const QFileInfo &pluginFile : pluginFiles) { -+ AgentExtension *plugin = loadFile(pluginFile.absoluteFilePath()); -+ if (plugin) -+ m_plugins << plugin; -+ } - } - } - --- -2.21.0 - diff --git a/pkgs/desktops/deepin/dde-polkit-agent/default.nix b/pkgs/desktops/deepin/dde-polkit-agent/default.nix deleted file mode 100644 index 1ca9a80abaf..00000000000 --- a/pkgs/desktops/deepin/dde-polkit-agent/default.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, polkit-qt -, dtkcore -, dtkwidget -, dde-qt-dbus-factory -, deepin -}: - -mkDerivation rec { - pname = "dde-polkit-agent"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "00p8syx6rfwhq7wdsk37hm9mvwd0kwj9h0s39hii892h1psd84q9"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - dde-qt-dbus-factory - dtkcore - dtkwidget - polkit-qt - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - - fixPath $out /usr dde-polkit-agent.pro polkit-dde-authentication-agent-1.desktop - fixPath /run/current-system/sw /usr/lib/polkit-1-dde/plugins pluginmanager.cpp - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "PolicyKit agent for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/dde-polkit-agent"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix b/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix deleted file mode 100644 index c7efb0f4b04..00000000000 --- a/pkgs/desktops/deepin/dde-qt-dbus-factory/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv -, fetchFromGitHub -, qmake -, python3 -, deepin -}: - -stdenv.mkDerivation rec { - pname = "dde-qt-dbus-factory"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1wbh4jgvy3c09ivy0vvfk0azkg4d2sv37y23c9rq49jb3sakcjgm"; - }; - - nativeBuildInputs = [ - qmake - python3 - deepin.setupHook - ]; - - postPatch = '' - searchHardCodedPaths - fixPath $out /usr \ - libdframeworkdbus/DFrameworkdbusConfig.in \ - libdframeworkdbus/libdframeworkdbus.pro - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Qt DBus interface library for Deepin software"; - homepage = "https://github.com/linuxdeepin/dde-qt-dbus-factory"; - license = with licenses; [ gpl3Plus lgpl2Plus ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dde-session-ui/default.nix b/pkgs/desktops/deepin/dde-session-ui/default.nix deleted file mode 100644 index ff785f16c81..00000000000 --- a/pkgs/desktops/deepin/dde-session-ui/default.nix +++ /dev/null @@ -1,157 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, dbus -, dde-daemon -, dde-qt-dbus-factory -, deepin -, deepin-desktop-schemas -, deepin-gettext-tools -, deepin-icon-theme -, deepin-wallpapers -, dtkcore -, dtkwidget -, gnugrep -, gsettings-qt -, lightdm_qt -, onboard -, qtsvg -, qttools -, qtx11extras -, setxkbmap -, utillinux -, which -, xkeyboard_config -, xorg -, xrandr -, wrapGAppsHook -}: - -mkDerivation rec { - pname = "dde-session-ui"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1gy9nlpkr9ayrs1z2dvd7h0dqlw6fq2m66d9cs48qyfkr6c8l9jj"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin-gettext-tools - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dbus - dde-daemon - dde-qt-dbus-factory - deepin-desktop-schemas - deepin-icon-theme - deepin-wallpapers - dtkcore - dtkwidget - gnugrep - gsettings-qt - lightdm_qt - onboard - qtsvg - qtx11extras - setxkbmap - utillinux - which - xkeyboard_config - xorg.libXcursor - xorg.libXrandr - xorg.libXtst - xrandr - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - patchShebangs translate_generation.sh translate_desktop.sh - - substituteInPlace translate_desktop.sh --replace "/usr/bin/deepin-desktop-ts-convert" "deepin-desktop-ts-convert" - - find -type f -exec sed -i -e "s,path = /etc,path = $out/etc," {} + - find -type f -exec sed -i -e "s,path = /usr,path = $out," {} + - find -type f -exec sed -i -e "s,/usr/share/dde-session-ui,$out/share/dde-session-ui," {} + - - substituteInPlace dde-osd/dde-osd_autostart.desktop --replace "Exec=/usr/lib/deepin-daemon/dde-osd" "Exec=$out/lib/deepin-daemon/dde-osd" - substituteInPlace dde-osd/com.deepin.dde.osd.service --replace "Exec=/usr/lib/deepin-daemon/dde-osd" "Exec=$out/lib/deepin-daemon/dde-osd" - substituteInPlace dde-lock/com.deepin.dde.lockFront.service --replace "Exec=/usr/bin/dde-lock" "Exec=$out/bin/dde-lock" - substituteInPlace dmemory-warning-dialog/com.deepin.dde.MemoryWarningDialog.service --replace "Exec=/usr/bin/dmemory-warning-dialog" "Exec=$out/bin/dmemory-warning-dialog" - substituteInPlace dde-warning-dialog/com.deepin.dde.WarningDialog.service --replace "Exec=/usr/lib/deepin-daemon/dde-warning-dialog" "Exec=$out/lib/deepin-daemon/dde-warning-dialog" - substituteInPlace dde-shutdown/com.deepin.dde.shutdownFront.service --replace "Exec=/usr/bin/dde-shutdown" "Exec=$out/bin/dde-shutdown" - substituteInPlace dde-welcome/com.deepin.dde.welcome.service --replace "Exec=/usr/lib/deepin-daemon/dde-welcome" "Exec=$out/lib/deepin-daemon/dde-welcome" - substituteInPlace session-ui-guardien/session-ui-guardien.desktop --replace "Exec=/usr/bin/session-ui-guardien" "Exec=$out/bin/session-ui-guardien" - substituteInPlace lightdm-deepin-greeter/lightdm-deepin-greeter.desktop --replace "Exec=/usr/bin/deepin-greeter" "Exec=$out/bin/deepin-greeter" - substituteInPlace misc/applications/deepin-toggle-desktop.desktop.in --replace "Exec=/usr/lib/deepin-daemon/desktop-toggle" "Exec=${dde-daemon}/lib/deepin-daemon/desktop-toggle" - - # Uncomment (and remove space after $) after packaging deepin-system-monitor - #substituteInPlace dde-shutdown/view/contentwidget.cpp --replace "/usr/bin/deepin-system-monitor" "$ {deepin-system-monitor}/bin/deepin-system-monitor" - - substituteInPlace dde-offline-upgrader/main.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dde-osd/kblayoutindicator.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dde-shutdown/view/contentwidget.cpp --replace "/usr/share/backgrounds/deepin" "${deepin-wallpapers}/share/backgrounds/deepin" - substituteInPlace dde-welcome/mainwidget.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dmemory-warning-dialog/src/buttondelegate.cpp --replace "dbus-send" "${dbus}/bin/dbus-send" - substituteInPlace dmemory-warning-dialog/src/buttondelegate.cpp --replace "kill" "${utillinux}/bin/dbus-send" - substituteInPlace global_util/xkbparser.h --replace "/usr/share/X11/xkb/rules/base.xml" "${xkeyboard_config}/share/X11/xkb/rules/base.xml" - substituteInPlace lightdm-deepin-greeter/deepin-greeter --replace "/etc/deepin/greeters.d" "$out/etc/deepin/greeters.d" - substituteInPlace lightdm-deepin-greeter/main.cpp --replace "/usr/share/icons/deepin" "${deepin-icon-theme}/share/icons/deepin" - substituteInPlace lightdm-deepin-greeter/scripts/00-xrandr --replace "egrep" "${gnugrep}/bin/egrep" - substituteInPlace lightdm-deepin-greeter/scripts/00-xrandr --replace "xrandr" "${xrandr}/bin/xrandr" - substituteInPlace lightdm-deepin-greeter/scripts/lightdm-deepin-greeter --replace "/usr/bin/lightdm-deepin-greeter" "$out/bin/lightdm-deepin-greeter" - substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-lock" "$out/bin/dde-lock" - substituteInPlace session-ui-guardien/guardien.cpp --replace "dde-shutdown" "$out/bin/dde-shutdown" - substituteInPlace dde-lock/lockworker.cpp --replace "dde-switchtogreeter" "$out/bin/dde-switchtogreeter" - substituteInPlace dde-lock/lockworker.cpp --replace "which" "${which}/bin/which" - substituteInPlace session-widgets/userinfo.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin" - substituteInPlace widgets/fullscreenbackground.cpp --replace "/usr/share/wallpapers/deepin" "${deepin-wallpapers}/share/wallpapers/deepin" - substituteInPlace widgets/kblayoutwidget.cpp --replace "setxkbmap" "${setxkbmap}/bin/setxkbmap" - substituteInPlace widgets/virtualkbinstance.cpp --replace "onboard" "${onboard}/bin/onboard" - - # fix default background url - substituteInPlace widgets/fullscreenbackground.cpp --replace "/usr/share/backgrounds/default_background.jpg" "${deepin-wallpapers}/share/backgrounds/deepin/desktop.jpg" - - # NOTES - # - on deepin linux /usr/share/icons/default/index.theme is controlled by alternatives, without an equivalent mechanism in NixOS - # - do not wrap dde-dman-portal related files: it appears it has been removed: https://github.com/linuxdeepin/dde-session-ui/commit/3bd028cf135ad22c784c0146e447ef34a69af768 - ''; - - dontWrapQtApps = true; - - preFixup = '' - gappsWrapperArgs+=( - "''${qtWrapperArgs[@]}" - ) - ''; - - postFixup = '' - # wrapGAppsHook or wrapQtAppsHook does not work with binaries outside of $out/bin or $out/libexec - for binary in $out/lib/deepin-daemon/*; do - wrapProgram $binary "''${gappsWrapperArgs[@]}" - done - - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin desktop-environment - Session UI module"; - homepage = "https://github.com/linuxdeepin/dde-session-ui"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-anything/default.nix b/pkgs/desktops/deepin/deepin-anything/default.nix deleted file mode 100644 index 5fa6c93951d..00000000000 --- a/pkgs/desktops/deepin/deepin-anything/default.nix +++ /dev/null @@ -1,82 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, pkgconfig -, qtbase -, udisks2-qt5 -, utillinux -, dtkcore -, deepin -}: - -mkDerivation rec { - pname = "deepin-anything"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1kvyffrii4b012f6ld1ih14qrn7gg5cxbdpbkac0wxb22hnz0azm"; - }; - - patches = [ - # fix compilation error and add support to kernel 5.6 - # https://github.com/linuxdeepin/deepin-anything/pull/27 - (fetchpatch { - name = "linux-5.6.patch"; - url = "https://github.com/linuxdeepin/deepin-anything/commit/764b820c2bcd7248993349b32f91043fc58ee958.patch"; - sha256 = "1ww4xllxc2s04px6fy8wp5cyw54xaz155ry30sqz21vl8awfr36h"; - }) - ]; - - outputs = [ "out" "modsrc" ]; - - nativeBuildInputs = [ - pkgconfig - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - qtbase - udisks2-qt5 - utillinux - ]; - - enableParallelBuilding = true; - - makeFlags = [ - "DEB_HOST_MULTIARCH=" - "PREFIX=${placeholder "out"}" - ]; - - postPatch = '' - searchHardCodedPaths # for debugging - fixPath $modsrc /usr/src Makefile - fixPath $out /usr Makefile - fixPath $out /usr server/tool/tool.pro - fixPath $out /etc server/tool/tool.pro - fixPath $out /usr/bin \ - server/tool/deepin-anything-tool.service \ - server/tool/com.deepin.anything.service \ - server/monitor/deepin-anything-monitor.service - sed -e 's,/lib/systemd,$$PREFIX/lib/systemd,' -i server/monitor/src/src.pro server/tool/tool.pro - ''; - - postFixup = '' - searchHardCodedPaths $out # for debugging - searchHardCodedPaths $modsrc # for debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin file search tool"; - homepage = "https://github.com/linuxdeepin/deepin-anything"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-calculator/default.nix b/pkgs/desktops/deepin/deepin-calculator/default.nix deleted file mode 100644 index 67ead7d314a..00000000000 --- a/pkgs/desktops/deepin/deepin-calculator/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, qtsvg -, dtkcore -, dtkwidget -, deepin -}: - -mkDerivation rec { - pname = "deepin-calculator"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0f26y7b3giybybhvlzbnwcw8kidzvhq66h0c15n9ww81gnlqf7v5"; - }; - - nativeBuildInputs = [ - qmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - qtsvg - ]; - - postPatch = '' - searchHardCodedPaths # debugging - patchShebangs translate_generation.sh - fixPath $out /usr deepin-calculator.pro - substituteInPlace deepin-calculator.desktop --replace "Exec=deepin-calculator" "Exec=$out/bin/deepin-calculator" - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Easy to use calculator for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-calculator"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-desktop-base/default.nix b/pkgs/desktops/deepin/deepin-desktop-base/default.nix deleted file mode 100644 index 74fa53b715d..00000000000 --- a/pkgs/desktops/deepin/deepin-desktop-base/default.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ stdenv -, fetchFromGitHub -, deepin-wallpapers -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-desktop-base"; - version = "2019.07.10"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0rs7bjy35k5gc5nbba1cijhdz16zny30lgmcf2ckx1pkdszk2vra"; - }; - - nativeBuildInputs = [ - deepin.setupHook - ]; - - buildInputs = [ - deepin-wallpapers - ]; - - # TODO: Fedora recommended dependencies: - # deepin-wallpapers - # plymouth-theme-deepin - - postPatch = '' - searchHardCodedPaths - - fixPath $out /etc Makefile - fixPath $out /usr Makefile - - # Remove Deepin distro's lsb-release - # Don't override systemd timeouts - # Remove apt-specific templates - echo ---------------------------------------------------------------- - echo grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile - grep --color=always -E 'lsb-release|systemd|python-apt|backgrounds' Makefile - echo ---------------------------------------------------------------- - sed -i -E '/lsb-release|systemd|python-apt|backgrounds/d' Makefile - ''; - - postInstall = '' - # Make a symlink for deepin-version - ln -s ../lib/deepin/desktop-version $out/etc/deepin-version - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Base assets and definitions for Deepin Desktop Environment"; - # TODO: revise - longDescription = '' - This package provides some components for Deepin desktop environment. - - deepin logo - - deepin desktop version - - login screen background image - - language information - ''; - homepage = "https://github.com/linuxdeepin/deepin-desktop-base"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix b/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix deleted file mode 100644 index 15f9498cf0d..00000000000 --- a/pkgs/desktops/deepin/deepin-desktop-schemas/default.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ stdenv -, fetchFromGitHub -, python3 -, dconf -, glib -, deepin-gtk-theme -, deepin-icon-theme -, deepin-sound-theme -, deepin-wallpapers -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-desktop-schemas"; - version = "3.13.9"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1c69j6s7561zb1hrd1j3ihji1nvpgfzfgnp6svsv8jd8dg8vs8l1"; - }; - - nativeBuildInputs = [ - python3 - glib.dev - deepin.setupHook - ]; - - buildInputs = [ - dconf - deepin-gtk-theme - deepin-icon-theme - deepin-sound-theme - deepin-wallpapers - ]; - - postPatch = '' - searchHardCodedPaths - - # fix default background url - sed -i -e 's,/usr/share/backgrounds/default_background.jpg,/usr/share/backgrounds/deepin/desktop.jpg,' \ - overrides/common/com.deepin.wrap.gnome.desktop.override - - fixPath ${deepin-wallpapers} /usr/share/backgrounds \ - overrides/common/com.deepin.wrap.gnome.desktop.override - - fixPath ${deepin-wallpapers} /usr/share/wallpapers/deepin \ - schemas/com.deepin.dde.appearance.gschema.xml - - # still hardcoded paths: - # /etc/gnome-settings-daemon/xrandr/monitors.xml ? gnome3.gnome-settings-daemon - # /usr/share/backgrounds/gnome/adwaita-lock.jpg ? gnome3.gnome-backgrounds - # /usr/share/backgrounds/gnome/adwaita-timed.xml gnome3.gnome-backgrounds - # /usr/share/desktop-directories - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - doCheck = true; - checkTarget = "test"; - - postInstall = '' - glib-compile-schemas --strict $out/share/glib-2.0/schemas - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "GSettings deepin desktop-wide schemas"; - homepage = "https://github.com/linuxdeepin/deepin-desktop-schemas"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-editor/default.nix b/pkgs/desktops/deepin/deepin-editor/default.nix deleted file mode 100644 index 0124ca8cc9e..00000000000 --- a/pkgs/desktops/deepin/deepin-editor/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, deepin -, dtkcore -, dtkwidget -, kcodecs -, qttools -, syntax-highlighting -, wrapQtAppsHook -}: - -stdenv.mkDerivation rec { - pname = "deepin-editor"; - version = "1.2.9.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0g7c3adqwn8i4ndxdrzibahr75dddz1fiqnsh3bjj1jjr86rv4ks"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - wrapQtAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - kcodecs - syntax-highlighting - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - patchShebangs translate_generation.sh - - fixPath $out /usr \ - CMakeLists.txt \ - dedit/main.cpp \ - src/resources/settings.json \ - src/thememodule/themelistmodel.cpp - - substituteInPlace deepin-editor.desktop \ - --replace "Exec=deepin-editor" "Exec=$out/bin/deepin-editor" - - substituteInPlace src/editwrapper.cpp \ - --replace "appExec = \"deepin-editor\"" "appExec = \"$out/bin/deepin-editor\"" - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Simple editor for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-editor"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix b/pkgs/desktops/deepin/deepin-gettext-tools/default.nix deleted file mode 100644 index 432add458de..00000000000 --- a/pkgs/desktops/deepin/deepin-gettext-tools/default.nix +++ /dev/null @@ -1,55 +0,0 @@ -{ stdenv -, fetchFromGitHub -, gettext -, python3Packages -, perlPackages -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-gettext-tools"; - version = "1.0.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "03cwa82dd14a31v44jd3z0kpiri6g21ar4f48s8ph78nvjy55880"; - }; - - nativeBuildInputs = [ - python3Packages.wrapPython - ]; - - buildInputs = [ - gettext - perlPackages.perl - perlPackages.XMLLibXML - perlPackages.ConfigTiny - python3Packages.python - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - postPatch = '' - sed -e 's/sudo cp/cp/' -i src/generate_mo.py - ''; - - postFixup = '' - wrapPythonPrograms - wrapPythonProgramsIn "$out/lib/${pname}" - wrapProgram $out/bin/deepin-desktop-ts-convert --set PERL5LIB $PERL5LIB - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin Internationalization utilities"; - homepage = "https://github.com/linuxdeepin/deepin-gettext-tools"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix deleted file mode 100644 index eee07470585..00000000000 --- a/pkgs/desktops/deepin/deepin-gtk-theme/default.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ stdenv -, fetchFromGitHub -, gtk-engine-murrine -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-gtk-theme"; - version = "17.10.11"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-gtk-theme"; - rev = version; - sha256 = "0zs6mq70yd1k3d9zm3q6zxnw1md56r4imad5imdxwx58yxdx47fw"; - }; - - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin GTK Theme"; - homepage = "https://github.com/linuxdeepin/deepin-gtk-theme"; - license = licenses.lgpl3; - platforms = platforms.unix; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-icon-theme/default.nix b/pkgs/desktops/deepin/deepin-icon-theme/default.nix deleted file mode 100644 index b56b219faff..00000000000 --- a/pkgs/desktops/deepin/deepin-icon-theme/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv -, fetchFromGitHub -, gtk3 -, xcursorgen -, papirus-icon-theme -, hicolor-icon-theme -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-icon-theme"; - version = "2020.05.21"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0b1s6kf0q804zbbghly981wzacy1spi8168shf3x8w95rqj6463p"; - }; - - nativeBuildInputs = [ - gtk3 - xcursorgen - ]; - - propagatedBuildInputs = [ - papirus-icon-theme - hicolor-icon-theme - ]; - - dontDropIconThemeCache = true; - - buildTargets = "all hicolor-links"; - - postPatch = '' - # fix: hicolor links should follow the deepin -> bloom naming change - # https://github.com/linuxdeepin/deepin-icon-theme/pull/24 - substituteInPlace tools/hicolor.links --replace deepin bloom - - substituteInPlace Sea/index.theme --replace Inherits=deepin Inherits=bloom - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share/icons - cp -vai bloom* Sea $out/share/icons - - for theme in $out/share/icons/*; do - gtk-update-icon-cache $theme - done - - cp -vai usr/share/icons/hicolor $out/share/icons - - runHook postInstall - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Icons for the Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-icon-theme"; - license = licenses.gpl3; - platforms = platforms.unix; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-image-viewer/default.nix b/pkgs/desktops/deepin/deepin-image-viewer/default.nix deleted file mode 100644 index 43c18c85abc..00000000000 --- a/pkgs/desktops/deepin/deepin-image-viewer/default.nix +++ /dev/null @@ -1,66 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, qtsvg -, qtx11extras -, dtkcore -, dtkwidget -, qt5integration -, freeimage -, libraw -, libexif -, deepin -}: - -mkDerivation rec { - pname = "deepin-image-viewer"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "01524hfdy3wvdf07n9b3qb8jdpxzg2hwjpl4gxvr68qws5nbnb3c"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - qtsvg - qtx11extras - dtkcore - dtkwidget - qt5integration - freeimage - libraw - libexif - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs viewer/generate_translations.sh - fixPath $out /usr viewer/com.deepin.ImageViewer.service - sed -i qimage-plugins/freeimage/freeimage.pro \ - qimage-plugins/libraw/libraw.pro \ - -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Image Viewer for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-image-viewer"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; # See https://github.com/NixOS/nixpkgs/pull/46463#issuecomment-420274189 - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-menu/default.nix b/pkgs/desktops/deepin/deepin-menu/default.nix deleted file mode 100644 index 983fe4e1c4d..00000000000 --- a/pkgs/desktops/deepin/deepin-menu/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, dtkcore -, dtkwidget -, qt5integration -, deepin -}: - -mkDerivation rec { - pname = "deepin-menu"; - version = "3.4.8"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "09i0ybllymlj7s46pxma5py6x8nknfja4gxn5gj9kpf2c37qsqjc"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - qt5integration - ]; - - postPatch = '' - searchHardCodedPaths - fixPath $out /usr \ - data/com.deepin.menu.service \ - deepin-menu.desktop \ - deepin-menu.pro - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin menu service"; - homepage = "https://github.com/linuxdeepin/deepin-menu"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix b/pkgs/desktops/deepin/deepin-movie-reborn/default.nix deleted file mode 100644 index 68daffb0d15..00000000000 --- a/pkgs/desktops/deepin/deepin-movie-reborn/default.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, cmake -, pkgconfig -, qttools -, qtx11extras -, dtkcore -, dtkwidget -, ffmpeg_3 -, ffmpegthumbnailer -, mpv -, pulseaudio -, libdvdnav -, libdvdread -, xorg -, deepin -}: - -mkDerivation rec { - pname = "deepin-movie-reborn"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0cly8q0514a58s3h3wsvx9yxar7flz6i2q8xkrkfjias22b3z7b0"; - }; - - outputs = [ "out" "dev" ]; - - nativeBuildInputs = [ - cmake - pkgconfig - qttools - deepin.setupHook - ]; - - buildInputs = [ - dtkcore - dtkwidget - ffmpeg_3 - ffmpegthumbnailer - libdvdnav - libdvdread - mpv - pulseaudio - qtx11extras - xorg.libXdmcp - xorg.libXtst - xorg.libpthreadstubs - xorg.xcbproto - ]; - - patches = [ - # fix: build failed if cannot find dtk-settings tool - (fetchpatch { - url = "https://github.com/linuxdeepin/deepin-movie-reborn/commit/fbb307b.patch"; - sha256 = "0915za0khki0729rvcfpxkh6vxhqwc47cgcmjc90kfq1004221vx"; - }) - ]; - - NIX_LDFLAGS = "-ldvdnav"; - - postPatch = '' - searchHardCodedPaths # debugging - - sed -i src/libdmr/libdmr.pc.in -e "s,/usr,$out," -e 's,libdir=''${prefix}/,libdir=,' - - substituteInPlace src/deepin-movie.desktop \ - --replace "Exec=deepin-movie" "Exec=$out/bin/deepin-movie" - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin movie player"; - homepage = "https://github.com/linuxdeepin/deepin-movie-reborn"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix b/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix deleted file mode 100644 index 76d8847b73f..00000000000 --- a/pkgs/desktops/deepin/deepin-shortcut-viewer/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, dtkcore -, dtkwidget -, qt5integration -, deepin -}: - -mkDerivation rec { - pname = "deepin-shortcut-viewer"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "13vz8kjdqkrhgpvdgrvwn62vwzbyqp88hjm5m4rcqg3bh56709ma"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - dtkcore - dtkwidget - qt5integration - ]; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Pop-up shortcut viewer for Deepin applications"; - homepage = "https://github.com/linuxdeepin/deepin-shortcut-viewer"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-sound-theme/default.nix b/pkgs/desktops/deepin/deepin-sound-theme/default.nix deleted file mode 100644 index e71c0cb77c5..00000000000 --- a/pkgs/desktops/deepin/deepin-sound-theme/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv -, fetchFromGitHub -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-sound-theme"; - version = "15.10.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-sound-theme"; - rev = version; - sha256 = "1sw4nrn7q7wk1hpicm05apyc0mihaw42iqm52wb8ib8gm1qiylr9"; - }; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin sound theme"; - homepage = "https://github.com/linuxdeepin/deepin-sound-theme"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix deleted file mode 100644 index ae312137942..00000000000 --- a/pkgs/desktops/deepin/deepin-terminal/default.nix +++ /dev/null @@ -1,117 +0,0 @@ -{ stdenv -, fetchFromGitHub -, pkgconfig -, cmake -, ninja -, vala_0_40 -, fetchpatch -, gettext -, at-spi2-core -, dbus -, epoxy -, expect -, gtk3 -, json-glib -, libXdmcp -, libgee -, libpthreadstubs -, librsvg -, libsecret -, libtasn1 -, libxcb -, libxkbcommon -, p11-kit -, pcre -, vte -, wnck -, libselinux -, gnutls -, pcre2 -, libsepol -, utillinux -, deepin-menu -, deepin-shortcut-viewer -, deepin -, wrapGAppsHook -}: - -stdenv.mkDerivation rec { - pname = "deepin-terminal"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-terminal"; - rev = version; - sha256 = "1929saj828b438d07caw3cjhqq60v6gni7mi3fqrg9wdjz81xwv7"; - }; - - patches = [ - # Fix build with VTE 0.60 - (fetchpatch { - url = "https://github.com/linuxdeepin/deepin-terminal/commit/542d1035b609698ee81aa7971d20ca8e5930743d.patch"; - sha256 = "1pihiy70yc25fm5fx7i7v9gmi65v4mhldvi7xwv8rgr2z6hbfj41"; - }) - ]; - - nativeBuildInputs = [ - pkgconfig - cmake - ninja - vala_0_40 # xcb.vapi:411.3-411.48: error: missing return statement at end of subroutine body - gettext - libselinux libsepol utillinux # required by gio - deepin.setupHook - wrapGAppsHook - ]; - - buildInputs = [ - at-spi2-core - dbus - deepin-menu - deepin-shortcut-viewer - epoxy - expect - gtk3 - json-glib - libXdmcp - libgee - libpthreadstubs - librsvg - libsecret - libtasn1 - libxcb - libxkbcommon - p11-kit - pcre - vte - wnck - gnutls - pcre2 - ]; - - postPatch = '' - searchHardCodedPaths - ''; - - cmakeFlags = [ - "-DTEST_BUILD=OFF" - "-DUSE_VENDOR_LIB=OFF" - "-DVERSION=${version}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Default terminal emulator for Deepin"; - longDescription = '' - Deepin terminal, it sharpens your focus in the world of command line! - It is an advanced terminal emulator with workspace, multiple - windows, remote management, quake mode and other features. - ''; - homepage = "https://github.com/linuxdeepin/deepin-terminal"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-turbo/default.nix b/pkgs/desktops/deepin/deepin-turbo/default.nix deleted file mode 100644 index 6bba51ac674..00000000000 --- a/pkgs/desktops/deepin/deepin-turbo/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, cmake -, pkgconfig -, qtbase -, deepin -}: - -mkDerivation rec { - pname = "deepin-turbo"; - version = "0.0.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "15l0pgszmbirlaxj04ishj43kyvigsl1yaf58kxlbdb3lkmcp5f3"; - }; - - nativeBuildInputs = [ - cmake - pkgconfig - deepin.setupHook - ]; - - buildInputs = [ - qtbase - ]; - - postPatch = '' - searchHardCodedPaths # for debugging - fixPath $out /usr/lib/systemd src/booster-dtkwidget/CMakeLists.txt - fixPath $out /usr/lib/deepin-turbo src/booster-dtkwidget/deepin-turbo-booster-dtkwidget.service - ''; - - postFixup = '' - searchHardCodedPaths $out # for debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "A daemon that helps to launch applications faster"; - homepage = "https://github.com/linuxdeepin/deepin-turbo"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/deepin-wallpapers/default.nix b/pkgs/desktops/deepin/deepin-wallpapers/default.nix deleted file mode 100644 index 4fa3d6043d5..00000000000 --- a/pkgs/desktops/deepin/deepin-wallpapers/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv -, fetchFromGitHub -, dde-api -, deepin -}: - -stdenv.mkDerivation rec { - pname = "deepin-wallpapers"; - version = "1.7.7"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = "deepin-wallpapers"; - rev = version; - sha256 = "09cfnxbpms98ibqbi4xd51181q3az5n8rmndcdr9w12kyzniz7xv"; - }; - - nativeBuildInputs = [ - dde-api - deepin.setupHook - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - sed -i -e "s:/usr/lib/deepin-api:${dde-api}/lib/deepin-api:" Makefile - sed -i -e "s:/usr/share/wallpapers:$out/share/wallpapers:" Makefile - ''; - - installPhase = '' - mkdir -p $out/share/wallpapers/deepin - cp -a deepin/* deepin-community/* deepin-private/* $out/share/wallpapers/deepin - mkdir -p $out/var/cache - cp -a image-blur $out/var/cache - - # Suggested by upstream - mkdir -p $out/share/backgrounds/deepin - ln -s ../../wallpapers/deepin/Hummingbird_by_Shu_Le.jpg $out/share/backgrounds/deepin/desktop.jpg - ln -s $(echo -n $out/share/wallpapers/deepin/Hummingbird_by_Shu_Le.jpg | md5sum | cut -d " " -f 1).jpg \ - $out/var/cache/image-blur/$(echo -n $out/share/backgrounds/deepin/desktop.jpg | md5sum | cut -d " " -f 1).jpg - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Wallpapers for Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/deepin-wallpapers"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix deleted file mode 100644 index b177b2ccf35..00000000000 --- a/pkgs/desktops/deepin/default.nix +++ /dev/null @@ -1,62 +0,0 @@ -{ pkgs, makeScope, libsForQt5 }: -let - packages = self: with self; { - setupHook = ./setup-hook.sh; - - # Update script tailored to deepin packages from git repository - updateScript = { pname, version, src }: - pkgs.genericUpdater { - inherit pname version; - attrPath = "deepin.${pname}"; - versionLister = "${pkgs.common-updater-scripts}/bin/list-git-tags ${src.meta.homepage}"; - ignoredVersions = "^2014(\\.|rc)|^v[0-9]+"; - }; - - dde-api = callPackage ./dde-api { }; - dde-calendar = callPackage ./dde-calendar { }; - dde-control-center = callPackage ./dde-control-center { }; - dde-daemon = callPackage ./dde-daemon { }; - dde-dock = callPackage ./dde-dock { }; - dde-file-manager = callPackage ./dde-file-manager { }; - dde-kwin = callPackage ./dde-kwin { }; - dde-launcher = callPackage ./dde-launcher { }; - dde-network-utils = callPackage ./dde-network-utils { }; - dde-polkit-agent = callPackage ./dde-polkit-agent { }; - dde-qt-dbus-factory = callPackage ./dde-qt-dbus-factory { }; - dde-session-ui = callPackage ./dde-session-ui { }; - deepin-anything = callPackage ./deepin-anything { }; - deepin-calculator = callPackage ./deepin-calculator { }; - deepin-desktop-base = callPackage ./deepin-desktop-base { }; - deepin-desktop-schemas = callPackage ./deepin-desktop-schemas { }; - deepin-editor = callPackage ./deepin-editor { }; - deepin-gettext-tools = callPackage ./deepin-gettext-tools { }; - deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; - deepin-icon-theme = callPackage ./deepin-icon-theme { }; - deepin-image-viewer = callPackage ./deepin-image-viewer { }; - deepin-menu = callPackage ./deepin-menu { }; - deepin-movie-reborn = callPackage ./deepin-movie-reborn { }; - deepin-shortcut-viewer = callPackage ./deepin-shortcut-viewer { }; - deepin-sound-theme = callPackage ./deepin-sound-theme { }; - deepin-terminal = callPackage ./deepin-terminal { - wnck = pkgs.libwnck3; - }; - deepin-turbo = callPackage ./deepin-turbo { }; - deepin-wallpapers = callPackage ./deepin-wallpapers { }; - disomaster = callPackage ./disomaster { }; - dpa-ext-gnomekeyring = callPackage ./dpa-ext-gnomekeyring { }; - dtkcore = callPackage ./dtkcore { }; - dtkwidget = callPackage ./dtkwidget { }; - dtkwm = callPackage ./dtkwm { }; - go-dbus-factory = callPackage ./go-dbus-factory { }; - go-gir-generator = callPackage ./go-gir-generator { }; - go-lib = callPackage ./go-lib { }; - qcef = callPackage ./qcef { }; - qt5integration = callPackage ./qt5integration { }; - qt5platform-plugins = callPackage ./qt5platform-plugins { }; - startdde = callPackage ./startdde { }; - udisks2-qt5 = callPackage ./udisks2-qt5 { }; - - }; - -in -makeScope libsForQt5.newScope packages diff --git a/pkgs/desktops/deepin/disomaster/default.nix b/pkgs/desktops/deepin/disomaster/default.nix deleted file mode 100644 index 89cbe34ceaa..00000000000 --- a/pkgs/desktops/deepin/disomaster/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qtbase -, libisoburn -, deepin -}: - -mkDerivation rec { - pname = "disomaster"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1kmhlnw37pdmlf7k9zry657xlhz40m9nzg361kiyisn186pfqpws"; - }; - - nativeBuildInputs = [ - deepin.setupHook - pkgconfig - qmake - ]; - - buildInputs = [ - libisoburn - qtbase - ]; - - postPatch = '' - searchHardCodedPaths # debugging - ''; - - qmakeFlags = [ - "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "A libisoburn wrapper for Qt"; - homepage = "https://github.com/linuxdeepin/disomaster"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo worldofpeace ]; - }; -} diff --git a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix b/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix deleted file mode 100644 index 2caef7ce916..00000000000 --- a/pkgs/desktops/deepin/dpa-ext-gnomekeyring/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ stdenv -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, gnome3 -, dde-polkit-agent -, deepin -}: - -stdenv.mkDerivation rec { - pname = "dpa-ext-gnomekeyring"; - version = "5.0.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "168j42nwyw7vcgwc0fha2pjpwwlgir70fq1hns4ia1dkdqa1nhzw"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - dde-polkit-agent - gnome3.libgnome-keyring - ]; - - postPatch = '' - searchHardCodedPaths - patchShebangs translate_generation.sh - fixPath $out /usr dpa-ext-gnomekeyring.pro gnomekeyringextention.cpp - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "GNOME keyring extension for dde-polkit-agent"; - homepage = "https://github.com/linuxdeepin/dpa-ext-gnomekeyring"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkcore/default.nix b/pkgs/desktops/deepin/dtkcore/default.nix deleted file mode 100644 index 570b0cc2c11..00000000000 --- a/pkgs/desktops/deepin/dtkcore/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, gsettings-qt -, pythonPackages -, deepin -}: - -mkDerivation rec { - pname = "dtkcore"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0xdh6mmrv8yr6mjmlwj0fv037parkkwfwlaibcbrskwxqp9iri1y"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - pythonPackages.wrapPython - deepin.setupHook - ]; - - buildInputs = [ - gsettings-qt - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - # Fix shebang - sed -i tools/script/dtk-translate.py -e "s,#!env,#!/usr/bin/env," - ''; - - qmakeFlags = [ - "DTK_VERSION=${version}" - "LIB_INSTALL_DIR=${placeholder "out"}/lib" - "MKSPECS_INSTALL_DIR=${placeholder "out"}/mkspecs" - ]; - - postFixup = '' - chmod +x $out/lib/libdtk-${version}/DCore/bin/*.py - wrapPythonProgramsIn "$out/lib/libdtk-${version}/DCore/bin" "$out $pythonPath" - searchHardCodedPaths $out # debugging - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin tool kit core library"; - homepage = "https://github.com/linuxdeepin/dtkcore"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkwidget/default.nix b/pkgs/desktops/deepin/dtkwidget/default.nix deleted file mode 100644 index 9be222830db..00000000000 --- a/pkgs/desktops/deepin/dtkwidget/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qttools -, qtmultimedia -, qtsvg -, qtx11extras -, librsvg -, libstartup_notification -, gsettings-qt -, dde-qt-dbus-factory -, dtkcore -, deepin -}: - -mkDerivation rec { - pname = "dtkwidget"; - version = "2.1.1"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0yqrm1p0k1843ldvcd79dxl26ybyl5kljl6vwhzc58sx7pw4qmvh"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - qttools - ]; - - buildInputs = [ - qtmultimedia - qtsvg - qtx11extras - librsvg - libstartup_notification - gsettings-qt - dde-qt-dbus-factory - dtkcore - ]; - - outRef = placeholder "out"; - - qmakeFlags = [ - "INCLUDE_INSTALL_DIR=${outRef}/include" - "LIB_INSTALL_DIR=${outRef}/lib" - "QT_HOST_DATA=${outRef}" - ]; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtkwidget"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/dtkwm/default.nix b/pkgs/desktops/deepin/dtkwm/default.nix deleted file mode 100644 index 56031f11492..00000000000 --- a/pkgs/desktops/deepin/dtkwm/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, fetchpatch -, pkgconfig -, qmake -, qtx11extras -, dtkcore -, deepin -}: - -mkDerivation rec { - pname = "dtkwm"; - version = "2.0.12"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0rdzzqsggqarldwb4yp5s4sf5czicgxbdmibjn0pw32129r2d1g3"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - dtkcore - qtx11extras - ]; - - patches = [ - # Set DTK_MODULE_NAME - (fetchpatch { - url = "https://github.com/linuxdeepin/dtkwm/commit/2490891a.patch"; - sha256 = "0krydxjpnaihkgs1n49b6mcf3rd3lkispcnkb1j5vpfs9hp9f48j"; - }) - ]; - - outRef = placeholder "out"; - - qmakeFlags = [ - "QT_HOST_DATA=${outRef}" - "INCLUDE_INSTALL_DIR=${outRef}/include" - "LIB_INSTALL_DIR=${outRef}/lib" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Deepin graphical user interface library"; - homepage = "https://github.com/linuxdeepin/dtkwm"; - license = licenses.gpl3Plus; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/go-dbus-factory/default.nix b/pkgs/desktops/deepin/go-dbus-factory/default.nix deleted file mode 100644 index 1c1afd9d099..00000000000 --- a/pkgs/desktops/deepin/go-dbus-factory/default.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv -, fetchFromGitHub -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-dbus-factory"; - version = "0.9.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "06fqyad9f50gcjsjkh7929yyaprahdjhnd0dr4gl2797a7wysl3f"; - }; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - ]; - - postPatch = '' - sed -i -e 's:/share/gocode:/share/go:' Makefile - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "GoLang DBus factory for the Deepin Desktop Environment"; - homepage = "https://github.com/linuxdeepin/go-dbus-factory"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/go-gir-generator/default.nix b/pkgs/desktops/deepin/go-gir-generator/default.nix deleted file mode 100644 index 7768f9afc85..00000000000 --- a/pkgs/desktops/deepin/go-gir-generator/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv -, fetchpatch -, fetchFromGitHub -, pkgconfig -, go -, gobject-introspection -, libgudev -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-gir-generator"; - version = "2.0.2"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1ydzll8zlk897iqcihvv6p046p0rzr4qqz2drmz2nx95njp8n03a"; - }; - - patches = [ - # Fix compatibility with glib 2.63+ - # https://github.com/linuxdeepin/go-gir-generator/pull/11 - (fetchpatch { - url = "https://github.com/linuxdeepin/go-gir-generator/commit/7dea15a1a491f28d2ac8c411068ccefeba01aae3.patch"; - sha256 = "182d30qkj1rx9ynpj9zfxh53nykvfq9wxk4502zc42gfvadgzfgd"; - }) - ]; - - nativeBuildInputs = [ - pkgconfig - go - ]; - - buildInputs = [ - gobject-introspection - libgudev - ]; - - postPatch = '' - sed -i -e 's:/share/gocode:/share/go:' Makefile - ''; - - makeFlags = [ - "PREFIX=${placeholder "out"}" - "GOCACHE=$(TMPDIR)/go-cache" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Generate static golang bindings for GObject"; - homepage = "https://github.com/linuxdeepin/go-gir-generator"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/go-lib/default.nix b/pkgs/desktops/deepin/go-lib/default.nix deleted file mode 100644 index 7129d912e30..00000000000 --- a/pkgs/desktops/deepin/go-lib/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv -, fetchFromGitHub -, glib -, xorg -, gdk-pixbuf -, pulseaudio -, mobile-broadband-provider-info -, deepin -}: - -stdenv.mkDerivation rec { - pname = "go-lib"; - version = "5.4.5"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "021sq7nzvfwsa5ccsb3vdjk53m7cf693xm4wkdkrkf8pja6vz94q"; - }; - - buildInputs = [ - glib - xorg.libX11 - gdk-pixbuf - pulseaudio - mobile-broadband-provider-info - ]; - - installPhase = '' - mkdir -p $out/share/go/src/pkg.deepin.io/lib - cp -a * $out/share/go/src/pkg.deepin.io/lib - - rm -r $out/share/go/src/pkg.deepin.io/lib/debian - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Go bindings for Deepin Desktop Environment development"; - homepage = "https://github.com/linuxdeepin/go-lib"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/qcef/default.nix b/pkgs/desktops/deepin/qcef/default.nix deleted file mode 100644 index c37915377d8..00000000000 --- a/pkgs/desktops/deepin/qcef/default.nix +++ /dev/null @@ -1,127 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, cmake -, qtbase -, qttools -, qtwebchannel -, qtx11extras -, gnome2 -, nss -, nspr -, alsaLib -, atk -, cairo -, cups -, dbus -, expat -, fontconfig -, gdk-pixbuf -, glib -, gtk2 -, libxcb -, pango -, pulseaudio -, xorg -, deepin -}: - -let - rpahtLibraries = [ - stdenv.cc.cc.lib # libstdc++.so.6 - alsaLib - atk - cairo - cups - dbus - expat - fontconfig - gdk-pixbuf - glib - gnome2.GConf - gtk2 - libxcb - nspr - nss - pango - pulseaudio - xorg.libX11 - xorg.libXScrnSaver - xorg.libXcomposite - xorg.libXcursor - xorg.libXdamage - xorg.libXext - xorg.libXfixes - xorg.libXi - xorg.libXrandr - xorg.libXrender - xorg.libXtst - ]; - - libPath = stdenv.lib.makeLibraryPath rpahtLibraries; - -in -mkDerivation rec { - pname = "qcef"; - version = "1.1.8"; - - srcs = [ - (fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "14a33af1h3wj3yph080c1ri3m27bqj1v1k0jdqc63x7c3smnpwfk"; - name = pname; - }) - (fetchFromGitHub { - owner = "linuxdeepin"; - repo = "cef-binary"; - rev = "fecf00339545d2819224333cc506d5aa22ae8008"; - sha256 = "06i1zc7ciy7d0qhndiwpjrsii0x5i5hg9j6ddi4w5yf1nzgsrj4n"; - name = "cef-binary"; - }) - ]; - - sourceRoot = pname; - - nativeBuildInputs = [ - pkgconfig - cmake - qttools - deepin.setupHook - ]; - - buildInputs = [ - qtbase - qtwebchannel - qtx11extras - ] ++ rpahtLibraries; - - postUnpack = '' - rmdir ${pname}/cef - ln -s ../cef-binary ${pname}/cef - ''; - - postPatch = '' - searchHardCodedPaths - fixPath $out /usr src/core/qcef_global_settings.{h,cpp} - sed '/COMMAND rm -rf Release Resources/a COMMAND ldd qcef/libcef.so' -i src/CMakeLists.txt - sed '/COMMAND rm -rf Release Resources/a COMMAND patchelf --set-rpath ${libPath} qcef/libcef.so' -i src/CMakeLists.txt - ''; - - postFixup = '' - searchHardCodedPaths $out - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; - - meta = with stdenv.lib; { - description = "Qt5 binding of Chromium Embedded Framework"; - homepage = "https://github.com/linuxdeepin/qcef"; - license = licenses.lgpl3; - platforms = platforms.linux; - badPlatforms = [ "aarch64-linux" ]; # the cef-binary is not available - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/qt5integration/default.nix b/pkgs/desktops/deepin/qt5integration/default.nix deleted file mode 100644 index e3bbaba068b..00000000000 --- a/pkgs/desktops/deepin/qt5integration/default.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, mtdev -, lxqt -, qtx11extras -, qtmultimedia -, qtsvg -, qt5platform-plugins -, qtstyleplugins -, dtkcore -, dtkwidget -, deepin -}: - -mkDerivation rec { - pname = "qt5integration"; - version = "5.0.0"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "140wb3vcm2ji8jhqdxv8f4shiknia1zk8fssqlp09kzc1cmb4ncy"; - }; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - dtkcore - dtkwidget - qt5platform-plugins - mtdev - lxqt.libqtxdg - qtstyleplugins - qtx11extras - qtmultimedia - qtsvg - ]; - - postPatch = '' - sed -i dstyleplugin/dstyleplugin.pro \ - platformthemeplugin/qt5deepintheme-plugin.pro \ - iconengineplugins/svgiconengine/svgiconengine.pro \ - imageformatplugins/svg/svg.pro \ - -e "s,\$\$\[QT_INSTALL_PLUGINS\],$out/$qtPluginPrefix," - ''; - - enableParallelBuilding = true; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "Qt platform theme integration plugins for DDE"; - homepage = "https://github.com/linuxdeepin/qt5integration"; - license = with licenses; [ gpl3 lgpl2Plus bsd2 ]; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/qt5platform-plugins/default.nix b/pkgs/desktops/deepin/qt5platform-plugins/default.nix deleted file mode 100644 index 33e4863c0d9..00000000000 --- a/pkgs/desktops/deepin/qt5platform-plugins/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, pkgconfig -, qmake -, qtx11extras -, libSM -, mtdev -, cairo -, deepin -, qtbase -}: - -mkDerivation rec { - pname = "qt5platform-plugins"; - version = "5.0.11"; - - srcs = [ - (fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "14xkr3p49716jc9v7ksj6jgcmfa65qicqrmablizfi71srg3z2pr"; - }) - qtbase.src - ]; - - sourceRoot = "source"; - - nativeBuildInputs = [ - pkgconfig - qmake - ]; - - buildInputs = [ - qtx11extras - libSM - mtdev - cairo - qtbase - ]; - - postPatch = '' - # The Qt5 platforms plugin is vendored in the package, however what's there is not always up-to-date with what's in nixpkgs. - # We simply copy the headers from qtbase's source tarball. - mkdir -p platformplugin/libqt5xcbqpa-dev/${qtbase.version} - cp -r ../qtbase-everywhere-src-${qtbase.version}/src/plugins/platforms/xcb/*.h platformplugin/libqt5xcbqpa-dev/${qtbase.version}/ - ''; - - qmakeFlags = [ - "INSTALL_PATH=${placeholder "out"}/${qtbase.qtPluginPrefix}/platforms" - ]; - - passthru.updateScript = deepin.updateScript { inherit pname version; src = (builtins.head srcs); }; - - meta = with stdenv.lib; { - description = "Qt platform theme integration plugin for DDE"; - homepage = "https://github.com/linuxdeepin/qt5platform-plugins"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/setup-hook.sh b/pkgs/desktops/deepin/setup-hook.sh deleted file mode 100755 index ce1d7330a22..00000000000 --- a/pkgs/desktops/deepin/setup-hook.sh +++ /dev/null @@ -1,64 +0,0 @@ -# Helper functions for deepin packaging - -searchHardCodedPaths() { - # Usage: - # - # searchHardCodedPaths [-a] [<path>] - # - # Looks for ocurrences of FHS hard coded paths and command - # invocations in the given path (default: current directory) for - # the purpose of debugging a derivation. The option -a enables - # processing binary files as if they were text. - - local binary - if [ "$1" = "-a" ]; then - binary="-a" - shift - fi - - local path=$1 - - echo ----------- looking for command invocations in $path - grep --color=always -r -E '\<(ExecStart|Exec|startDetached|execute|exec\.(Command|LookPath))\>' $path || true - - echo ----------- looking for hard coded paths in $path - grep --color=always $binary -r -E '/(usr|bin|sbin|etc|var|opt)\>' $path || true - - echo ----------- done -} - -fixPath() { - # Usage: - # - # fixPath <parent dir> <path> <files> - # - # replaces occurences of <path> by <parent_dir><path> in <files> - # removing /usr from the start of <path> if present - - local parentdir=$1 - local path=$2 - local newpath=$parentdir$(echo $path | sed "s,^/usr,,") - local files=("${@:3}") - echo ======= grep --color=always "${path}" "${files[@]}" - grep --color=always "${path}" "${files[@]}" - echo +++++++ sed -i -e "s,$path,$newpath,g" "${files[@]}" - sed -i -e "s,$path,$newpath,g" "${files[@]}" -} - -searchForUnresolvedDLL() { - # Usage: - # - # searchForUnresolvedDLL <dir> - # - # looks in <dir> for executables with unresolved dynamic library paths - - local dir="$1" - echo ======= Looking for executables with unresolved dynamic library dependencies - echo $dir - for f in $(find -L "$dir" -type f -executable); do - if (ldd $f | grep -q "not found"); then - echo $f - ldd $f | grep --color=always "not found" - fi - done -} diff --git a/pkgs/desktops/deepin/startdde/default.nix b/pkgs/desktops/deepin/startdde/default.nix deleted file mode 100644 index 75b36e85de3..00000000000 --- a/pkgs/desktops/deepin/startdde/default.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ stdenv -, buildGoPackage -, fetchFromGitHub -, pkgconfig -, alsaLib -, coreutils -, dde-api -, dde-daemon -, dde-dock -, dde-file-manager -, dde-polkit-agent -, dde-session-ui -, deepin -, deepin-desktop-base -, deepin-desktop-schemas -, deepin-turbo -, dde-kwin -, glib -, gnome3 -, go -, go-dbus-factory -, go-gir-generator -, go-lib -, gtk3 -, jq -, kmod -, libX11 -, libXi -, libcgroup -, pciutils -, psmisc -, pulseaudio -, systemd -, xorg -, wrapGAppsHook -}: - -buildGoPackage rec { - pname = "startdde"; - version = "5.0.1"; - - goPackagePath = "pkg.deepin.io/dde/startdde"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "1xydmglydksy7hjlavf5pbfy0s0lndgavh8x3kg2mg7d36mbra43"; - }; - - goDeps = ./deps.nix; - - nativeBuildInputs = [ - pkgconfig - jq - wrapGAppsHook - deepin.setupHook - ]; - - buildInputs = [ - dde-api - go-dbus-factory - go-gir-generator - go-lib - alsaLib - dde-daemon - dde-dock - dde-file-manager - dde-kwin - dde-polkit-agent - dde-session-ui - deepin-desktop-schemas - deepin-turbo - glib - gnome3.dconf - gnome3.gnome-keyring - gnome3.libgnome-keyring - gtk3 - kmod - libX11 - libXi - libcgroup - pciutils - psmisc - pulseaudio - systemd - xorg.xdriinfo - ]; - - postPatch = '' - searchHardCodedPaths # debugging - - # Commented lines below indicates a doubt about how to fix the hard coded path - - fixPath $out /etc/X11 Makefile - #fixPath ? /etc/xdg/autostop autostop/autostop.go - fixPath ${coreutils} /bin/ls copyfile_test.go - fixPath $out /usr/share/startdde/auto_launch.json launch_group.go - #fixPath ? /usr/bin/kwin_no_scale main.go # not found on deepin linux and archlinux - fixPath $out /usr/share/startdde/memchecker.json memchecker/config.go - fixPath $out /usr/bin/startdde misc/00deepin-dde-env - fixPath ${dde-file-manager} /usr/bin/dde-file-manager misc/auto_launch/chinese.json - fixPath ${deepin-turbo} /usr/lib/deepin-turbo/booster-dtkwidget misc/auto_launch/chinese.json - fixPath ${dde-daemon} /usr/lib/deepin-daemon/dde-session-daemon misc/auto_launch/chinese.json misc/auto_launch/default.json - fixPath ${dde-dock} /usr/bin/dde-dock misc/auto_launch/chinese.json misc/auto_launch/default.json - fixPath ${dde-file-manager} /usr/bin/dde-desktop misc/auto_launch/chinese.json misc/auto_launch/default.json - fixPath $out /usr/bin/startdde misc/deepin-session - #fixPath ? /usr/lib/lightdm/config-error-dialog.sh misc/deepin-session # provided by lightdm on deepin linux - #fixPath ? /usr/sbin/lightdm-session misc/deepin-session # provided by lightdm on deepin linux - fixPath ${dde-session-ui} /usr/bin/dde-lock session.go - fixPath ${dde-session-ui} /usr/bin/dde-shutdown session.go - fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-osd session.go - fixPath ${deepin-desktop-base} /etc/deepin-version session.go - fixPath ${gnome3.gnome-keyring} /usr/bin/gnome-keyring-daemon session.go - fixPath ${pulseaudio} /usr/bin/pulseaudio sound_effect.go - #fixPath ? /usr/lib/UIAppSched.hooks startmanager.go # not found anything about this - fixPath ${dde-session-ui} /usr/lib/deepin-daemon/dde-welcome utils.go - fixPath ${dde-polkit-agent} /usr/lib/polkit-1-dde/dde-polkit-agent watchdog/dde_polkit_agent.go - #fixPath ? /var/log/Xorg.0.log wm/driver.go - #fixPath ? /etc/deepin-wm-switcher/config.json wm/switcher_config.go # not present on nixos, deepin linux and archlinux - - substituteInPlace wm/driver.go --replace '/sbin/lsmod' "${kmod}/bin/lsmod" - - substituteInPlace session.go --replace 'LookPath("cgexec"' 'LookPath("${libcgroup}/bin/cgexec"' - substituteInPlace vm.go --replace 'Command("dde-wm-chooser"' 'Command("${dde-session-ui}/bin/dde-wm-chooser"' - substituteInPlace vm.go --replace 'Command("systemd-detect-virt"' 'Command("${systemd}/bin/systemd-detect-virt"' - substituteInPlace wm/card_info.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"' - substituteInPlace wm/driver.go --replace 'Command("lspci"' 'Command("${pciutils}/bin/lspci"' - substituteInPlace wm/driver.go --replace 'Command("xdriinfo"' 'Command("${xorg.xdriinfo}/bin/xdriinfo"' - substituteInPlace wm/platform.go --replace 'Command("gsettings"' 'Command("${glib}/bin/gsettings"' - substituteInPlace wm/platform.go --replace 'Command("uname"' 'Command("${coreutils}/bin/uname"' - substituteInPlace wm/switcher.go --replace 'Command("killall"' 'Command("${psmisc}/bin/killall"' - ''; - - buildPhase = '' - make -C go/src/${goPackagePath} - ''; - - installPhase = '' - make install PREFIX="$out" -C go/src/${goPackagePath} - rm -rf $out/share/lightdm # this is uselesss for NixOS - remove-references-to -t ${go} $out/sbin/* - ''; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru = { - updateScript = deepin.updateScript { inherit pname version src; }; - providedSessions = [ "deepin" ]; - }; - - meta = with stdenv.lib; { - description = "Starter of deepin desktop environment"; - homepage = "https://github.com/linuxdeepin/startdde"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/deepin/startdde/deps.nix b/pkgs/desktops/deepin/startdde/deps.nix deleted file mode 100644 index 8898b8c50fb..00000000000 --- a/pkgs/desktops/deepin/startdde/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/cryptix/wav"; - fetch = { - type = "git"; - url = "https://github.com/cryptix/wav"; - rev = "8bdace674401f0bd3b63c65479b6a6ff1f9d5e44"; - sha256 = "18nyqv0ic35fs9fny8sj84c00vbxs8mnric6vr6yl42624fh5id6"; - }; - } - { - goPackagePath = "github.com/linuxdeepin/go-x11-client"; - fetch = { - type = "git"; - url = "https://github.com/linuxdeepin/go-x11-client"; - rev = "b5b01565d224d5ccd5a4143d9099acceb23e182a"; - sha256 = "1lnffjp8bqy6f8caw6drg1js6hny5w7432riqchcrcd4q85d94rs"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "daa7c04131f568e31c51927b359a2d197a357058"; - sha256 = "17gbfvb5iqyayzw0zd6q218zsbf7x74rflvn18wkxvsw95n1y54h"; - }; - } -] diff --git a/pkgs/desktops/deepin/udisks2-qt5/default.nix b/pkgs/desktops/deepin/udisks2-qt5/default.nix deleted file mode 100644 index 0fcc2e9f9f7..00000000000 --- a/pkgs/desktops/deepin/udisks2-qt5/default.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ stdenv -, mkDerivation -, fetchFromGitHub -, qmake -, qtbase -, deepin -}: - -mkDerivation rec { - pname = "udisks2-qt5"; - version = "5.0.3"; - - src = fetchFromGitHub { - owner = "linuxdeepin"; - repo = pname; - rev = version; - sha256 = "0c87ks9glwhk4m2s7kf7mb43q011yi6l3qjq2ammmfqwl8xal69a"; - }; - - nativeBuildInputs = [ - deepin.setupHook - qmake - ]; - - buildInputs = [ - qtbase - ]; - - postPatch = '' - searchHardCodedPaths # debugging - ''; - - qmakeFlags = [ - "QMAKE_PKGCONFIG_PREFIX=${placeholder "out"}" - ]; - - postFixup = '' - searchHardCodedPaths $out # debugging - ''; - - passthru.updateScript = deepin.updateScript { inherit pname version src; }; - - meta = with stdenv.lib; { - description = "UDisks2 D-Bus interfaces binding for Qt5"; - homepage = "https://github.com/linuxdeepin/udisks2-qt5"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = with maintainers; [ romildo ]; - }; -} diff --git a/pkgs/desktops/enlightenment/terminology/default.nix b/pkgs/desktops/enlightenment/terminology/default.nix index 72aab761754..e70b9cdc9b5 100644 --- a/pkgs/desktops/enlightenment/terminology/default.nix +++ b/pkgs/desktops/enlightenment/terminology/default.nix @@ -1,19 +1,18 @@ -{ stdenv, fetchurl, meson, ninja, pkgconfig, efl, pcre, mesa, makeWrapper }: +{ stdenv, fetchurl, meson, ninja, pkg-config, efl, pcre, mesa }: stdenv.mkDerivation rec { pname = "terminology"; - version = "1.8.0"; + version = "1.8.1"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0pvn8mdzxlx7181xdha32fbr0w8xl7hsnb3hfxr5099g841v1xf6"; + sha256 = "1fxqjf7g30ix4qxi6366rrax27s3maxq43z2vakwnhz4mp49m9h4"; }; nativeBuildInputs = [ meson ninja - pkgconfig - makeWrapper + pkg-config ]; buildInputs = [ diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix index d248ad37d02..20cc3877efb 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { patches = [ (fetchpatch { name = "0001-gnome-scores.h-Convert-to-UTF-8.patch"; - url = "https://github.com/GNOME/libgnomeui/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff"; + url = "https://gitlab.gnome.org/Archive/libgnomeui/-/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff"; sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk"; }) ]; diff --git a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix index 2e89e6b9c27..e558eb66d40 100644 --- a/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-desktop/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "gnome-desktop"; - version = "3.36.4"; + version = "3.36.5"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/gnome-desktop/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1ilv49qkppbbag5728iswg1jhhqx9hbj7j8k8wccnbyaq54bsyq0"; + sha256 = "0lxpgb199hn37vq822qg9g43pwixbki3x5lkazqa77qhjhlj98gf"; }; nativeBuildInputs = [ diff --git a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix index 17f359e7d28..8f2e78c639c 100644 --- a/pkgs/desktops/gnome-3/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-shell/default.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation rec { pname = "gnome-shell"; - version = "3.36.4"; + version = "3.36.5"; outputs = [ "out" "devdoc" ]; src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "1nyibrr98ijn65z9ki0k7xzcwcliwy2jqssz0l0jalpbkhnr751d"; + url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; + sha256 = "1hj7gmjmy92xndlgw7pzk5m6j2fbzcgfd1pxc32k38gml8qg19d4"; }; patches = [ diff --git a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix index 71b53094674..f170a2fb190 100644 --- a/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix +++ b/pkgs/desktops/gnome-3/extensions/night-theme-switcher/default.nix @@ -1,26 +1,24 @@ -{ stdenv, fetchFromGitLab }: +{ stdenv, fetchFromGitLab, glib, gnome3, unzip }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-night-theme-switcher"; - version = "19"; + version = "36"; src = fetchFromGitLab { owner = "rmnvgr"; repo = "nightthemeswitcher-gnome-shell-extension"; rev = "v${version}"; - sha256 = "1ll0yf1skf51wa10mlrajd1dy459w33kx0i3vhfcx2pdk7mw5a3c"; + sha256 = "1c88979qprwb5lj0v7va017w7rdr89a648anhw4k5q135jwyskpz"; }; - # makefile tries to do install in home directory using - # `gnome-extensions install` - dontBuild = true; + buildInputs = [ glib gnome3.gnome-shell unzip ]; uuid = "nightthemeswitcher@romainvigier.fr"; installPhase = '' runHook preInstall mkdir -p $out/share/gnome-shell/extensions/ - cp -r src/ $out/share/gnome-shell/extensions/${uuid} + unzip build/${uuid}.shell-extension.zip -d $out/share/gnome-shell/extensions/${uuid} runHook postInstall ''; diff --git a/pkgs/desktops/plasma-5/addons/caffeine-plus.nix b/pkgs/desktops/plasma-5/addons/caffeine-plus.nix new file mode 100644 index 00000000000..66e1255f223 --- /dev/null +++ b/pkgs/desktops/plasma-5/addons/caffeine-plus.nix @@ -0,0 +1,32 @@ +{ lib, mkDerivation, fetchFromGitHub, extra-cmake-modules +, kwindowsystem, plasma-framework }: + +mkDerivation rec { + pname = "plasma-applet-caffeine-plus"; + version = "1.4"; + + src = fetchFromGitHub { + owner = "qunxyz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-/Nz0kSDGok7GjqSQtjH/8q/u6blVTFPO6kfjEyt/jEo="; + }; + + buildInputs = [ + kwindowsystem plasma-framework + ]; + + nativeBuildInputs = [ extra-cmake-modules ]; + + cmakeFlags = [ + "-Wno-dev" + ]; + + meta = with lib; { + description = "Disable screensaver and auto suspend"; + license = licenses.gpl2; + maintainers = with maintainers; [ peterhoeg ]; + inherit (src.meta) homepage; + inherit (kwindowsystem.meta) platforms; + }; +} diff --git a/pkgs/desktops/plasma-5/fetch.sh b/pkgs/desktops/plasma-5/fetch.sh index d871ceb2875..abb5659526f 100644 --- a/pkgs/desktops/plasma-5/fetch.sh +++ b/pkgs/desktops/plasma-5/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( https://download.kde.org/stable/plasma/5.17.5/ ) +WGET_ARGS=( https://download.kde.org/stable/plasma/5.18.5/ ) diff --git a/pkgs/desktops/plasma-5/kde-cli-tools.nix b/pkgs/desktops/plasma-5/kde-cli-tools.nix index 3364ee2c063..d84b7bc9801 100644 --- a/pkgs/desktops/plasma-5/kde-cli-tools.nix +++ b/pkgs/desktops/plasma-5/kde-cli-tools.nix @@ -1,5 +1,5 @@ { - mkDerivation, extra-cmake-modules, kdoctools, + lib, mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kconfig, kdesu, ki18n, kiconthemes, kinit, kio, kwindowsystem, qtsvg, qtx11extras, kactivities, plasma-workspace }: @@ -11,4 +11,18 @@ mkDerivation { kcmutils kconfig kdesu ki18n kiconthemes kinit kio kwindowsystem qtsvg qtx11extras kactivities plasma-workspace ]; + postInstall = '' + # install a symlink in bin so that kdesu can eventually be found in PATH + mkdir -p $out/bin + ln -s $out/libexec/kf5/kdesu $out/bin + ''; + dontWrapQtApps = true; + preFixup = '' + for program in $out/bin/*; do + wrapQtApp $program + done + + # kdesu looks for kdeinit5 in PATH + wrapQtApp $out/libexec/kf5/kdesu --suffix PATH : ${lib.getBin kinit}/bin + ''; } diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch b/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch new file mode 100644 index 00000000000..2fe4672f675 --- /dev/null +++ b/pkgs/desktops/plasma-5/kde-gtk-config/0001-gsettings-schemas-path.patch @@ -0,0 +1,21 @@ +diff --git a/kded/gtkconfig.cpp b/kded/gtkconfig.cpp +index 5303636..199c4d5 100644 +--- a/kded/gtkconfig.cpp ++++ b/kded/gtkconfig.cpp +@@ -41,6 +41,16 @@ GtkConfig::GtkConfig(QObject *parent, const QVariantList&) : + kdeglobalsConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kdeglobals")))), + kwinConfigWatcher(KConfigWatcher::create(KSharedConfig::openConfig(QStringLiteral("kwinrc")))) + { ++ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS. ++ // Normally this would be done by wrapGAppsHook, but this plugin ++ // (shared object) cannot be wrapped. ++ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS"); ++ if (!xdgdata.isEmpty()) { ++ xdgdata.push_front(":"); ++ } ++ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH)); ++ qputenv("XDG_DATA_DIRS", xdgdata); ++ + QDBusConnection dbus = QDBusConnection::sessionBus(); + dbus.registerService(QStringLiteral("org.kde.GtkConfig")); + dbus.registerObject(QStringLiteral("/GtkConfig"), this, QDBusConnection::ExportScriptableSlots); diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix index 8cfc947d30b..c1ed6dbd6c6 100644 --- a/pkgs/desktops/plasma-5/kde-gtk-config/default.nix +++ b/pkgs/desktops/plasma-5/kde-gtk-config/default.nix @@ -2,7 +2,7 @@ mkDerivation, extra-cmake-modules, wrapGAppsHook, glib, gtk2, gtk3, karchive, kcmutils, kconfigwidgets, ki18n, kiconthemes, kio, - knewstuff, gsettings-desktop-schemas + knewstuff, gsettings-desktop-schemas, xsettingsd }: mkDerivation { @@ -11,14 +11,16 @@ mkDerivation { dontWrapGApps = true; # There is nothing to wrap buildInputs = [ ki18n kio glib gtk2 gtk3 karchive kcmutils kconfigwidgets kiconthemes - knewstuff gsettings-desktop-schemas + knewstuff gsettings-desktop-schemas xsettingsd ]; - patches = [ ./patches/follow-symlinks.patch ./patches/gsettings.patch ]; cmakeFlags = [ "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" "-DGLIB_SCHEMAS_DIR=${gsettings-desktop-schemas.out}/" ]; + # The gtkconfig KDED module will crash the daemon if the GSettings schemas + # aren't found. + patches = [ ./0001-gsettings-schemas-path.patch ]; preConfigure = '' NIX_CFLAGS_COMPILE+=" -DGSETTINGS_SCHEMAS_PATH=\"$GSETTINGS_SCHEMAS_PATH\"" ''; diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch deleted file mode 100644 index f30a0a4588f..00000000000 --- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/follow-symlinks.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 33b25c2e3c7a002c7f726cd79fc4bab22b1299be Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel <ttuegel@gmail.com> -Date: Tue, 27 Oct 2015 18:07:54 -0500 -Subject: [PATCH] follow symlinks - ---- - src/appearancegtk2.cpp | 2 +- - src/iconthemesmodel.cpp | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: kde-gtk-config-5.12.4/src/appearancegtk2.cpp -=================================================================== ---- kde-gtk-config-5.12.4.orig/src/appearancegtk2.cpp -+++ kde-gtk-config-5.12.4/src/appearancegtk2.cpp -@@ -69,7 +69,7 @@ QString AppearanceGTK2::themesGtkrcFile( - QStringList themes=installedThemes(); - themes=themes.filter(QRegExp("/"+themeName+"/?$")); - if(themes.size()==1) { -- QDirIterator it(themes.first(), QDirIterator::Subdirectories); -+ QDirIterator it(themes.first(), QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); - while(it.hasNext()) { - it.next(); - if(it.fileName()=="gtkrc") { -Index: kde-gtk-config-5.12.4/src/iconthemesmodel.cpp -=================================================================== ---- kde-gtk-config-5.12.4.orig/src/iconthemesmodel.cpp -+++ kde-gtk-config-5.12.4/src/iconthemesmodel.cpp -@@ -47,7 +47,7 @@ QList<QDir> IconThemesModel::installedTh - - foreach(const QString& dir, dirs) { - QDir userIconsDir(dir); -- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks); -+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs); - while(it.hasNext()) { - QString currentPath = it.next(); - QDir dir(currentPath); -Index: kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp -=================================================================== ---- kde-gtk-config-5.12.4.orig/src/cursorthemesmodel.cpp -+++ kde-gtk-config-5.12.4/src/cursorthemesmodel.cpp -@@ -47,7 +47,7 @@ QList<QDir> CursorThemesModel::installed - - foreach(const QString& dir, dirs) { - QDir userIconsDir(dir); -- QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs|QDir::NoSymLinks); -+ QDirIterator it(userIconsDir.path(), QDir::NoDotAndDotDot|QDir::AllDirs); - while(it.hasNext()) { - QString currentPath = it.next(); - QDir dir(currentPath); diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch b/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch deleted file mode 100644 index 69f7bc4e56a..00000000000 --- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/gsettings.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/src/gtkconfigkcmodule.cpp b/src/gtkconfigkcmodule.cpp -index 7b82d50..96831d8 100644 ---- a/src/gtkconfigkcmodule.cpp -+++ b/src/gtkconfigkcmodule.cpp -@@ -91,6 +91,16 @@ GTKConfigKCModule::GTKConfigKCModule(QWidget* parent, const QVariantList& args ) - iconsProxyModel->sort(0); - ui->cb_icon->setModel(iconsProxyModel); - ui->cb_icon_fallback->setModel(iconsProxyModel); -+ -+ // Add GSETTINGS_SCHEMAS_PATH to the front of XDG_DATA_DIRS. -+ // Normally this would be done by wrapGAppsHook, but this plugin -+ // (shared object) cannot be wrapped. -+ QByteArray xdgdata = qgetenv("XDG_DATA_DIRS"); -+ if (!xdgdata.isEmpty()) { -+ xdgdata.push_front(":"); -+ } -+ xdgdata.push_front(QByteArray(GSETTINGS_SCHEMAS_PATH)); -+ qputenv("XDG_DATA_DIRS", xdgdata); - - m_tempGtk2Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/gtkrc-2.0"; - m_tempGtk3Preview = QStandardPaths::writableLocation(QStandardPaths::TempLocation)+ "/.config/gtk-3.0/settings.ini"; diff --git a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series b/pkgs/desktops/plasma-5/kde-gtk-config/patches/series deleted file mode 100644 index 7aad1acf6ac..00000000000 --- a/pkgs/desktops/plasma-5/kde-gtk-config/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -follow-symlinks.patch -gsettings.patch diff --git a/pkgs/desktops/plasma-5/kdeplasma-addons.nix b/pkgs/desktops/plasma-5/kdeplasma-addons.nix index 398fc356fc9..f214d4070ee 100644 --- a/pkgs/desktops/plasma-5/kdeplasma-addons.nix +++ b/pkgs/desktops/plasma-5/kdeplasma-addons.nix @@ -1,17 +1,18 @@ { mkDerivation, extra-cmake-modules, kdoctools, - kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kio, - knewstuff, kross, krunner, kservice, ksysguard, kunitconversion, ibus, - plasma-framework, plasma-workspace, qtdeclarative, qtx11extras, kholidays + kconfig, kconfigwidgets, kcoreaddons, kcmutils, kdelibs4support, kholidays, + kio, knewstuff, kpurpose, kross, krunner, kservice, ksysguard, + kunitconversion, ibus, plasma-framework, plasma-workspace, qtdeclarative, + qtwebengine, qtx11extras }: mkDerivation { name = "kdeplasma-addons"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kio knewstuff - kross krunner kservice ksysguard kunitconversion ibus plasma-framework - plasma-workspace qtdeclarative qtx11extras kholidays + kconfig kconfigwidgets kcoreaddons kcmutils kdelibs4support kholidays kio + knewstuff kpurpose kross krunner kservice ksysguard kunitconversion ibus + plasma-framework plasma-workspace qtdeclarative qtwebengine qtx11extras ]; } diff --git a/pkgs/desktops/plasma-5/khotkeys.nix b/pkgs/desktops/plasma-5/khotkeys.nix index 77763c5e203..ad78d602dec 100644 --- a/pkgs/desktops/plasma-5/khotkeys.nix +++ b/pkgs/desktops/plasma-5/khotkeys.nix @@ -1,6 +1,7 @@ { - mkDerivation, + mkDerivation, lib, extra-cmake-modules, kdoctools, + qtbase, kcmutils, kdbusaddons, kdelibs4support, kglobalaccel, ki18n, kio, kxmlgui, plasma-framework, plasma-workspace, qtx11extras }: @@ -13,5 +14,5 @@ mkDerivation { plasma-framework plasma-workspace qtx11extras ]; outputs = [ "bin" "dev" "out" ]; - enableParallelBuilding = false; + meta.broken = lib.versionOlder qtbase.version "5.14"; } diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index b35493929ff..cf353af5891 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -2,8 +2,9 @@ mkDerivation, extra-cmake-modules, kdoctools, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, - kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, - kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid + kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kirigami2, kpackage, + kservice, kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, + solid }: mkDerivation { @@ -11,7 +12,7 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons - kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice - kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid + kdeclarative kdelibs4support ki18n kiconthemes kio kirigami2 kpackage + kservice kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid ]; } diff --git a/pkgs/desktops/plasma-5/kscreen-417316.patch b/pkgs/desktops/plasma-5/kscreen-417316.patch deleted file mode 100644 index 92b347e2dbf..00000000000 --- a/pkgs/desktops/plasma-5/kscreen-417316.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://phabricator.kde.org/file/data/dyr2qr4wrhxg4eahkgd3/PHID-FILE-7d4og3zr4mk53u6lzkk2/D27442.diff -https://bugs.kde.org/show_bug.cgi?id=417316 - -diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml kscreen-5.17.5/kcm/package/contents/ui/main.qml ---- kscreen-5.17.5-orig/kcm/package/contents/ui/main.qml 2020-01-07 16:28:39.000000000 +0100 -+++ kscreen-5.17.5/kcm/package/contents/ui/main.qml 2020-04-03 17:54:26.097809557 +0200 -@@ -24,8 +24,8 @@ - KCM.SimpleKCM { - id: root - -- implicitWidth: units.gridUnit * 30 -- implicitHeight: units.gridUnit * 38 -+ implicitWidth: Kirigami.Units.gridUnit * 32 -+ implicitHeight: Kirigami.Units.gridUnit * 38 - - property int selectedOutput: 0 - -@@ -113,7 +113,7 @@ - id: screen - - Layout.alignment: Qt.AlignHCenter -- Layout.preferredWidth: Math.max(root.width * 0.8, units.gridUnit * 26) -+ Layout.preferredWidth: Math.max(root.width * 0.8, Kirigami.Units.gridUnit * 26) - Layout.topMargin: Kirigami.Units.smallSpacing - Layout.bottomMargin: Kirigami.Units.largeSpacing * 2 - -diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml kscreen-5.17.5/kcm/package/contents/ui/Output.qml ---- kscreen-5.17.5-orig/kcm/package/contents/ui/Output.qml 2020-01-07 16:28:39.000000000 +0100 -+++ kscreen-5.17.5/kcm/package/contents/ui/Output.qml 2020-04-03 17:53:22.491686708 +0200 -@@ -19,6 +19,7 @@ - import QtQuick.Layouts 1.1 - import QtQuick.Controls 2.3 as Controls - import QtGraphicalEffects 1.0 -+import org.kde.kirigami 2.4 as Kirigami - - Rectangle { - id: output -@@ -77,7 +78,7 @@ - - Controls.Label { - Layout.fillWidth: true -- Layout.margins: units.smallSpacing -+ Layout.margins: Kirigami.Units.smallSpacing - - text: model.display - wrapMode: Text.Wrap -@@ -87,7 +88,7 @@ - - Controls.Label { - Layout.fillWidth: true -- Layout.bottomMargin: units.smallSpacing -+ Layout.bottomMargin: Kirigami.Units.smallSpacing - - text: "(" + model.size.width + "x" + model.size.height + ")" - horizontalAlignment: Text.AlignHCenter -diff -ru kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml kscreen-5.17.5/kcm/package/contents/ui/Screen.qml ---- kscreen-5.17.5-orig/kcm/package/contents/ui/Screen.qml 2020-01-07 16:28:39.000000000 +0100 -+++ kscreen-5.17.5/kcm/package/contents/ui/Screen.qml 2020-04-03 17:53:22.491686708 +0200 -@@ -45,7 +45,7 @@ - property int xOffset: (width - totalSize.width / relativeFactor) / 2; - property int yOffset: (height - totalSize.height / relativeFactor) / 2; - -- implicitHeight: Math.max(root.height * 0.4, units.gridUnit * 13) -+ implicitHeight: Math.max(root.height * 0.4, Kirigami.Units.gridUnit * 13) - - Component.onCompleted: background.visible = true; - -@@ -54,7 +54,7 @@ - anchors { - bottom: parent.bottom - horizontalCenter: parent.horizontalCenter -- margins: units.smallSpacing -+ margins: Kirigami.Units.smallSpacing - } - spacing: units.smallSpacing - Controls.Button { diff --git a/pkgs/desktops/plasma-5/kscreen.nix b/pkgs/desktops/plasma-5/kscreen.nix index 2f37c4212da..11b0f38fed0 100644 --- a/pkgs/desktops/plasma-5/kscreen.nix +++ b/pkgs/desktops/plasma-5/kscreen.nix @@ -2,17 +2,16 @@ mkDerivation, extra-cmake-modules, kconfig, kcmutils, kconfigwidgets, kdbusaddons, kglobalaccel, ki18n, - kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, + kwidgetsaddons, kxmlgui, libkscreen, qtdeclarative, qtgraphicaleffects, qtsensors, kwindowsystem, kdeclarative, plasma-framework }: mkDerivation { name = "kscreen"; - patches = [ ./kscreen-417316.patch ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcmutils kconfigwidgets kdbusaddons kglobalaccel ki18n - kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects + kwidgetsaddons kxmlgui libkscreen qtdeclarative qtgraphicaleffects qtsensors kwindowsystem kdeclarative plasma-framework ]; } diff --git a/pkgs/desktops/plasma-5/ksysguard.nix b/pkgs/desktops/plasma-5/ksysguard.nix index 01e740f74c4..72793fdf083 100644 --- a/pkgs/desktops/plasma-5/ksysguard.nix +++ b/pkgs/desktops/plasma-5/ksysguard.nix @@ -1,7 +1,7 @@ { mkDerivation, extra-cmake-modules, kdoctools, - lm_sensors, + libcap, libpcap, lm_sensors, kconfig, kcoreaddons, kdelibs4support, ki18n, kiconthemes, kitemviews, knewstuff, libksysguard }: @@ -11,6 +11,6 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kconfig kcoreaddons kitemviews knewstuff kiconthemes libksysguard - kdelibs4support ki18n lm_sensors + kdelibs4support ki18n libcap libpcap lm_sensors ]; } diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index c3e9e2b9c24..7c1f2292eca 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -5,13 +5,14 @@ epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, xwayland, - qtdeclarative, qtmultimedia, qtscript, qtx11extras, + qtdeclarative, qtmultimedia, qtquickcontrols2, qtscript, qtsensors, + qtvirtualkeyboard, qtx11extras, breeze-qt5, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui, - plasma-framework, qtsensors, libcap, libdrm, mesa + plasma-framework, libcap, libdrm, mesa }: # TODO (ttuegel): investigate qmlplugindump failure @@ -23,7 +24,8 @@ mkDerivation { epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor xwayland - qtdeclarative qtmultimedia qtscript qtx11extras qtsensors + qtdeclarative qtmultimedia qtquickcontrols2 qtscript qtsensors + qtvirtualkeyboard qtx11extras breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes diff --git a/pkgs/desktops/plasma-5/patches/0001-Add-a-logging-category-config-file.patch b/pkgs/desktops/plasma-5/patches/0001-Add-a-logging-category-config-file.patch new file mode 100644 index 00000000000..d8d54a117eb --- /dev/null +++ b/pkgs/desktops/plasma-5/patches/0001-Add-a-logging-category-config-file.patch @@ -0,0 +1,210 @@ +From e63a0dc2a7b185906a93d60e9d5d6deee4950efc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A9ven=20Car?= <meven.car@enioka.com> +Date: Wed, 20 May 2020 14:02:07 +0200 +Subject: [PATCH] Add a logging category config file + +Makes powerdevil default logging level Warning +--- + CMakeLists.txt | 2 ++ + daemon/CMakeLists.txt | 6 ++++++ + daemon/actions/dpms/CMakeLists.txt | 2 +- + daemon/backends/CMakeLists.txt | 6 +++--- + daemon/powerdevil_debug.cpp | 21 --------------------- + daemon/powerdevil_debug.h | 26 -------------------------- + kcmodule/activities/CMakeLists.txt | 2 +- + kcmodule/common/CMakeLists.txt | 2 +- + kcmodule/profiles/CMakeLists.txt | 2 +- + powerdevil.categories | 1 + + 10 files changed, 16 insertions(+), 54 deletions(-) + delete mode 100644 daemon/powerdevil_debug.cpp + delete mode 100644 daemon/powerdevil_debug.h + create mode 100644 powerdevil.categories + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5ded8f5a..52a7318c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,6 +11,7 @@ find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + + include(ECMSetupVersion) ++include(ECMQtDeclareLoggingCategory) + include(FeatureSummary) + include(KDEInstallDirs) + include(KDECMakeSettings) +@@ -76,6 +77,7 @@ add_subdirectory(daemon) + add_subdirectory(kcmodule) + add_subdirectory(doc) + ++install( FILES powerdevil.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) + install( FILES powerdevil.notifyrc DESTINATION ${KDE_INSTALL_KNOTIFY5RCDIR} ) + + feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) +diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt +index 33ca655b..96cc9b7b 100644 +--- a/daemon/CMakeLists.txt ++++ b/daemon/CMakeLists.txt +@@ -48,6 +48,12 @@ set(powerdevilcore_SRCS + kwinkscreenhelpereffect.cpp + ) + ++ecm_qt_declare_logging_category(powerdevilcore_SRCS ++ HEADER powerdevil_debug.h ++ IDENTIFIER POWERDEVIL ++ CATEGORY_NAME org.kde.powerdevil ++ DEFAULT_SEVERITY Warning) ++ + kconfig_add_kcfg_files(powerdevilcore_SRCS ../PowerDevilSettings.kcfgc) + + # Action DBus Adaptors +diff --git a/daemon/actions/dpms/CMakeLists.txt b/daemon/actions/dpms/CMakeLists.txt +index f8ca4e20..3b8bd95b 100644 +--- a/daemon/actions/dpms/CMakeLists.txt ++++ b/daemon/actions/dpms/CMakeLists.txt +@@ -3,7 +3,7 @@ include_directories(${PowerDevil_SOURCE_DIR}/daemon + ${CMAKE_CURRENT_BINARY_DIR}) + + set(powerdevildpmsaction_SRCS +- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ++ ${CMAKE_CURRENT_BINARY_DIR}/../../powerdevil_debug.cpp + powerdevildpmsaction.cpp + abstractdpmshelper.cpp + xcbdpmshelper.cpp +diff --git a/daemon/backends/CMakeLists.txt b/daemon/backends/CMakeLists.txt +index 89400446..05c4263e 100644 +--- a/daemon/backends/CMakeLists.txt ++++ b/daemon/backends/CMakeLists.txt +@@ -4,7 +4,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/upower + ${X11_Xrandr_INCLUDE_PATH}) + + set(powerdevilupowerbackend_SRCS +- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ++ ${CMAKE_CURRENT_BINARY_DIR}/../powerdevil_debug.cpp + upower/upowersuspendjob.cpp + upower/login1suspendjob.cpp + upower/powerdevilupowerbackend.cpp +@@ -33,14 +33,14 @@ ${CMAKE_CURRENT_SOURCE_DIR}/upower/dbus/org.freedesktop.UPower.KbdBacklight.xml + upower_kbdbacklight_interface) + + ## backlight helper executable +-add_executable(backlighthelper upower/backlighthelper.cpp ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ${backlighthelper_mocs}) ++add_executable(backlighthelper upower/backlighthelper.cpp ${CMAKE_CURRENT_BINARY_DIR}/../powerdevil_debug.cpp ${backlighthelper_mocs}) + target_link_libraries(backlighthelper Qt5::Core KF5::AuthCore KF5::I18n) + install(TARGETS backlighthelper DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) + kauth_install_helper_files(backlighthelper org.kde.powerdevil.backlighthelper root) + kauth_install_actions(org.kde.powerdevil.backlighthelper ${CMAKE_CURRENT_SOURCE_DIR}/upower/backlight_helper_actions.actions) + + ## discrete gpu helper executable +-add_executable(discretegpuhelper upower/discretegpuhelper.cpp ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ${discretegpuhelper_mocs}) ++add_executable(discretegpuhelper upower/discretegpuhelper.cpp ${CMAKE_CURRENT_BINARY_DIR}/../powerdevil_debug.cpp ${discretegpuhelper_mocs}) + target_link_libraries(discretegpuhelper Qt5::Core KF5::AuthCore) + install(TARGETS discretegpuhelper DESTINATION ${KAUTH_HELPER_INSTALL_DIR}) + kauth_install_helper_files(discretegpuhelper org.kde.powerdevil.discretegpuhelper root) +diff --git a/daemon/powerdevil_debug.cpp b/daemon/powerdevil_debug.cpp +deleted file mode 100644 +index 86172c1b..00000000 +--- a/daemon/powerdevil_debug.cpp ++++ /dev/null +@@ -1,21 +0,0 @@ +-/* This file is part of the KDE project +- Copyright (C) 2014 Hrvoje Senjan <hrvoje.senjan@gmail.com> +- +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public +- License as published by the Free Software Foundation; either +- version 2 of the License, or (at your option) any later version. +- +- This library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public License +- along with this library; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#include "powerdevil_debug.h" +-Q_LOGGING_CATEGORY(POWERDEVIL, "powerdevil") +diff --git a/daemon/powerdevil_debug.h b/daemon/powerdevil_debug.h +deleted file mode 100644 +index fcd9c10f..00000000 +--- a/daemon/powerdevil_debug.h ++++ /dev/null +@@ -1,26 +0,0 @@ +-/* This file is part of the KDE project +- Copyright (C) 2014 Hrvoje Senjan <hrvoje.senjan@gmail.com> +- +- This library is free software; you can redistribute it and/or +- modify it under the terms of the GNU Library General Public +- License as published by the Free Software Foundation; either +- version 2 of the License, or (at your option) any later version. +- +- This library is distributed in the hope that it will be useful, +- but WITHOUT ANY WARRANTY; without even the implied warranty of +- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- Library General Public License for more details. +- +- You should have received a copy of the GNU Library General Public License +- along with this library; see the file COPYING.LIB. If not, write to +- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, +- Boston, MA 02110-1301, USA. +-*/ +- +-#ifndef PROCESSCORE_DEBUG_H +-#define PROCESSCORE_DEBUG_H +- +-#include <QLoggingCategory> +-Q_DECLARE_LOGGING_CATEGORY(POWERDEVIL) +- +-#endif +diff --git a/kcmodule/activities/CMakeLists.txt b/kcmodule/activities/CMakeLists.txt +index 41a6da48..6e248e91 100644 +--- a/kcmodule/activities/CMakeLists.txt ++++ b/kcmodule/activities/CMakeLists.txt +@@ -1,7 +1,7 @@ + add_definitions(-DTRANSLATION_DOMAIN=\"powerdevilactivitiesconfig\") + + set( kcm_powerdevil_activities_SRCS +- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ++ ${CMAKE_CURRENT_BINARY_DIR}/../../daemon/powerdevil_debug.cpp + activitypage.cpp + activitywidget.cpp + ../common/ErrorOverlay.cpp +diff --git a/kcmodule/common/CMakeLists.txt b/kcmodule/common/CMakeLists.txt +index ca483fa7..400b7746 100644 +--- a/kcmodule/common/CMakeLists.txt ++++ b/kcmodule/common/CMakeLists.txt +@@ -1,7 +1,7 @@ + add_definitions(-DTRANSLATION_DOMAIN=\"libpowerdevilcommonconfig\") + + set( powerdevil_config_common_private_SRCS +- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ++ ${CMAKE_CURRENT_BINARY_DIR}/../../daemon/powerdevil_debug.cpp + actionconfigwidget.cpp + actioneditwidget.cpp + ErrorOverlay.cpp +diff --git a/kcmodule/profiles/CMakeLists.txt b/kcmodule/profiles/CMakeLists.txt +index ac5c96e0..32279089 100644 +--- a/kcmodule/profiles/CMakeLists.txt ++++ b/kcmodule/profiles/CMakeLists.txt +@@ -1,7 +1,7 @@ + add_definitions(-DTRANSLATION_DOMAIN=\"powerdevilprofilesconfig\") + + set( kcm_powerdevil_profiles_SRCS +- ${PowerDevil_SOURCE_DIR}/daemon/powerdevil_debug.cpp ++ ${CMAKE_CURRENT_BINARY_DIR}/../../daemon/powerdevil_debug.cpp + EditPage.cpp + ${PowerDevil_SOURCE_DIR}/daemon/powerdevilprofilegenerator.cpp + ) +diff --git a/powerdevil.categories b/powerdevil.categories +new file mode 100644 +index 00000000..3147de54 +--- /dev/null ++++ b/powerdevil.categories +@@ -0,0 +1 @@ ++org.kde.powerdevil Powerdevil DEFAULT_SEVERITY [WARNING] IDENTIFIER [POWERDEVIL] +-- +2.25.4 + diff --git a/pkgs/desktops/plasma-5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5/plasma-desktop/default.nix index 4183b38ba49..b042fc3bd6a 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/default.nix +++ b/pkgs/desktops/plasma-5/plasma-desktop/default.nix @@ -12,7 +12,7 @@ kdeclarative, kded, kdelibs4support, kemoticons, kglobalaccel, ki18n, kitemmodels, knewstuff, knotifications, knotifyconfig, kpeople, krunner, kscreenlocker, ksysguard, kwallet, kwin, phonon, plasma-framework, - plasma-workspace, xf86inputlibinput + plasma-workspace, qqc2-desktop-style, xf86inputlibinput }: mkDerivation { @@ -27,7 +27,7 @@ mkDerivation { attica baloo kactivities kactivities-stats kauth kcmutils kdbusaddons kdeclarative kded kdelibs4support kemoticons kglobalaccel ki18n kitemmodels knewstuff knotifications knotifyconfig kpeople krunner kscreenlocker - ksysguard kwallet kwin plasma-framework plasma-workspace + ksysguard kwallet kwin plasma-framework plasma-workspace qqc2-desktop-style ]; patches = copyPathsToStore (lib.readPathsFromFile ./. ./series); diff --git a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch index a46212af10f..6c04081ae29 100644 --- a/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch +++ b/pkgs/desktops/plasma-5/plasma-desktop/hwclock-path.patch @@ -17,7 +17,7 @@ Index: plasma-desktop-5.8.5/kcms/dateandtime/helper.cpp void ClockHelper::toHwclock() { -- QString hwclock = KStandardDirs::findExe(QStringLiteral("hwclock"), exePath); +- QString hwclock = QStandardPaths::findExecutable(QStringLiteral("hwclock"), exePath.split(QLatin1Char(':'))); + QString hwclock = QLatin1String(NIXPKGS_HWCLOCK); if (!hwclock.isEmpty()) { KProcess::execute(hwclock, QStringList() << QStringLiteral("--systohc")); diff --git a/pkgs/desktops/plasma-5/plasma-pa.nix b/pkgs/desktops/plasma-5/plasma-pa.nix index b60b5298d6d..e29df104f3c 100644 --- a/pkgs/desktops/plasma-5/plasma-pa.nix +++ b/pkgs/desktops/plasma-5/plasma-pa.nix @@ -1,15 +1,20 @@ { mkDerivation, extra-cmake-modules, kdoctools, - gconf, glib, kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, - libcanberra-gtk3, libpulseaudio, plasma-framework, qtdeclarative, kwindowsystem + kconfigwidgets, kcoreaddons, kdeclarative, kglobalaccel, ki18n, kwindowsystem, plasma-framework, + qtdeclarative, + gconf, glib, libcanberra-gtk3, libpulseaudio, sound-theme-freedesktop }: mkDerivation { name = "plasma-pa"; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ - gconf glib kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n - libcanberra-gtk3 libpulseaudio plasma-framework qtdeclarative kwindowsystem + gconf glib libcanberra-gtk3 libpulseaudio sound-theme-freedesktop + + kconfigwidgets kcoreaddons kdeclarative kglobalaccel ki18n plasma-framework + kwindowsystem + + qtdeclarative ]; } diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch index d230e1270be..12080092629 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0001-startkde.patch @@ -1,4 +1,4 @@ -From 1796822e4c97062b919a596ce13db68e2c46c7e8 Mon Sep 17 00:00:00 2001 +From 6477e377fcca39c07ef5f91a55084d7d74715d00 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Tue, 28 Jan 2020 05:00:53 -0600 Subject: [PATCH 1/2] startkde @@ -6,11 +6,11 @@ Subject: [PATCH 1/2] startkde --- startkde/startplasma-waylandsession.cpp | 2 +- startkde/startplasma-x11.cpp | 2 +- - startkde/startplasma.cpp | 32 ++++++++----------------- - 3 files changed, 12 insertions(+), 24 deletions(-) + startkde/startplasma.cpp | 24 ++++++++++-------------- + 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp -index 87c71c6..5fc5314 100644 +index 87c71c6b3..5fc53140e 100644 --- a/startkde/startplasma-waylandsession.cpp +++ b/startkde/startplasma-waylandsession.cpp @@ -67,7 +67,7 @@ int main(int /*argc*/, char** /*argv*/) @@ -23,7 +23,7 @@ index 87c71c6..5fc5314 100644 cleanupX11(); out << "startplasma-waylandsession: Done.\n"; diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp -index 3314b62..14cbe29 100644 +index 3314b6283..14cbe29fa 100644 --- a/startkde/startplasma-x11.cpp +++ b/startkde/startplasma-x11.cpp @@ -111,7 +111,7 @@ int main(int /*argc*/, char** /*argv*/) @@ -36,7 +36,7 @@ index 3314b62..14cbe29 100644 cleanupPlasmaEnvironment(); cleanupX11(); diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp -index e0f7004..8ac41fd 100644 +index 4c9f5cef6..5ea4c2cf1 100644 --- a/startkde/startplasma.cpp +++ b/startkde/startplasma.cpp @@ -34,7 +34,7 @@ QTextStream out(stderr); @@ -48,22 +48,7 @@ index e0f7004..8ac41fd 100644 } QStringList allServices(const QLatin1String& prefix) -@@ -184,14 +184,6 @@ void runEnvironmentScripts() - } - } - sourceFiles(scripts); -- -- // Make sure that the KDE prefix is first in XDG_DATA_DIRS and that it's set at all. -- // The spec allows XDG_DATA_DIRS to be not set, but X session startup scripts tend -- // to set it to a list of paths *not* including the KDE prefix if it's not /usr or -- // /usr/local. -- if (!qEnvironmentVariableIsSet("XDG_DATA_DIRS")) { -- qputenv("XDG_DATA_DIRS", KDE_INSTALL_FULL_DATAROOTDIR ":/usr/share:/usr/local/share"); -- } - } - - -@@ -240,15 +232,15 @@ void setupX11() +@@ -242,15 +242,15 @@ void setupX11() // If the user has overwritten fonts, the cursor font may be different now // so don't move this up. @@ -84,7 +69,7 @@ index e0f7004..8ac41fd 100644 } // TODO: Check if Necessary -@@ -265,11 +257,7 @@ bool syncDBusEnvironment() +@@ -267,11 +267,7 @@ bool syncDBusEnvironment() { int exitCode; // At this point all environment variables are set, let's send it to the DBus session server to update the activation environment @@ -97,7 +82,7 @@ index e0f7004..8ac41fd 100644 return exitCode == 0; } -@@ -285,7 +273,7 @@ void setupFontDpi() +@@ -287,7 +283,7 @@ void setupFontDpi() //TODO port to c++? const QByteArray input = "Xft.dpi: " + QByteArray::number(fontsCfg.readEntry("forceFontDPI", 0)); QProcess p; @@ -106,7 +91,7 @@ index e0f7004..8ac41fd 100644 p.setProcessChannelMode(QProcess::ForwardedChannels); p.write(input); p.closeWriteChannel(); -@@ -307,7 +295,7 @@ QProcess* setupKSplash() +@@ -309,7 +305,7 @@ QProcess* setupKSplash() KConfigGroup ksplashCfg = cfg.group("KSplash"); if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) { p = new QProcess; @@ -115,7 +100,7 @@ index e0f7004..8ac41fd 100644 } } return p; -@@ -329,7 +317,7 @@ bool startKDEInit() +@@ -331,7 +327,7 @@ bool startKDEInit() { // We set LD_BIND_NOW to increase the efficiency of kdeinit. // kdeinit unsets this variable before loading applications. @@ -125,5 +110,5 @@ index e0f7004..8ac41fd 100644 messageBox(QStringLiteral("startkde: Could not start kdeinit5. Check your installation.")); return false; -- -2.23.1 +2.25.1 diff --git a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch index 8fa9e1d31cf..366707d2703 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch +++ b/pkgs/desktops/plasma-5/plasma-workspace/0002-absolute-wallpaper-install-dir.patch @@ -1,4 +1,4 @@ -From 7c6f939aea290bc3ec7629f26d02441d1d4bcb8a Mon Sep 17 00:00:00 2001 +From f43f15870f14b8fa17ba0765c0d7e2b225fafc3f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel <ttuegel@mailbox.org> Date: Wed, 5 Feb 2020 05:03:11 -0600 Subject: [PATCH 2/2] absolute-wallpaper-install-dir @@ -8,15 +8,16 @@ Subject: [PATCH 2/2] absolute-wallpaper-install-dir 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sddm-theme/theme.conf.cmake b/sddm-theme/theme.conf.cmake -index ea9a943..c8458ba 100644 +index 8494a5c8a..f723c1e1b 100644 --- a/sddm-theme/theme.conf.cmake +++ b/sddm-theme/theme.conf.cmake -@@ -2,4 +2,4 @@ +@@ -4,5 +4,5 @@ logo=${KDE_INSTALL_FULL_DATADIR}/sddm/themes/breeze/default-logo.svg type=image color=#1d99f3 fontSize=10 --background=${CMAKE_INSTALL_PREFIX}/${WALLPAPER_INSTALL_DIR}/Next/contents/images/5120x2880.png -+background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.png +-background=${KDE_INSTALL_FULL_WALLPAPERDIR}/Next/contents/images/5120x2880.jpg ++background=${NIXPKGS_BREEZE_WALLPAPERS}/Next/contents/images/5120x2880.jpg + needsFullUserModel=false -- -2.23.1 +2.25.1 diff --git a/pkgs/desktops/plasma-5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5/plasma-workspace/default.nix index 6aa0e3b5738..2c4287f8edf 100644 --- a/pkgs/desktops/plasma-5/plasma-workspace/default.nix +++ b/pkgs/desktops/plasma-5/plasma-workspace/default.nix @@ -11,7 +11,8 @@ kinit, kjsembed, knewstuff, knotifyconfig, kpackage, kpeople, krunner, kscreenlocker, ktexteditor, ktextwidgets, kwallet, kwayland, kwin, kxmlrpcclient, libkscreen, libksysguard, libqalculate, networkmanager-qt, - phonon, plasma-framework, prison, solid, kholidays, + phonon, plasma-framework, prison, solid, kholidays, kquickcharts, + appstream-qt, qtgraphicaleffects, qtquickcontrols, qtquickcontrols2, qtscript, qttools, qtwayland, qtx11extras, @@ -31,7 +32,7 @@ mkDerivation { knotifyconfig kpackage kpeople krunner kscreenlocker ktexteditor ktextwidgets kwallet kwayland kwin kxmlrpcclient libkscreen libksysguard libqalculate networkmanager-qt phonon plasma-framework prison solid - kholidays + kholidays kquickcharts appstream-qt qtgraphicaleffects qtquickcontrols qtquickcontrols2 qtscript qtwayland qtx11extras ]; @@ -47,7 +48,6 @@ mkDerivation { ./0002-absolute-wallpaper-install-dir.patch ]; - NIX_CFLAGS_COMPILE = [ ''-DNIXPKGS_XMESSAGE="${getBin xmessage}/bin/xmessage"'' ''-DNIXPKGS_XRDB="${getBin xrdb}/bin/xrdb"'' diff --git a/pkgs/desktops/plasma-5/powerdevil.nix b/pkgs/desktops/plasma-5/powerdevil.nix index e6b2c472bc8..979d69a02f6 100644 --- a/pkgs/desktops/plasma-5/powerdevil.nix +++ b/pkgs/desktops/plasma-5/powerdevil.nix @@ -21,11 +21,16 @@ mkDerivation { patches = [ # This fixes an issue where 'DDCA_Feature_List*' cannot be converted to # 'DDCA_Feature_List'. - # This can be dropped with the next release. # https://bugs.kde.org/show_bug.cgi?id=423605 (fetchpatch { url = "https://invent.kde.org/plasma/powerdevil/-/commit/fcb26be2fb279e6ad3b7b814d26a5921d16201eb.patch"; sha256 = "0gdyaa0nd1c1d6x2h0m933lascm8zm5sikd99wxmkf7hhaby6k2s"; }) + + # Reduce log message spam by setting the default log level to Warning. + (fetchpatch { + url = "https://invent.kde.org/plasma/powerdevil/-/commit/c7590f9065ec9547b7fabad77a548bbc0c693113.patch"; + sha256 = "077whhi0jrb3bajx357k7n66hv7nchis8jix0nfc1zjvi9fm6pi2"; + }) ]; } diff --git a/pkgs/desktops/plasma-5/srcs.nix b/pkgs/desktops/plasma-5/srcs.nix index fe78f210c17..6f9214ccd60 100644 --- a/pkgs/desktops/plasma-5/srcs.nix +++ b/pkgs/desktops/plasma-5/srcs.nix @@ -1,374 +1,390 @@ # DO NOT EDIT! This file is generated automatically. -# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5/ +# Command: ./maintainers/scripts/fetch-kde-qt.sh pkgs/desktops/plasma-5 { fetchurl, mirror }: { bluedevil = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/bluedevil-5.17.5.tar.xz"; - sha256 = "22e9c683dfc56a559e652809ade238f8eb0ffb09d5ab042f5cd4b8216f647c09"; - name = "bluedevil-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/bluedevil-5.18.5.tar.xz"; + sha256 = "5350efbaee01c78fd451e96bb2aceb7986d45ab05500476d1e95c4e79ec89a66"; + name = "bluedevil-5.18.5.tar.xz"; }; }; breeze = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/breeze-5.17.5.tar.xz"; - sha256 = "f89bf857321b18789089efc9271d7bd7b6459a173dd078dd03242775db76c8d7"; - name = "breeze-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/breeze-5.18.5.tar.xz"; + sha256 = "1d08dfd24df4a4fcacad1e3759e559e82f6014ba63dc75dc32a24de6cd133563"; + name = "breeze-5.18.5.tar.xz"; }; }; breeze-grub = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/breeze-grub-5.17.5.tar.xz"; - sha256 = "591a1d7a510c76a1f2729a61a4d14c0f33db4d1e8ea5dbc87b74f2e7e7e2a2ba"; - name = "breeze-grub-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/breeze-grub-5.18.5.tar.xz"; + sha256 = "24c40171601b82d1c7d01eb85d16718a2f46cf23ee792f5524ac89fda3d278b1"; + name = "breeze-grub-5.18.5.tar.xz"; }; }; breeze-gtk = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/breeze-gtk-5.17.5.tar.xz"; - sha256 = "6dbd8e7d936840fbaf7016574d07729c9d0791711ad6d371136585ddb8f76e66"; - name = "breeze-gtk-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/breeze-gtk-5.18.5.tar.xz"; + sha256 = "41c7e83a28c033903d4fcab3da28a4c74ddb72958e66693a2d2e451f716cb7e9"; + name = "breeze-gtk-5.18.5.tar.xz"; }; }; breeze-plymouth = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/breeze-plymouth-5.17.5.tar.xz"; - sha256 = "e95f9eaf04e74383f5e1abe74d999787e408be7a34fd07a4f64e253e35150af0"; - name = "breeze-plymouth-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/breeze-plymouth-5.18.5.tar.xz"; + sha256 = "c0d48dc5a02f3236ff657f86ee8cf532cf885a0e8b36bfe79f007e4d5e277281"; + name = "breeze-plymouth-5.18.5.tar.xz"; }; }; discover = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/discover-5.17.5.tar.xz"; - sha256 = "986ef367aef59c5a956d4163f987a60cfd3674a300880376ddedc0222769789f"; - name = "discover-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/discover-5.18.5.tar.xz"; + sha256 = "d5ce4f4668c50ba9be37e04227db4bbe469e00470c87907f1e217fdcad6e76b6"; + name = "discover-5.18.5.tar.xz"; }; }; drkonqi = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/drkonqi-5.17.5.tar.xz"; - sha256 = "756c50f2458a8c564e608ea97244f6b2b3d5fb4a675a8cec29307be1d5ab5457"; - name = "drkonqi-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/drkonqi-5.18.5.tar.xz"; + sha256 = "b1a626c4ed2f9de8f8bc3359d8827e7fa6ac17486b8477674e47627fcf6efad1"; + name = "drkonqi-5.18.5.tar.xz"; }; }; kactivitymanagerd = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kactivitymanagerd-5.17.5.tar.xz"; - sha256 = "362721c3a9712751fba29cd1f1ef440a1e74561a611f2d171692a4ddc895b3e4"; - name = "kactivitymanagerd-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kactivitymanagerd-5.18.5.tar.xz"; + sha256 = "24f32eb4585d427ee62e08a9fa2f057353085c62644d6bec8fb4b2568e507ac7"; + name = "kactivitymanagerd-5.18.5.tar.xz"; }; }; kde-cli-tools = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kde-cli-tools-5.17.5.tar.xz"; - sha256 = "d14299ebeaf89854cb89435cfaaa4da1d84bf23a97df23ff8c7f95dae5bec55f"; - name = "kde-cli-tools-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kde-cli-tools-5.18.5.tar.xz"; + sha256 = "e3981d1a17111f4e284b787a6e841d7ff47f4fdbca0ad17e105c0a047e5aaaa8"; + name = "kde-cli-tools-5.18.5.tar.xz"; }; }; kdecoration = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kdecoration-5.17.5.tar.xz"; - sha256 = "7d8f0128306d436aeba010e47a3dddbcb9fb9fd05ef9308cbad1934914875cd9"; - name = "kdecoration-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kdecoration-5.18.5.tar.xz"; + sha256 = "f09856245f2cb08d9013da4c3128b5438f1e2f58af40031eb547ae765f57a9c8"; + name = "kdecoration-5.18.5.tar.xz"; }; }; kde-gtk-config = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kde-gtk-config-5.17.5.tar.xz"; - sha256 = "5feff23c756f1fb0ba9ab88c2aed92c0e7c5521c757f5a0cdd057273538f0010"; - name = "kde-gtk-config-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kde-gtk-config-5.18.5.tar.xz"; + sha256 = "9d7b1fd8b61f9f99c5a5721ea0227c4562588834a4886d66637f4c092f0e53ab"; + name = "kde-gtk-config-5.18.5.tar.xz"; }; }; kdeplasma-addons = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kdeplasma-addons-5.17.5.tar.xz"; - sha256 = "997d6a3542ab1f1fd7fb17580693dc8281ff29b03c82577dbae3fc1ec4cccdb8"; - name = "kdeplasma-addons-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kdeplasma-addons-5.18.5.tar.xz"; + sha256 = "1d135a32a7442f79dba4cb4e23221cd2ad1aad36b54fb12bfa91918daf3ff53f"; + name = "kdeplasma-addons-5.18.5.tar.xz"; }; }; kgamma5 = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kgamma5-5.17.5.tar.xz"; - sha256 = "3b8fd1539d035d4d39dcde6ca0dd214e6653c98778ac79b9cbf2f7009b155ca9"; - name = "kgamma5-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kgamma5-5.18.5.tar.xz"; + sha256 = "3aa89e361646214fb4910409644b941c83a85505d3d8a1d37984598d3e54269f"; + name = "kgamma5-5.18.5.tar.xz"; }; }; khotkeys = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/khotkeys-5.17.5.tar.xz"; - sha256 = "cf78b5bfb8568fb4eea592b209bdb79aeac92bd08a580c3b6c08d45dd34a2d56"; - name = "khotkeys-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/khotkeys-5.18.5.tar.xz"; + sha256 = "8f02fdf3bbecdc31c305c276fe2b3b2eca6dc10195e65c723ee9148fed81e766"; + name = "khotkeys-5.18.5.tar.xz"; }; }; kinfocenter = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kinfocenter-5.17.5.tar.xz"; - sha256 = "679870f10ee6494136d87a897a57a23c2905054d7a83ff11a4e85c204eb9fd9a"; - name = "kinfocenter-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kinfocenter-5.18.5.tar.xz"; + sha256 = "a9679bce4cd2d64e6f471c89de6da410237263b02512768f3acd0a4932b12ec5"; + name = "kinfocenter-5.18.5.tar.xz"; }; }; kmenuedit = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kmenuedit-5.17.5.tar.xz"; - sha256 = "59beed03298cd9fd6b05d67844794ed6a77be0d1b25b55d5bbcdf72e15e357de"; - name = "kmenuedit-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kmenuedit-5.18.5.tar.xz"; + sha256 = "59d998972121662d2835d43ff5be36eca7bf62e66e39fd67b7005e8ef8afd5f6"; + name = "kmenuedit-5.18.5.tar.xz"; }; }; kscreen = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kscreen-5.17.5.tar.xz"; - sha256 = "de8a00b33d0254245a53a5c097347aa86709d415754b3e3c675eef8fb4fe5bc0"; - name = "kscreen-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kscreen-5.18.5.tar.xz"; + sha256 = "9b6238447a4a38babdff482724ae3d33786b211e8b4224aaadafaad7435f6ba2"; + name = "kscreen-5.18.5.tar.xz"; }; }; kscreenlocker = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kscreenlocker-5.17.5.tar.xz"; - sha256 = "078cfaa9f117a985f5c71152bdf4a9f5cb65ef23c0090cfaaccc9539770f138f"; - name = "kscreenlocker-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kscreenlocker-5.18.5.tar.xz"; + sha256 = "b4269cd027e1fee721760a22ca5d738d3d98622fa222fcf9e57d2da77a4e18d2"; + name = "kscreenlocker-5.18.5.tar.xz"; }; }; ksshaskpass = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/ksshaskpass-5.17.5.tar.xz"; - sha256 = "b09e0d780340fc5a6a65e67a30d08a3f117f31e2dbfbb35579aa4cefb15c3b27"; - name = "ksshaskpass-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/ksshaskpass-5.18.5.tar.xz"; + sha256 = "c483c17d6ce2e3dffd54fc812f97b88c32f5def6e8c5e7a526e23f5e7f208cc5"; + name = "ksshaskpass-5.18.5.tar.xz"; }; }; ksysguard = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/ksysguard-5.17.5.tar.xz"; - sha256 = "69bc12311dcf363b168a259139d30456ed395ec03b948bd35e992300c7e7bd82"; - name = "ksysguard-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/ksysguard-5.18.5.tar.xz"; + sha256 = "4acb352698b612a21a5eccf22042ab46265d50bbf3aa85844bbca762a64c9e2f"; + name = "ksysguard-5.18.5.tar.xz"; }; }; kwallet-pam = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kwallet-pam-5.17.5.tar.xz"; - sha256 = "c829c7a44408e58beb87c71f5c70bccd349d285c3fcefb16df98bf2f29357fe9"; - name = "kwallet-pam-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kwallet-pam-5.18.5.tar.xz"; + sha256 = "bc4fe3dde503645d6233c3932d3cf74a7f5bf7acefb96bd6dbd224c8919d841a"; + name = "kwallet-pam-5.18.5.tar.xz"; }; }; kwayland-integration = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kwayland-integration-5.17.5.tar.xz"; - sha256 = "818b4e14611e26f297ef60427d399edc458a44e113bc092390fa65ecababcedb"; - name = "kwayland-integration-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kwayland-integration-5.18.5.tar.xz"; + sha256 = "82d6943d79a9a2a9bce10623adb2c9af396a2dcf258a723bb349aafbde20e6d5"; + name = "kwayland-integration-5.18.5.tar.xz"; }; }; kwin = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kwin-5.17.5.tar.xz"; - sha256 = "8517adaf8270d783aea7b3886d86b5abed6a5ec2b5c78b632479597d956baadc"; - name = "kwin-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kwin-5.18.5.tar.xz"; + sha256 = "ca39c63fd740432e95490031fd9d5ac003da034582014fa41c2be2b89627ddf8"; + name = "kwin-5.18.5.tar.xz"; }; }; kwrited = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/kwrited-5.17.5.tar.xz"; - sha256 = "ca22b1fa3e657fa2e58bf0c9dc1ebff3be8c0e003750223e7a7c5932d5b90823"; - name = "kwrited-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/kwrited-5.18.5.tar.xz"; + sha256 = "45ffa31d3d141ce453fb09fd823d7edd8e6c782b353bce22b8c879ad794fd1fe"; + name = "kwrited-5.18.5.tar.xz"; }; }; libkscreen = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/libkscreen-5.17.5.tar.xz"; - sha256 = "aa186e5751287701daec4d036aba776a911e4b84ca7eea44dc5fb531875afd94"; - name = "libkscreen-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/libkscreen-5.18.5.tar.xz"; + sha256 = "a962319000324200ec1abe3c58b1b8ab71ed4cc7c88a3c7e03a1c8eca86c287c"; + name = "libkscreen-5.18.5.tar.xz"; }; }; libksysguard = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/libksysguard-5.17.5.tar.xz"; - sha256 = "f5d237af554d65740a28360e6d8fa39d4912239c5f21288846b1c934897a7e14"; - name = "libksysguard-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/libksysguard-5.18.5.tar.xz"; + sha256 = "d4d7030a2869a546a211844aa158dcef3598386cc035a8655529938ba102440b"; + name = "libksysguard-5.18.5.tar.xz"; }; }; milou = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/milou-5.17.5.tar.xz"; - sha256 = "b89796e34cc8b6d6d4196169e814249f7b75c1c15763e0b4c1da5c97ccc2c8cf"; - name = "milou-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/milou-5.18.5.tar.xz"; + sha256 = "7ec763833c025aa719d1e25f3c5c1c8b6c934a48bf346517e94660e09d8582b2"; + name = "milou-5.18.5.tar.xz"; }; }; oxygen = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/oxygen-5.17.5.tar.xz"; - sha256 = "58954374a4b9067365ee5d50b32b1986b2e7dd31e73cbf79fda8d978949943be"; - name = "oxygen-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/oxygen-5.18.5.tar.xz"; + sha256 = "479bdfa80b3f2216075470ab4be1e3159a17620870acf276144b9639134609f8"; + name = "oxygen-5.18.5.tar.xz"; }; }; plasma-browser-integration = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-browser-integration-5.17.5.tar.xz"; - sha256 = "07bc4285991ab43830873a12b8c07f60e4faea1ec81121db783c425f18a4f87d"; - name = "plasma-browser-integration-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-browser-integration-5.18.5.tar.xz"; + sha256 = "3a087a836657b5304e2e0ef9ebefb84ce1f896bfbfc5dbf948d4b3eb7b709383"; + name = "plasma-browser-integration-5.18.5.tar.xz"; }; }; plasma-desktop = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-desktop-5.17.5.tar.xz"; - sha256 = "7f741ab026989bdcc68701955fc290d5ead38bf4bc310f18a2f32c64b411ab04"; - name = "plasma-desktop-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-desktop-5.18.5.tar.xz"; + sha256 = "aeb106018fd90da79c8a3c444d880282846a842029b1223e7830db2d4b42df9f"; + name = "plasma-desktop-5.18.5.tar.xz"; }; }; plasma-integration = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-integration-5.17.5.tar.xz"; - sha256 = "169206bebd790d2fee49cec621c46f6f64a8e20ee3e56bf16ee7373f61cad959"; - name = "plasma-integration-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-integration-5.18.5.tar.xz"; + sha256 = "c99b987efb2ab965cc2a55793ef94c7ccb2152ca5d75956a40ec99261ad4b870"; + name = "plasma-integration-5.18.5.tar.xz"; + }; + }; + plasma-nano = { + version = "5.18.5"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.18.5/plasma-nano-5.18.5.tar.xz"; + sha256 = "d2f29b05894573517cb3336088e102d3604b1c2735e9bbe605119f559f0c6341"; + name = "plasma-nano-5.18.5.tar.xz"; }; }; plasma-nm = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-nm-5.17.5.tar.xz"; - sha256 = "2165e47a0654d17735abc97aec287b46b52a2eafccc3591b667ea2755b731255"; - name = "plasma-nm-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-nm-5.18.5.tar.xz"; + sha256 = "1e091d01993708220f89501bb8a289279bf527d0593fd9e4b9223e6e8caf9aaa"; + name = "plasma-nm-5.18.5.tar.xz"; }; }; plasma-pa = { - version = "5.17.5"; + version = "5.18.5"; + src = fetchurl { + url = "${mirror}/stable/plasma/5.18.5/plasma-pa-5.18.5.tar.xz"; + sha256 = "28765c07f584e7688a85c9761155e606440936de2ebb678917dac2c85f5d0209"; + name = "plasma-pa-5.18.5.tar.xz"; + }; + }; + plasma-phone-components = { + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-pa-5.17.5.tar.xz"; - sha256 = "933c6ab1fda52b336a157a48b1ea64b81fd1d84ca08a40a52bfae276cca2bf23"; - name = "plasma-pa-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-phone-components-5.18.5.tar.xz"; + sha256 = "d0c091367ae07c71457a0c03d1023ac48d8665385a6a1b0e32f6ae7ad1fa7070"; + name = "plasma-phone-components-5.18.5.tar.xz"; }; }; plasma-sdk = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-sdk-5.17.5.tar.xz"; - sha256 = "ff736029b1ae5773991db06f5827d9dcbd8e7a4e9a430c9014c35ddee2c55314"; - name = "plasma-sdk-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-sdk-5.18.5.tar.xz"; + sha256 = "5f399231d16d62f9880f953891477f74e0b1f7b931448a4b0fbb97f37acd2fe5"; + name = "plasma-sdk-5.18.5.tar.xz"; }; }; plasma-tests = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-tests-5.17.5.tar.xz"; - sha256 = "1b566b7118a5c8d1b25078d331a6bc77f48781010fbd3425d85b137811218982"; - name = "plasma-tests-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-tests-5.18.5.tar.xz"; + sha256 = "3251ea30cb3c62de9bba2deb152370ea9e0e56b7506efd655888f1892c18413a"; + name = "plasma-tests-5.18.5.tar.xz"; }; }; plasma-thunderbolt = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-thunderbolt-5.17.5.tar.xz"; - sha256 = "3743f9841d269d51f1b1419e24d5cd1b26a0ba5a90e76b531328a8cc43184382"; - name = "plasma-thunderbolt-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-thunderbolt-5.18.5.tar.xz"; + sha256 = "c61dc7abe350ead15ca4d6111606aaf19773c38a0307ae8a7d8a7c60b82be5d1"; + name = "plasma-thunderbolt-5.18.5.tar.xz"; }; }; plasma-vault = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-vault-5.17.5.tar.xz"; - sha256 = "3e5c6b4dd6c1122b6a221205da506881959ab905e467b74b0536e7f5fe130d71"; - name = "plasma-vault-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-vault-5.18.5.tar.xz"; + sha256 = "cae2713823e8c59c7a2beb96d362a15024fe260cf10419ba037e8a798f3c1b41"; + name = "plasma-vault-5.18.5.tar.xz"; }; }; plasma-workspace = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-5.17.5.tar.xz"; - sha256 = "764488e66d52bc3017efb2c1471f57196aa50fbfa3a80637bf48f24955cfba88"; - name = "plasma-workspace-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-5.18.5.tar.xz"; + sha256 = "14e82033be745f4db46a70d319e2c86012295ea31056092bc974004189b92354"; + name = "plasma-workspace-5.18.5.tar.xz"; }; }; plasma-workspace-wallpapers = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plasma-workspace-wallpapers-5.17.5.tar.xz"; - sha256 = "8a28ef67b65c340d40ff8f5bfc333ead68e6d8c9e410769c43af847ced9b4ca9"; - name = "plasma-workspace-wallpapers-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plasma-workspace-wallpapers-5.18.5.tar.xz"; + sha256 = "f8da3bd7b97a9944639ed0860303b8a7a008905246313e1983367810a3a84d6d"; + name = "plasma-workspace-wallpapers-5.18.5.tar.xz"; }; }; plymouth-kcm = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/plymouth-kcm-5.17.5.tar.xz"; - sha256 = "bbd6994f60ed9d63b4e4dd0abe78bf1f9c14b8ecce8ba4355d16cd52a0a86528"; - name = "plymouth-kcm-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/plymouth-kcm-5.18.5.tar.xz"; + sha256 = "e8f75dd8c8a45cd706a0a6e62826d1eb4fff9c3912cbaadba8c06e9de915d2e3"; + name = "plymouth-kcm-5.18.5.tar.xz"; }; }; polkit-kde-agent = { - version = "1-5.17.5"; + version = "1-5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/polkit-kde-agent-1-5.17.5.tar.xz"; - sha256 = "a79d76a2f584f6567639228fde6f75b3960484f7a65cfc69b6acb6df1de53f5d"; - name = "polkit-kde-agent-1-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/polkit-kde-agent-1-5.18.5.tar.xz"; + sha256 = "5e1733cb51c826c6215da4fbbc9c9568240275cf86b9922cd7a643d192a75a91"; + name = "polkit-kde-agent-1-5.18.5.tar.xz"; }; }; powerdevil = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/powerdevil-5.17.5.tar.xz"; - sha256 = "27904361e85e1267d933d8f0a0d3be4dc712099ed2eb3cf90959209a4443dd82"; - name = "powerdevil-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/powerdevil-5.18.5.tar.xz"; + sha256 = "e000185ee61bff81fe28896a7d6353746c82c7f4d2626792fd22d34b5f49f548"; + name = "powerdevil-5.18.5.tar.xz"; }; }; sddm-kcm = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/sddm-kcm-5.17.5.tar.xz"; - sha256 = "e85fb9e014439e8c0e73638112139561aff9a9f71f26c3eafedff5a98a07b33b"; - name = "sddm-kcm-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/sddm-kcm-5.18.5.tar.xz"; + sha256 = "cc99c185d701acc7442f33ef17b2396894dcf164f3f583c25105ac3f2528c33b"; + name = "sddm-kcm-5.18.5.tar.xz"; }; }; systemsettings = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/systemsettings-5.17.5.tar.xz"; - sha256 = "50fa4d7866639995a6859446fc6a02a73ae05203e8f2ed31221e232ed3491eaf"; - name = "systemsettings-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/systemsettings-5.18.5.tar.xz"; + sha256 = "cde5b714261aaa54f937887657c3d3e74814c5447448b989159ee6035be4783b"; + name = "systemsettings-5.18.5.tar.xz"; }; }; user-manager = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/user-manager-5.17.5.tar.xz"; - sha256 = "10ed3196063c7dfed3b3f25dd199a48ca39fa86db5d0126ec84a543b1c212f0d"; - name = "user-manager-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/user-manager-5.18.5.tar.xz"; + sha256 = "741d293947fa3fb3966f047bab121597bf1071be010684daff4a91626cf54484"; + name = "user-manager-5.18.5.tar.xz"; }; }; xdg-desktop-portal-kde = { - version = "5.17.5"; + version = "5.18.5"; src = fetchurl { - url = "${mirror}/stable/plasma/5.17.5/xdg-desktop-portal-kde-5.17.5.tar.xz"; - sha256 = "a993bd4b86a44c8237a3f4957c2594aa2ca8916204ad866f8af32f7df34740f6"; - name = "xdg-desktop-portal-kde-5.17.5.tar.xz"; + url = "${mirror}/stable/plasma/5.18.5/xdg-desktop-portal-kde-5.18.5.tar.xz"; + sha256 = "807452708a0318b8e21b43f9ec7e016d1de51cac5d8714d70c577bb6f3976224"; + name = "xdg-desktop-portal-kde-5.18.5.tar.xz"; }; }; } diff --git a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix index 1e04eb1e2b0..c03c6a89161 100644 --- a/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix +++ b/pkgs/desktops/plasma-5/xdg-desktop-portal-kde.nix @@ -1,15 +1,18 @@ { mkDerivation, extra-cmake-modules, gettext, kdoctools, python, + cups, epoxy, mesa, pcre, pipewire, kcoreaddons, knotifications, kwayland, kwidgetsaddons, kwindowsystem, - cups, pcre, pipewire, kio + kirigami2, kdeclarative, plasma-framework, kio }: mkDerivation { name = "xdg-desktop-portal-kde"; nativeBuildInputs = [ extra-cmake-modules gettext kdoctools python ]; buildInputs = [ - cups pcre pipewire kio - kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem + cups epoxy mesa pcre pipewire + + kio kcoreaddons knotifications kwayland kwidgetsaddons kwindowsystem + kirigami2 kdeclarative plasma-framework ]; } diff --git a/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix b/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix deleted file mode 100644 index aec898161ff..00000000000 --- a/pkgs/desktops/xfce/applications/xfce4-volumed/default.nix +++ /dev/null @@ -1,52 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, makeWrapper -, gstreamer, gtk2, gst-plugins-base, libnotify -, keybinder, xfconf, xfce -}: - -let - category = "apps"; - - # The usual Gstreamer plugins package has a zillion dependencies - # that we don't need for a simple mixer, so build a minimal package. - gst_plugins_minimal = gst-plugins-base.override { - minimalDeps = true; - }; - -in - -stdenv.mkDerivation rec { - pname = "xfce4-volumed"; - version = "0.1.13"; - - src = fetchurl { - url = "mirror://xfce/src/${category}/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.bz2"; - sha256 = "1aa0a1sbf9yzi7bc78kw044m0xzg1li3y4w9kf20wqv5kfjs7v2c"; - }; - - buildInputs = - [ gstreamer gst_plugins_minimal gtk2 - keybinder xfconf libnotify - ]; - - nativeBuildInputs = [ pkgconfig makeWrapper ]; - - postInstall = - '' - wrapProgram "$out/bin/xfce4-volumed" \ - --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" - ''; - - passthru.updateScript = xfce.updateScript { - inherit pname version; - attrPath = "xfce.${pname}"; - versionLister = xfce.archiveLister category pname; - }; - - meta = with stdenv.lib; { - homepage = "https://www.xfce.org/projects/xfce4-volumed"; # referenced but inactive - description = "A volume keys control daemon for the Xfce desktop environment"; - license = licenses.gpl3; - platforms = platforms.linux; - maintainers = [ maintainers.abbradar ]; - }; -} diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix index 579e863bf9c..09df8d79dca 100644 --- a/pkgs/desktops/xfce/default.nix +++ b/pkgs/desktops/xfce/default.nix @@ -88,9 +88,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfdashboard = callPackage ./applications/xfdashboard {}; - # TODO: this repo is inactive for many years. Remove? - xfce4-volumed = callPackage ./applications/xfce4-volumed { }; - xfce4-volumed-pulse = callPackage ./applications/xfce4-volumed-pulse { }; xfce4-notifyd = callPackage ./applications/xfce4-notifyd { }; @@ -175,7 +172,6 @@ lib.makeScope pkgs.newScope (self: with self; { xfce4notifyd = xfce4-notifyd; xfce4taskmanager = xfce4-taskmanager; xfce4terminal = xfce4-terminal; - xfce4volumed = xfce4-volumed; xfce4volumed_pulse = xfce4-volumed-pulse; xfce4icontheme = xfce4-icon-theme; xfwm4themes = xfwm4-themes; diff --git a/pkgs/development/androidndk-pkgs/default.nix b/pkgs/development/androidndk-pkgs/default.nix index 7bb779d1d13..10819d49ed3 100644 --- a/pkgs/development/androidndk-pkgs/default.nix +++ b/pkgs/development/androidndk-pkgs/default.nix @@ -30,4 +30,34 @@ androidndk = androidComposition.ndk-bundle; targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b; }; + + "21" = + let + ndkVersion = "21.0.6113669"; + + buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + + androidComposition = androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + in + import ./androidndk-pkgs.nix { + inherit (buildPackages) + makeWrapper; + inherit (pkgs) + stdenv + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildAndroidComposition.ndk-bundle; + androidndk = androidComposition.ndk-bundle; + targetAndroidndkPkgs = targetPackages.androidndkPkgs_21; + }; + } diff --git a/pkgs/development/compilers/aspectj/default.nix b/pkgs/development/compilers/aspectj/default.nix index 94dc813d78a..8fd47e937c8 100644 --- a/pkgs/development/compilers/aspectj/default.nix +++ b/pkgs/development/compilers/aspectj/default.nix @@ -1,12 +1,15 @@ {stdenv, fetchurl, jre}: stdenv.mkDerivation rec { - name = "aspectj-1.5.2"; + pname = "aspectj"; + version = "1.9.6"; builder = ./builder.sh; - src = fetchurl { - url = "http://archive.eclipse.org/tools/aspectj/${name}.jar"; - sha256 = "1b3mx248dc1xka1vgsl0jj4sm0nfjsqdcj9r9036mvixj1zj3nmh"; + src = let + versionSnakeCase = builtins.replaceStrings ["."] ["_"] version; + in fetchurl { + url = "https://github.com/eclipse/org.aspectj/releases/download/V${versionSnakeCase}/aspectj-${version}.jar"; + sha256 = "02jh66l3vw57k9a4dxlga3qh3487r36gyi6k2z2mmqxbpqajslja"; }; inherit jre; diff --git a/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch b/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch deleted file mode 100644 index 79b053592a9..00000000000 --- a/pkgs/development/compilers/binaryen/0001-Get-rid-of-git-dependency.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1c6af6c68ba3f49ae9e942844c739e934339d3b9 Mon Sep 17 00:00:00 2001 -From: Maximilian Bosch <maximilian@mbosch.me> -Date: Sat, 14 Mar 2020 00:37:31 +0100 -Subject: [PATCH] Get rid of git dependency - ---- - CMakeLists.txt | 15 +-------------- - 1 file changed, 1 insertion(+), 14 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4acf703e1..4e9bd60b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,20 +7,7 @@ IF(NOT CMAKE_BUILD_TYPE) - SET(CMAKE_BUILD_TYPE "Release") - ENDIF() - --FIND_PACKAGE(Git QUIET REQUIRED) --EXECUTE_PROCESS(COMMAND -- "${GIT_EXECUTABLE}" --git-dir=${CMAKE_CURRENT_SOURCE_DIR}/.git describe --tags -- RESULT_VARIABLE -- GIT_HASH_RESULT -- OUTPUT_VARIABLE -- GIT_HASH -- OUTPUT_STRIP_TRAILING_WHITESPACE) --IF(${GIT_HASH_RESULT}) -- MESSAGE(WARNING "Error running git describe to determine version") -- SET(BINARYEN_VERSION_INFO "(unable to determine version)") --ELSE() -- SET(BINARYEN_VERSION_INFO "${GIT_HASH}") --ENDIF() -+SET(BINARYEN_VERSION_INFO "@emscriptenv@") - CONFIGURE_FILE(config.h.in config.h) - - OPTION(BUILD_STATIC_LIB "Build as a static library" OFF) --- -2.25.0 - diff --git a/pkgs/development/compilers/binaryen/default.nix b/pkgs/development/compilers/binaryen/default.nix index e9dc939b5ed..6de4e0fb304 100644 --- a/pkgs/development/compilers/binaryen/default.nix +++ b/pkgs/development/compilers/binaryen/default.nix @@ -1,38 +1,23 @@ -{ stdenv, cmake, python3, fetchFromGitHub, emscriptenRev ? null, substituteAll }: - -let - defaultVersion = "95"; - - # Map from git revs to SHA256 hashes - sha256s = { - version_95 = "1w4js9bm5qv5aws8bzz4f0n3ni2l7h4fidkq9v5bldf0zxncy8m3"; - "1.39.1" = "0ygm9m5322h4vfpf3j63q32qxk2l26yk62hh7dkb49j51zwl1y3y"; - }; -in +{ stdenv, cmake, python3, fetchFromGitHub, fetchpatch, emscripten }: stdenv.mkDerivation rec { - version = if emscriptenRev == null - then defaultVersion - else "emscripten-${emscriptenRev}"; - rev = if emscriptenRev == null - then "version_${version}" - else emscriptenRev; pname = "binaryen"; + version = "96"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; - sha256 = - if builtins.hasAttr rev sha256s - then builtins.getAttr rev sha256s - else null; - inherit rev; + rev = "version_${version}"; + sha256 = "1mqpb6yy87aifpbcy0lczi3bp6kddrwi6d0g6lrhjrdxx2kvbdag"; }; - patches = stdenv.lib.optional (emscriptenRev != null) (substituteAll { - src = ./0001-Get-rid-of-git-dependency.patch; - emscriptenv = "1.39.1"; - }); + patches = [ + # Adds --minimize-wasm-changes option required by emscripten 2.0.1 + (fetchpatch { + url = "https://patch-diff.githubusercontent.com/raw/WebAssembly/binaryen/pull/3044.patch"; + sha256 = "1hdbc9h9zhh2d3bl4sqv6v9psfmny715612bwpjdln0ibdvc129s"; + }) + ]; nativeBuildInputs = [ cmake python3 ]; @@ -43,4 +28,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ asppsa ]; license = licenses.asl20; }; + + passthru.tests = { + inherit emscripten; + }; } diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix index 2ee1223a53b..7c0d42f1864 100644 --- a/pkgs/development/compilers/closure/default.nix +++ b/pkgs/development/compilers/closure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "closure-compiler"; - version = "20200614"; + version = "20200719"; src = fetchurl { url = "https://dl.google.com/closure-compiler/compiler-${version}.tar.gz"; - sha256 = "0a54y2d9nfg60knfv34kf6sdsh065dzam86l3wprf8gvqffxxcli"; + sha256 = "18095i98mk5kc1vpaf6gvmvhiyl2x4zrcwd7ix5l98jydldiz7wx"; }; sourceRoot = "."; diff --git a/pkgs/development/compilers/copper/default.nix b/pkgs/development/compilers/copper/default.nix new file mode 100644 index 00000000000..4d24c78f25f --- /dev/null +++ b/pkgs/development/compilers/copper/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, libffi +}: +stdenv.mkDerivation rec { + pname = "copper"; + version = "4.4"; + src = fetchurl { + url = "https://tibleiz.net/download/copper-${version}-src.tar.gz"; + sha256 = "1nf0bw143rjhd019yms3k6k531rahl8anidwh6bif0gm7cngfwfw"; + }; + buildInputs = [ + libffi + ]; + postPatch = '' + substituteInPlace Makefile --replace "-s scripts/" "scripts/" + patchShebangs . + ''; + buildPhase = '' + make BACKEND=elf64 boot-elf64 + make BACKEND=elf64 COPPER=stage3/copper-elf64 copper-elf64 + ''; + installPhase = '' + make BACKEND=elf64 install prefix=$out + ''; + meta = with stdenv.lib; { + description = "Simple imperative language, statically typed with type inference and genericity."; + homepage = "https://tibleiz.net/copper/"; + license = licenses.bsd2; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 2e93c0b661b..7346b73f53c 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -95,12 +95,33 @@ stdenv.mkDerivation rec { cd .. done ''} - ${lib.optionalString (lib.versionAtLeast version "10.1") '' + ${lib.optionalString (lib.versionAtLeast version "10.1" && lib.versionOlder version "11") '' cd pkg/builds/cuda-toolkit mv * $out/ ''} + ${lib.optionalString (lib.versionAtLeast version "11") '' + mkdir -p $out/bin $out/lib64 $out/include $out/doc + for dir in pkg/builds/* pkg/builds/cuda_nvcc/nvvm pkg/builds/cuda_cupti/extras/CUPTI; do + if [ -d $dir/bin ]; then + mv $dir/bin/* $out/bin + fi + if [ -d $dir/doc ]; then + (cd $dir/doc && find . -type d -exec mkdir -p $out/doc/\{} \;) + (cd $dir/doc && find . \( -type f -o -type l \) -exec mv \{} $out/doc/\{} \;) + fi + if [ -L $dir/include ] || [ -d $dir/include ]; then + (cd $dir/include && find . -type d -exec mkdir -p $out/include/\{} \;) + (cd $dir/include && find . \( -type f -o -type l \) -exec mv \{} $out/include/\{} \;) + fi + if [ -L $dir/lib64 ] || [ -d $dir/lib64 ]; then + (cd $dir/lib64 && find . -type d -exec mkdir -p $out/lib64/\{} \;) + (cd $dir/lib64 && find . \( -type f -o -type l \) -exec mv \{} $out/lib64/\{} \;) + fi + done + mv pkg/builds/cuda_nvcc/nvvm $out/nvvm + ''} - rm $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? + rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why? ${lib.optionalString (lib.versionOlder version "10.1") '' # let's remove the 32-bit libraries, they confuse the lib64->lib mover @@ -152,7 +173,7 @@ stdenv.mkDerivation rec { ''; postInstall = '' - for b in nvvp nsight; do + for b in nvvp ${lib.optionalString (lib.versionOlder version "11") "nsight"}; do wrapProgram "$out/bin/$b" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" done diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index c3b16293204..cd4af47a21e 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -4,6 +4,7 @@ , gcc48 , gcc6 , gcc7 +, gcc9 }: let @@ -136,4 +137,14 @@ in rec { }; cudatoolkit_10 = cudatoolkit_10_2; + + cudatoolkit_11_0 = common { + version = "11.0.3"; + url = "https://developer.download.nvidia.com/compute/cuda/11.0.3/local_installers/cuda_11.0.3_450.51.06_linux.run"; + sha256 = "1h4c69nfrgm09jzv8xjnjcvpq8n4gnlii17v3wzqry5d13jc8ydh"; + + gcc = gcc9; + }; + + cudatoolkit_11 = cudatoolkit_11_0; } diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index cd5142acce8..ac13f955930 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -1,63 +1,104 @@ -{ emscriptenVersion, stdenv, fetchFromGitHub, emscriptenfastcomp, python, nodejs, closurecompiler -, jre, binaryen, enableWasm ? true , cmake +{ stdenv, fetchFromGitHub, python3, nodejs, closurecompiler +, jre, binaryen +, llvmPackages_11 +, symlinkJoin, makeWrapper +, mkYarnModules }: -let - rev = emscriptenVersion; - appdir = "share/emscripten"; - binaryenVersioned = binaryen.override { emscriptenRev = rev; }; -in +stdenv.mkDerivation rec { + pname = "emscripten"; + version = "2.0.1"; -stdenv.mkDerivation { - name = "emscripten-${rev}"; + llvmEnv = symlinkJoin { + name = "emscripten-llvm-${version}"; + paths = with llvmPackages_11; [ clang-unwrapped lld llvm ]; + }; + + nodeModules = mkYarnModules { + name = "emscripten-node-modules-${version}"; + inherit pname version; + # it is vitally important the the package.json has name and version fields + packageJSON = ./package.json; + yarnLock = ./yarn.lock; + yarnNix = ./yarn.nix; + }; src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "1j3f0hpy05qskaiyv75l7wv4n0nzxhrh9b296zchx3f6f9h2rghq"; - inherit rev; + sha256 = "06dsd819qjv4n2ihrz1mpn5aigmbv0gpkm7iw06wrqx30nzphnpk"; + rev = version; }; - buildInputs = [ nodejs cmake python ]; + nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ nodejs python3 ]; + + buildPhase = '' + patchShebangs . - buildCommand = '' - mkdir -p $out/${appdir} - cp -r $src/* $out/${appdir} - chmod -R +w $out/${appdir} - grep -rl '^#!/usr.*python' $out/${appdir} | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@' - sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/${appdir}/config'," $out/${appdir}/tools/shared.py - sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/${appdir}/tools/shared.py - sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/${appdir}/tools/shared.py # fixes cmake support - sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" $out/${appdir}/emcc.py - mkdir $out/bin - ln -s $out/${appdir}/{em++,em-config,emar,embuilder.py,emcc,emcmake,emconfigure,emlink.py,emmake,emranlib,emrun,emscons} $out/bin - - echo "EMSCRIPTEN_ROOT = '$out/${appdir}'" > $out/${appdir}/config - echo "LLVM_ROOT = '${emscriptenfastcomp}/bin'" >> $out/${appdir}/config - echo "PYTHON = '${python}/bin/python'" >> $out/${appdir}/config - echo "NODE_JS = '${nodejs}/bin/node'" >> $out/${appdir}/config - echo "JS_ENGINES = [NODE_JS]" >> $out/${appdir}/config - echo "COMPILER_ENGINE = NODE_JS" >> $out/${appdir}/config - echo "CLOSURE_COMPILER = '${closurecompiler}/share/java/closure-compiler-v${closurecompiler.version}.jar'" >> $out/${appdir}/config - echo "JAVA = '${jre}/bin/java'" >> $out/${appdir}/config + sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py + + # disables cache in user home, use installation directory instead + sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py + sed -i "/^def check_sanity/a\\ return" tools/shared.py + + # required for wasm2c + ln -s ${nodeModules}/node_modules . + + echo "EMSCRIPTEN_ROOT = '$appdir'" > .emscripten + echo "LLVM_ROOT = '${llvmEnv}/bin'" >> .emscripten + echo "NODE_JS = '${nodejs}/bin/node'" >> .emscripten + echo "JS_ENGINES = [NODE_JS]" >> .emscripten + echo "CLOSURE_COMPILER = ['${closurecompiler}/bin/closure-compiler']" >> .emscripten + echo "JAVA = '${jre}/bin/java'" >> .emscripten # to make the test(s) below work - echo "SPIDERMONKEY_ENGINE = []" >> $out/${appdir}/config - '' - + stdenv.lib.optionalString enableWasm '' - echo "BINARYEN_ROOT = '${binaryenVersioned}'" >> $out/share/emscripten/config - '' - + - '' - echo "--------------- running test -----------------" - # quick hack to get the test working - HOME=$TMPDIR - cp $out/${appdir}/config $HOME/.emscripten - export PATH=$PATH:$out/bin - - #export EMCC_DEBUG=2 - ${python}/bin/python $src/tests/runner.py test_hello_world - echo "--------------- /running test -----------------" + # echo "SPIDERMONKEY_ENGINE = []" >> .emscripten + echo "BINARYEN_ROOT = '${binaryen}'" >> .emscripten + + # make emconfigure/emcmake use the correct (wrapped) binaries + sed -i "s|^EMCC =.*|EMCC='$out/bin/emcc'|" tools/shared.py + sed -i "s|^EMXX =.*|EMXX='$out/bin/em++'|" tools/shared.py + sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py + sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py + + # The tests use the C compiler to compile generated C code, + # use the wrapped compiler + sed -i 's/shared.CLANG_CC/"cc"/' tests/runner.py + ''; + + installPhase = '' + appdir=$out/share/emscripten + mkdir -p $appdir + cp -r . $appdir + chmod -R +w $appdir + + mkdir -p $out/bin + for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emlink.py emmake emranlib emrun emscons; do + makeWrapper $appdir/$b $out/bin/$b \ + --set NODE_PATH ${nodeModules}/node_modules \ + --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ + --set PYTHON ${python3}/bin/python + done + + # precompile libc (etc.) in all variants: + pushd $TMPDIR + echo 'int main() { return 42; }' >test.c + for LTO in -flto ""; do + # wasm2c doesn't work with PIC + $out/bin/emcc -s WASM2C -s STANDALONE_WASM $LTO test.c + + for RELOCATABLE in "" "-s RELOCATABLE"; do + $out/bin/emcc $RELOCATABLE $LTO test.c + done + done + popd + + export PYTHON=${python3}/bin/python + export NODE_PATH=${nodeModules}/node_modules + pushd $appdir + python tests/runner.py test_hello_world + popd ''; meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/emscripten/fastcomp/default.nix b/pkgs/development/compilers/emscripten/fastcomp/default.nix deleted file mode 100644 index 57496d28860..00000000000 --- a/pkgs/development/compilers/emscripten/fastcomp/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ newScope, stdenv, binutils, wrapCCWith, symlinkJoin }: -let - callPackage = newScope (self // {inherit stdenv;}); - - self = { - emscriptenfastcomp-unwrapped = callPackage ./emscripten-fastcomp.nix {}; - emscriptenfastcomp-wrapped = wrapCCWith { - cc = self.emscriptenfastcomp-unwrapped; - # Never want Apple's cctools for WASM target - bintools = binutils; - libc = stdenv.cc.libc; - extraBuildCommands = '' - # hardening flags break WASM support - cat > $out/nix-support/add-hardening.sh - ''; - }; - emscriptenfastcomp = symlinkJoin { - name = "emscriptenfastcomp-${stdenv.lib.getVersion self.emscriptenfastcomp-unwrapped}"; - paths = [ self.emscriptenfastcomp-wrapped self.emscriptenfastcomp-unwrapped ]; - preferLocalBuild = false; - allowSubstitutes = true; - postBuild = '' - # replace unwrapped clang-3.9 binary by wrapper - ln -sf $out/bin/clang $out/bin/clang-[0-9]* - ''; - }; - }; -in self diff --git a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix b/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix deleted file mode 100644 index f8f06e24f8b..00000000000 --- a/pkgs/development/compilers/emscripten/fastcomp/emscripten-fastcomp.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ emscriptenVersion, stdenv, fetchFromGitHub, cmake, python, gtest, gccForLibs, ... }: - -let - rev = emscriptenVersion; -in -stdenv.mkDerivation rec { - name = "emscripten-fastcomp-${rev}"; - - src = fetchFromGitHub { - owner = "emscripten-core"; - repo = "emscripten-fastcomp"; - sha256 = "0bd0l5k2fa4k0nax2cpxi003pqffqivx4z4m2j5xdha1a12sid8i"; - inherit rev; - }; - - srcFL = fetchFromGitHub { - owner = "emscripten-core"; - repo = "emscripten-fastcomp-clang"; - sha256 = "1iw2qplhp489qzw0rma73sab7asnm27g4m95sr36c6kq9cq6agri"; - inherit rev; - }; - - nativeBuildInputs = [ cmake python gtest ]; - preConfigure = '' - cp -Lr ${srcFL} tools/clang - chmod +w -R tools/clang - ''; - cmakeFlags = [ - "-DCMAKE_BUILD_TYPE=Release" - "-DLLVM_TARGETS_TO_BUILD='X86;JSBackend'" - "-DLLVM_INCLUDE_EXAMPLES=OFF" - "-DLLVM_INCLUDE_TESTS=ON" - #"-DLLVM_CONFIG=${llvm}/bin/llvm-config" - "-DLLVM_BUILD_TESTS=ON" - "-DCLANG_INCLUDE_TESTS=ON" - ] ++ (stdenv.lib.optional stdenv.isLinux - # necessary for clang to find crtend.o - "-DGCC_INSTALL_PREFIX=${gccForLibs}" - ); - enableParallelBuilding = true; - - passthru = { - isClang = true; - }; - - meta = with stdenv.lib; { - homepage = "https://github.com/emscripten-core/emscripten-fastcomp"; - description = "Emscripten LLVM"; - platforms = platforms.all; - maintainers = with maintainers; [ qknight matthewbauer ]; - license = stdenv.lib.licenses.ncsa; - }; -} diff --git a/pkgs/development/compilers/emscripten/package.json b/pkgs/development/compilers/emscripten/package.json new file mode 100644 index 00000000000..039d215efcd --- /dev/null +++ b/pkgs/development/compilers/emscripten/package.json @@ -0,0 +1,15 @@ +{ + "name": "emscripten", + "version": "2.0.1", + "private": true, + "devDependencies": { + "ws": "~0.4.28" + }, + "dependencies": { + "google-closure-compiler": "20200224.0.0", + "html-minifier-terser": "5.0.2", + "source-map": "0.5.6", + "wasm2c": "1.0.0", + "acorn": "7.3.1" + } +} diff --git a/pkgs/development/compilers/emscripten/yarn.lock b/pkgs/development/compilers/emscripten/yarn.lock new file mode 100644 index 00000000000..079b254a472 --- /dev/null +++ b/pkgs/development/compilers/emscripten/yarn.lock @@ -0,0 +1,346 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +acorn@7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" + integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== + +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" + +buffer-from@^1.0.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" + integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== + +camel-case@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" + integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= + dependencies: + no-case "^2.2.0" + upper-case "^1.1.1" + +chalk@2.x: + 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" + +clean-css@^4.2.1: + version "4.2.3" + resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" + integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== + dependencies: + source-map "~0.6.0" + +clone-buffer@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58" + integrity sha1-4+JbIHrE5wGvch4staFnksrD3Fg= + +clone-stats@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680" + integrity sha1-s3gt/4u1R04Yuba/D9/ngvh3doA= + +clone@^2.1.1: + version "2.1.2" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18= + +cloneable-readable@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz#120a00cb053bfb63a222e709f9683ea2e11d8cec" + integrity sha512-2EF8zTQOxYq70Y4XKtorQupqF0m49MBz2/yf5Bj+MHjvpG3Hy7sImifnqD6UA+TKYxeSV+u6qqQPawN5UvnpKQ== + dependencies: + inherits "^2.0.1" + process-nextick-args "^2.0.0" + readable-stream "^2.3.5" + +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-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= + +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@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" + integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== + +commander@~2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz#d121bbae860d9992a3d517ba96f56588e47c6781" + integrity sha1-0SG7roYNmZKj1Re6lvVliOR8Z4E= + +core-util-is@~1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" + integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= + +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= + +google-closure-compiler-java@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz#03d71aefd0a07010fd8a7057d09c76f6729767bc" + integrity sha512-palFcDoScauZjWIsGDzMK6h+IctcRb55I3wJX8Ko/DTSz72xwadRdKm0lGt8OoYL7SKEO+IjgD7s8XrAGpLnlQ== + +google-closure-compiler-js@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz#cf4b598abf7be686c683e530529756805b8af500" + integrity sha512-70VKN0kbnTRtu2dqxDjWZQGfEQIHj7b7oUUCsYPO5oEXCDfgxNc13oYUJXvrTONLRWlHCNl/I8FNrVOwZ3gY/g== + +google-closure-compiler-linux@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz#d9608b224b4d8f38d4d34e99a24da54bca6b1902" + integrity sha512-/BaE889EPrXWOKJVolA9++e99xBDMzeFBf7zF7nBB8PUmU5DlvtsoLL82xnT6nbZC1ktHaETlVx+vYGju8zKBQ== + +google-closure-compiler-osx@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz#aee62d8b878a662fc73b92419603168c0c3a35ed" + integrity sha512-WXVNW9nPUqjvCe38mUIlBGEPVPCTKLtdaXC+q+kQdonkJFHNrpdyYWa746Y8cNP/byQyDNpPsqcKseZTLh17sQ== + +google-closure-compiler-windows@^20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz#cae323b898625ca57b0e87aaddde021a414dda58" + integrity sha512-l6w2D8r9+GC9CQTAYEMAuNI996Zb6YV5qG7+FR0gCoL6h6S3Mc7mi87bafgwaicsVcmmHE/9kCBuW4ZyTMs5Fg== + +google-closure-compiler@20200224.0.0: + version "20200224.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz#ec0e708d9716a48e12fff43fe37fa5cec732a283" + integrity sha512-V81dRYygdHbZtOtU16VX26xAdJBB1UZyfSg3OTzdNl3l/xEIx1D/L7TYUqjeTXsxcy+JruJ/UfUlIJAOaMRTog== + dependencies: + chalk "2.x" + google-closure-compiler-java "^20200224.0.0" + google-closure-compiler-js "^20200224.0.0" + minimist "1.x" + vinyl "2.x" + vinyl-sourcemaps-apply "^0.2.0" + optionalDependencies: + google-closure-compiler-linux "^20200224.0.0" + google-closure-compiler-osx "^20200224.0.0" + google-closure-compiler-windows "^20200224.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= + +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== + +html-minifier-terser@5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz#0e67a0b062ae1dd0719fc73199479298f807ae16" + integrity sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ== + dependencies: + camel-case "^3.0.0" + clean-css "^4.2.1" + commander "^4.0.0" + he "^1.2.0" + param-case "^2.1.1" + relateurl "^0.2.7" + terser "^4.3.9" + +inherits@^2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +isarray@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" + integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= + +lower-case@^1.1.1: + version "1.1.4" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" + integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= + +minimist@1.x: + version "1.2.5" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" + integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + +nan@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38" + integrity sha1-riT4hQgY1mL8q1rPfzuVv6oszzg= + +no-case@^2.2.0: + version "2.3.2" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" + integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== + dependencies: + lower-case "^1.1.1" + +options@>=0.0.5: + version "0.0.6" + resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" + integrity sha1-7CLTEoBrtT5zF3Pnza788cZDEo8= + +param-case@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" + integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= + dependencies: + no-case "^2.2.0" + +process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" + integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== + +readable-stream@^2.3.5: + version "2.3.7" + resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" + integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== + dependencies: + core-util-is "~1.0.0" + inherits "~2.0.3" + isarray "~1.0.0" + process-nextick-args "~2.0.0" + safe-buffer "~5.1.1" + string_decoder "~1.1.1" + util-deprecate "~1.0.1" + +relateurl@^0.2.7: + version "0.2.7" + resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" + integrity sha1-VNvzd+UUQKypCkzSdGANP/LYiKk= + +remove-trailing-separator@^1.0.1: + version "1.1.0" + resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef" + integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8= + +replace-ext@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" + integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== + +safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== + +source-map-support@~0.5.12: + 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.5.6: + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" + integrity sha1-dc449SvwczxafwwRjYEzSiu19BI= + +source-map@^0.5.1: + version "0.5.7" + resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" + integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= + +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== + +string_decoder@~1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" + integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg== + dependencies: + safe-buffer "~5.1.0" + +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" + +terser@^4.3.9: + version "4.8.0" + resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" + integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== + dependencies: + commander "^2.20.0" + source-map "~0.6.1" + source-map-support "~0.5.12" + +tinycolor@0.x: + version "0.0.1" + resolved "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz#320b5a52d83abb5978d81a3e887d4aefb15a6164" + integrity sha1-MgtaUtg6u1l42Bo+iH1K77FaYWQ= + +upper-case@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" + integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= + +util-deprecate@~1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" + integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= + +vinyl-sourcemaps-apply@^0.2.0: + version "0.2.1" + resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" + integrity sha1-q2VJ1h0XLCsbh75cUI0jnI74dwU= + dependencies: + source-map "^0.5.1" + +vinyl@2.x: + version "2.2.0" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" + integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== + dependencies: + clone "^2.1.1" + clone-buffer "^1.0.0" + clone-stats "^1.0.0" + cloneable-readable "^1.0.0" + remove-trailing-separator "^1.0.1" + replace-ext "^1.0.0" + +wasm2c@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0" + integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA== + +ws@~0.4.28: + version "0.4.32" + resolved "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz#787a6154414f3c99ed83c5772153b20feb0cec32" + integrity sha1-eHphVEFPPJntg8V3IVOyD+sM7DI= + dependencies: + commander "~2.1.0" + nan "~1.0.0" + options ">=0.0.5" + tinycolor "0.x" diff --git a/pkgs/development/compilers/emscripten/yarn.nix b/pkgs/development/compilers/emscripten/yarn.nix new file mode 100644 index 00000000000..af01d9c6869 --- /dev/null +++ b/pkgs/development/compilers/emscripten/yarn.nix @@ -0,0 +1,437 @@ +{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec { + offline_cache = linkFarm "offline" packages; + packages = [ + { + name = "acorn___acorn_7.3.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz"; + sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"; + }; + } + { + 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 = "buffer_from___buffer_from_1.1.1.tgz"; + path = fetchurl { + name = "buffer_from___buffer_from_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz"; + sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; + }; + } + { + name = "camel_case___camel_case_3.0.0.tgz"; + path = fetchurl { + name = "camel_case___camel_case_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; + sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + }; + } + { + 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 = "clean_css___clean_css_4.2.3.tgz"; + path = fetchurl { + name = "clean_css___clean_css_4.2.3.tgz"; + url = "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz"; + sha1 = "507b5de7d97b48ee53d84adb0160ff6216380f78"; + }; + } + { + name = "clone_buffer___clone_buffer_1.0.0.tgz"; + path = fetchurl { + name = "clone_buffer___clone_buffer_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz"; + sha1 = "e3e25b207ac4e701af721e2cb5a16792cac3dc58"; + }; + } + { + name = "clone_stats___clone_stats_1.0.0.tgz"; + path = fetchurl { + name = "clone_stats___clone_stats_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz"; + sha1 = "b3782dff8bb5474e18b9b6bf0fdfe782f8777680"; + }; + } + { + name = "clone___clone_2.1.2.tgz"; + path = fetchurl { + name = "clone___clone_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz"; + sha1 = "1b7f4b9f591f1e8f83670401600345a02887435f"; + }; + } + { + name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; + path = fetchurl { + name = "cloneable_readable___cloneable_readable_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.1.3.tgz"; + sha1 = "120a00cb053bfb63a222e709f9683ea2e11d8cec"; + }; + } + { + 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_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 = "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_4.1.1.tgz"; + path = fetchurl { + name = "commander___commander_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz"; + sha1 = "9fd602bd936294e9e9ef46a3f4d6964044b18068"; + }; + } + { + name = "commander___commander_2.1.0.tgz"; + path = fetchurl { + name = "commander___commander_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-2.1.0.tgz"; + sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781"; + }; + } + { + name = "core_util_is___core_util_is_1.0.2.tgz"; + path = fetchurl { + name = "core_util_is___core_util_is_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz"; + sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + }; + } + { + 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 = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_java___google_closure_compiler_java_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200224.0.0.tgz"; + sha1 = "03d71aefd0a07010fd8a7057d09c76f6729767bc"; + }; + } + { + name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_js___google_closure_compiler_js_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-js/-/google-closure-compiler-js-20200224.0.0.tgz"; + sha1 = "cf4b598abf7be686c683e530529756805b8af500"; + }; + } + { + name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_linux___google_closure_compiler_linux_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200224.0.0.tgz"; + sha1 = "d9608b224b4d8f38d4d34e99a24da54bca6b1902"; + }; + } + { + name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_osx___google_closure_compiler_osx_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200224.0.0.tgz"; + sha1 = "aee62d8b878a662fc73b92419603168c0c3a35ed"; + }; + } + { + name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler_windows___google_closure_compiler_windows_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200224.0.0.tgz"; + sha1 = "cae323b898625ca57b0e87aaddde021a414dda58"; + }; + } + { + name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler___google_closure_compiler_20200224.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200224.0.0.tgz"; + sha1 = "ec0e708d9716a48e12fff43fe37fa5cec732a283"; + }; + } + { + 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 = "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 = "html_minifier_terser___html_minifier_terser_5.0.2.tgz"; + path = fetchurl { + name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz"; + sha1 = "0e67a0b062ae1dd0719fc73199479298f807ae16"; + }; + } + { + 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 = "isarray___isarray_1.0.0.tgz"; + path = fetchurl { + name = "isarray___isarray_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + } + { + name = "lower_case___lower_case_1.1.4.tgz"; + path = fetchurl { + name = "lower_case___lower_case_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; + sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + }; + } + { + 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 = "nan___nan_1.0.0.tgz"; + path = fetchurl { + name = "nan___nan_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz"; + sha1 = "ae24f8850818d662fcab5acf7f3b95bfaa2ccf38"; + }; + } + { + name = "no_case___no_case_2.3.2.tgz"; + path = fetchurl { + name = "no_case___no_case_2.3.2.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; + sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + }; + } + { + name = "options___options_0.0.6.tgz"; + path = fetchurl { + name = "options___options_0.0.6.tgz"; + url = "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + }; + } + { + name = "param_case___param_case_2.1.1.tgz"; + path = fetchurl { + name = "param_case___param_case_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; + sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + }; + } + { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + path = fetchurl { + name = "process_nextick_args___process_nextick_args_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; + }; + } + { + name = "readable_stream___readable_stream_2.3.7.tgz"; + path = fetchurl { + name = "readable_stream___readable_stream_2.3.7.tgz"; + url = "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz"; + sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; + }; + } + { + name = "relateurl___relateurl_0.2.7.tgz"; + path = fetchurl { + name = "relateurl___relateurl_0.2.7.tgz"; + url = "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz"; + sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + }; + } + { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + path = fetchurl { + name = "remove_trailing_separator___remove_trailing_separator_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; + sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + }; + } + { + name = "replace_ext___replace_ext_1.0.1.tgz"; + path = fetchurl { + name = "replace_ext___replace_ext_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz"; + sha1 = "2d6d996d04a15855d967443631dd5f77825b016a"; + }; + } + { + 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 = "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.5.6.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.6.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz"; + sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; + }; + } + { + name = "source_map___source_map_0.5.7.tgz"; + path = fetchurl { + name = "source_map___source_map_0.5.7.tgz"; + url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz"; + sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + }; + } + { + 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 = "string_decoder___string_decoder_1.1.1.tgz"; + path = fetchurl { + name = "string_decoder___string_decoder_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz"; + sha1 = "9cf1611ba62685d7030ae9e4ba34149c3af03fc8"; + }; + } + { + name = "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 = "terser___terser_4.8.0.tgz"; + path = fetchurl { + name = "terser___terser_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; + sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; + }; + } + { + name = "tinycolor___tinycolor_0.0.1.tgz"; + path = fetchurl { + name = "tinycolor___tinycolor_0.0.1.tgz"; + url = "https://registry.yarnpkg.com/tinycolor/-/tinycolor-0.0.1.tgz"; + sha1 = "320b5a52d83abb5978d81a3e887d4aefb15a6164"; + }; + } + { + name = "upper_case___upper_case_1.1.3.tgz"; + path = fetchurl { + name = "upper_case___upper_case_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; + sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; + }; + } + { + 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 = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; + path = fetchurl { + name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; + url = "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; + sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; + }; + } + { + name = "vinyl___vinyl_2.2.0.tgz"; + path = fetchurl { + name = "vinyl___vinyl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz"; + sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86"; + }; + } + { + name = "wasm2c___wasm2c_1.0.0.tgz"; + path = fetchurl { + name = "wasm2c___wasm2c_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz"; + sha1 = "761671e141c46b8a7c6c54429db1e6bfa3cd0ec0"; + }; + } + { + name = "ws___ws_0.4.32.tgz"; + path = fetchurl { + name = "ws___ws_0.4.32.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-0.4.32.tgz"; + sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; + }; + } + ]; +} diff --git a/pkgs/development/compilers/fasm/bin.nix b/pkgs/development/compilers/fasm/bin.nix index c595c86615b..8013b443162 100644 --- a/pkgs/development/compilers/fasm/bin.nix +++ b/pkgs/development/compilers/fasm/bin.nix @@ -3,11 +3,11 @@ stdenvNoCC.mkDerivation rec { pname = "fasm-bin"; - version = "1.73.24"; + version = "1.73.25"; src = fetchurl { url = "https://flatassembler.net/fasm-${version}.tgz"; - sha256 = "142vxhs8mh8isvlzq7ir0asmqda410phzxmk9gk9b43dldskkj7k"; + sha256 = "0k3h61mfwslyb34kf4dnapfwl8jxlmrp4dv666wc057hkj047knn"; }; installPhase = '' diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix index c58457b71a4..9b9d1f7481d 100644 --- a/pkgs/development/compilers/flutter/default.nix +++ b/pkgs/development/compilers/flutter/default.nix @@ -6,6 +6,7 @@ let let files = builtins.attrNames (builtins.readDir dir); in map (f: dir + ("/" + f)) files; in { + mkFlutter = mkFlutter; stable = mkFlutter rec { pname = "flutter"; channel = "stable"; diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index ae723a14531..aa34798cc58 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -11,7 +11,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null @@ -151,11 +151,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index 6a2c506b1bf..213d0c91ff3 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -11,7 +11,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null @@ -160,11 +160,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 6f4fd415fc0..98d4b61648e 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -11,7 +11,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , cloog ? null, isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null @@ -173,11 +173,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 8e3f9634717..a2f034a4827 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -13,7 +13,7 @@ , texinfo ? null , flex , perl ? null # optional, for texi2pod (then pod2man); required for Java -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null, boehmgc ? null @@ -191,11 +191,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index dcd129ff25a..6d066044ec1 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -10,7 +10,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null @@ -158,11 +158,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/8/default.nix b/pkgs/development/compilers/gcc/8/default.nix index 5a6e20c0f41..9e6a24d1294 100644 --- a/pkgs/development/compilers/gcc/8/default.nix +++ b/pkgs/development/compilers/gcc/8/default.nix @@ -10,7 +10,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null @@ -148,11 +148,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 5f0a69583a1..7cfc977b3f4 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -12,7 +12,7 @@ , enableLTO ? true , texinfo ? null , perl ? null # optional, for texi2pod (then pod2man) -, gmp, mpfr, libmpc, gettext, which +, gmp, mpfr, libmpc, gettext, which, patchelf , libelf # optional, for link-time optimizations (LTO) , isl ? null # optional, for the Graphite optimization framework. , zlib ? null @@ -158,11 +158,14 @@ stdenv.mkDerivation ({ # For building runtime libs depsBuildTarget = - if hostPlatform == buildPlatform then [ - targetPackages.stdenv.cc.bintools # newly-built gcc will be used - ] else assert targetPlatform == hostPlatform; [ # build != host == target - stdenv.cc - ]; + ( + if hostPlatform == buildPlatform then [ + targetPackages.stdenv.cc.bintools # newly-built gcc will be used + ] else assert targetPlatform == hostPlatform; [ # build != host == target + stdenv.cc + ] + ) + ++ optional targetPlatform.isLinux patchelf; buildInputs = [ gmp mpfr libmpc libelf diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh index 45587020844..d242f1a822c 100644 --- a/pkgs/development/compilers/gcc/builder.sh +++ b/pkgs/development/compilers/gcc/builder.sh @@ -241,7 +241,7 @@ postInstall() { # More dependencies with the previous gcc or some libs (gccbug stores the build command line) rm -rf $out/bin/gccbug - if type "patchelf"; then + if [[ buildConfig == *"linux"* ]]; then # Take out the bootstrap-tools from the rpath, as it's not needed at all having $out for i in $(find "$out"/libexec/gcc/*/*/* -type f -a \! -name '*.la'); do PREV_RPATH=`patchelf --print-rpath "$i"` @@ -250,6 +250,16 @@ postInstall() { done fi + if [[ targetConfig == *"linux"* ]]; then + # For some reason, when building for linux on darwin, the libs retain + # RPATH to $out. + for i in "$lib"/"$targetConfig"/lib/{libtsan,libasan,libubsan}.so.*.*.*; do + PREV_RPATH=`patchelf --print-rpath "$i"` + NEW_RPATH=`echo "$PREV_RPATH" | sed "s,:${out}[^:]*,,g"` + patchelf --set-rpath "$NEW_RPATH" "$i" && echo OK + done + fi + if type "install_name_tool"; then for i in "${!outputLib}"/lib/*.*.dylib; do install_name_tool -id "$i" "$i" || true diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 3e51796bd56..d3835d01e5a 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -55,19 +55,28 @@ let (targetPlatform != hostPlatform) "${targetPlatform.config}-"; - buildMK = '' + buildMK = dontStrip: '' BuildFlavour = ${ghcFlavour} ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString dontStrip '' + STRIP_CMD = : '' + stdenv.lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' @@ -127,7 +136,7 @@ stdenv.mkDerivation (rec { export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - echo -n "${buildMK}" > mk/build.mk + echo -n "${buildMK dontStrip}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" @@ -240,8 +249,9 @@ stdenv.mkDerivation (rec { inherit (ghc.meta) license platforms; }; -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; + dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 06266556cf3..a5d2bb5c88d 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -59,8 +59,15 @@ let endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO diff --git a/pkgs/development/compilers/ghc/8.8.2.nix b/pkgs/development/compilers/ghc/8.8.2.nix index fc55e8bdd53..371a369496e 100644 --- a/pkgs/development/compilers/ghc/8.8.2.nix +++ b/pkgs/development/compilers/ghc/8.8.2.nix @@ -52,19 +52,28 @@ let (targetPlatform != hostPlatform) "${targetPlatform.config}-"; - buildMK = '' + buildMK = dontStrip: '' BuildFlavour = ${ghcFlavour} ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString dontStrip '' + STRIP_CMD = : '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC GhcRtsHcOpts += -fPIC @@ -122,7 +131,7 @@ stdenv.mkDerivation (rec { export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - echo -n "${buildMK}" > mk/build.mk + echo -n "${buildMK dontStrip}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" @@ -235,8 +244,9 @@ stdenv.mkDerivation (rec { inherit (ghc.meta) license platforms; }; -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; + dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index aa4c378f200..e26eacca204 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -55,19 +55,28 @@ let (targetPlatform != hostPlatform) "${targetPlatform.config}-"; - buildMK = '' + buildMK = dontStrip: '' BuildFlavour = ${ghcFlavour} ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString dontStrip '' + STRIP_CMD = : '' + stdenv.lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' @@ -127,7 +136,7 @@ stdenv.mkDerivation (rec { export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - echo -n "${buildMK}" > mk/build.mk + echo -n "${buildMK dontStrip}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" @@ -240,8 +249,9 @@ stdenv.mkDerivation (rec { inherit (ghc.meta) license platforms; }; -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; + dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 60c0f2cdd9d..22a9e6e25f9 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -55,19 +55,28 @@ let (targetPlatform != hostPlatform) "${targetPlatform.config}-"; - buildMK = '' + buildMK = dontStrip: '' BuildFlavour = ${ghcFlavour} ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} - '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + '' + # We only need to build stage1 on most cross-compilation because + # we will be running the compiler on the native system. In some + # situations, like native Musl compilation, we need the compiler + # to actually link to our new Libc. The iOS simulator is a special + # exception because we can’t actually run simulators binaries + # ourselves. + + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString dontStrip '' + STRIP_CMD = : '' + stdenv.lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' @@ -127,7 +136,7 @@ stdenv.mkDerivation (rec { export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - echo -n "${buildMK}" > mk/build.mk + echo -n "${buildMK dontStrip}" > mk/build.mk sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" @@ -240,8 +249,9 @@ stdenv.mkDerivation (rec { inherit (ghc.meta) license platforms; }; -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; + dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 67459b146a3..6f9f577743f 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -38,7 +38,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.11.20200731" +, version ? "8.11.20200824" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -61,7 +61,7 @@ let (targetPlatform != hostPlatform) "${targetPlatform.config}-"; - buildMK = '' + buildMK = dontStrip: '' BuildFlavour = ${ghcFlavour} ifneq \"\$(BuildFlavour)\" \"\" include mk/flavours/\$(BuildFlavour).mk @@ -69,11 +69,13 @@ let DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' - Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} + Stage1Only = ${if (targetPlatform.system == hostPlatform.system && !targetPlatform.isiOS) then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO + '' + stdenv.lib.optionalString dontStrip '' + STRIP_CMD = : '' + stdenv.lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' @@ -108,8 +110,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "380638a33691ba43fdcd2e18bca636750e5f66f1"; - sha256 = "029cgiyhddvwnx5zx31i0vgj13zsvzb8fna99zr6ifscz6x7rid1"; + rev = "3f50154591ada9064351ccec4adfe6df53ca2439"; + sha256 = "1w2p5bc74aswspzvgvrhcb95hvj5ky38rgqqjvrri19z2qyiky6d"; }; enableParallelBuilding = true; @@ -137,7 +139,7 @@ stdenv.mkDerivation (rec { export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip" - echo -n "${buildMK}" > mk/build.mk + echo -n "${buildMK dontStrip}" > mk/build.mk echo ${version} > VERSION echo ${src.rev} > GIT_COMMIT_ID ./boot @@ -256,8 +258,9 @@ stdenv.mkDerivation (rec { inherit (ghc.meta) license platforms; }; -} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt { - dontStrip = true; + dontStrip = (targetPlatform.useAndroidPrebuilt || targetPlatform.isWasm); + +} // stdenv.lib.optionalAttrs targetPlatform.useAndroidPrebuilt{ dontPatchELF = true; noAuditTmpdir = true; }) diff --git a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix index c54c782fafa..bbf8a579919 100644 --- a/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix +++ b/pkgs/development/compilers/ghcjs-ng/8.6/dep-overrides.nix @@ -1,11 +1,14 @@ { haskellLib }: -let inherit (haskellLib) doJailbreak dontHaddock; +let inherit (haskellLib) doJailbreak dontHaddock dontCheck; in self: super: { + ghcjs = super.ghcjs.override { + shelly = super.shelly_1_8_1; + }; ghc-api-ghcjs = super.ghc-api-ghcjs.override { happy = self.happy_1_19_5; }; - haddock-library-ghcjs = doJailbreak super.haddock-library-ghcjs; + haddock-library-ghcjs = doJailbreak (dontCheck super.haddock-library-ghcjs); haddock-api-ghcjs = doJailbreak (dontHaddock super.haddock-api-ghcjs); } diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix index 6d56c410aab..7b6fbc460a9 100644 --- a/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/pkgs/development/compilers/ghcjs-ng/default.nix @@ -102,7 +102,6 @@ in stdenv.mkDerivation { inherit passthru; - meta.broken = true; # build does not succeed - meta.platforms = lib.platforms.none; # passthru.bootPkgs.ghc.meta.platforms; + meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; } diff --git a/pkgs/development/compilers/go/1.14.nix b/pkgs/development/compilers/go/1.14.nix index d9fc67cf46e..0bf972ff80f 100644 --- a/pkgs/development/compilers/go/1.14.nix +++ b/pkgs/development/compilers/go/1.14.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.6"; + version = "1.14.7"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "02acr52bxfjlr3m11576gdwn8hjv1pr2pffcis913m0m31w9vz3k"; + sha256 = "1qrhdjdzi1knchk1wmlaqgkqhxkq2niw14b931rhqrk36m1r4hq6"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/go/1.15.nix b/pkgs/development/compilers/go/1.15.nix index b3851741c69..adc3185babb 100644 --- a/pkgs/development/compilers/go/1.15.nix +++ b/pkgs/development/compilers/go/1.15.nix @@ -31,11 +31,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15"; + version = "1.15.1"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0fmc53pamxxbvmp5bcvh1fhffirpv3gz6y7qz97iacpmsiz8yhv9"; + sha256 = "0c2d2ngckcfsgrb7a4p6ag83mk5yd15npiq7q1f1p211li93fx6k"; }; # perl is used for testing go vet diff --git a/pkgs/development/compilers/kcc/default.nix b/pkgs/development/compilers/kcc/default.nix new file mode 100644 index 00000000000..49851dd0c07 --- /dev/null +++ b/pkgs/development/compilers/kcc/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, cmake, bison, flex, boost }: + +stdenv.mkDerivation rec { + pname = "kcc"; + + version = "4.0.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kcc"; + rev = version; + sha256 = "1cd226nqbxq32mppkljavq1kb74jqfqns9r7fskszr42hbygynk4"; + }; + + nativeBuildInputs = [ cmake bison flex ]; + + buildInputs = [ boost ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "KnightOS C compiler"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 4e2810fa893..88c07fb07ca 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, makeWrapper, jre, unzip }: let - version = "1.3.72"; + version = "1.4.0"; in stdenv.mkDerivation { inherit version; pname = "kotlin"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "0v6c4vjiflwbjjc1lmiyzrilxwbqcz5ll6ls40zhw70zk23xpl6c"; + sha256 = "0qgiabpkisqjm9iryidrynqy452vzmpgaw54rd9blr9w7g8r20sr"; }; propagatedBuildInputs = [ jre ] ; diff --git a/pkgs/development/compilers/llvm/11/bintools.nix b/pkgs/development/compilers/llvm/11/bintools.nix new file mode 100644 index 00000000000..53f7941e336 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/bintools.nix @@ -0,0 +1,29 @@ +{ runCommand, stdenv, llvm, lld, version }: + +let + prefix = + if stdenv.hostPlatform != stdenv.targetPlatform + then "${stdenv.targetPlatform.config}-" + else ""; +in runCommand "llvm-binutils-${version}" { preferLocalBuild = true; } '' + mkdir -p $out/bin + for prog in ${lld}/bin/*; do + ln -s $prog $out/bin/${prefix}$(basename $prog) + done + for prog in ${llvm}/bin/*; do + ln -sf $prog $out/bin/${prefix}$(basename $prog) + done + + ln -s ${llvm}/bin/llvm-ar $out/bin/${prefix}ar + ln -s ${llvm}/bin/llvm-as $out/bin/${prefix}as + ln -s ${llvm}/bin/llvm-dwp $out/bin/${prefix}dwp + ln -s ${llvm}/bin/llvm-nm $out/bin/${prefix}nm + ln -s ${llvm}/bin/llvm-objcopy $out/bin/${prefix}objcopy + ln -s ${llvm}/bin/llvm-objdump $out/bin/${prefix}objdump + ln -s ${llvm}/bin/llvm-ranlib $out/bin/${prefix}ranlib + ln -s ${llvm}/bin/llvm-readelf $out/bin/${prefix}readelf + ln -s ${llvm}/bin/llvm-size $out/bin/${prefix}size + ln -s ${llvm}/bin/llvm-strip $out/bin/${prefix}strip + + ln -s ${lld}/bin/lld $out/bin/${prefix}ld +'' diff --git a/pkgs/development/compilers/llvm/11/clang/default.nix b/pkgs/development/compilers/llvm/11/clang/default.nix new file mode 100644 index 00000000000..08f9339dc8e --- /dev/null +++ b/pkgs/development/compilers/llvm/11/clang/default.nix @@ -0,0 +1,117 @@ +{ stdenv, fetch, cmake, libxml2, llvm, version, clang-tools-extra_src, python3, lld +, fixDarwinDylibNames +, enableManpages ? false +}: + +let + self = stdenv.mkDerivation ({ + pname = "clang"; + inherit version; + + src = fetch "clang" "18rv5nxk04fgk4ziix7z4s2cargdpqgvqrk3lnp3wvd6yb5g5p98"; + + unpackPhase = '' + unpackFile $src + mv clang-${version}* clang + sourceRoot=$PWD/clang + unpackFile ${clang-tools-extra_src} + mv clang-tools-extra-* $sourceRoot/tools/extra + ''; + + nativeBuildInputs = [ cmake python3 lld ] + ++ stdenv.lib.optional enableManpages python3.pkgs.sphinx; + + buildInputs = [ libxml2 llvm ] + ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + "-DCMAKE_CXX_FLAGS=-std=c++14" + "-DCLANGD_BUILD_XPC=OFF" + ] ++ stdenv.lib.optionals enableManpages [ + "-DCLANG_INCLUDE_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ]; + + patches = [ + ./purity.patch + # https://reviews.llvm.org/D51899 + ]; + + postPatch = '' + sed -i -e 's/DriverArgs.hasArg(options::OPT_nostdlibinc)/true/' \ + -e 's/Args.hasArg(options::OPT_nostdlibinc)/true/' \ + lib/Driver/ToolChains/*.cpp + + # Patch for standalone doc building + sed -i '1s,^,find_package(Sphinx REQUIRED)\n,' docs/CMakeLists.txt + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + sed -i -e 's/lgcc_s/lgcc_eh/' lib/Driver/ToolChains/*.cpp + '' + stdenv.lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace tools/extra/clangd/CMakeLists.txt \ + --replace "NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB" FALSE + ''; + + outputs = [ "out" "lib" "python" ]; + + # Clang expects to find LLVMgold in its own prefix + postInstall = '' + if [ -e ${llvm}/lib/LLVMgold.so ]; then + ln -sv ${llvm}/lib/LLVMgold.so $out/lib + fi + + ln -sv $out/bin/clang $out/bin/cpp + + # Move libclang to 'lib' output + moveToOutput "lib/libclang.*" "$lib" + moveToOutput "lib/libclang-cpp.*" "$lib" + substituteInPlace $out/lib/cmake/clang/ClangTargets-release.cmake \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang." "$lib/lib/libclang." \ + --replace "\''${_IMPORT_PREFIX}/lib/libclang-cpp." "$lib/lib/libclang-cpp." + + mkdir -p $python/bin $python/share/clang/ + mv $out/bin/{git-clang-format,scan-view} $python/bin + if [ -e $out/bin/set-xcode-analyzer ]; then + mv $out/bin/set-xcode-analyzer $python/bin + fi + mv $out/share/clang/*.py $python/share/clang + rm $out/bin/c-index-test + ''; + + enableParallelBuilding = true; + + passthru = { + isClang = true; + inherit llvm; + } // stdenv.lib.optionalAttrs (stdenv.targetPlatform.isLinux || (stdenv.cc.isGNU && stdenv.cc.cc ? gcc)) { + gcc = if stdenv.cc.isGNU then stdenv.cc.cc else stdenv.cc.cc.gcc; + }; + + meta = { + description = "A c, c++, objective-c, and objective-c++ frontend for the llvm compiler"; + homepage = "https://llvm.org/"; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; + } // stdenv.lib.optionalAttrs enableManpages { + pname = "clang-manpages"; + + buildPhase = '' + make docs-clang-man + ''; + + installPhase = '' + mkdir -p $out/share/man/man1 + # Manually install clang manpage + cp docs/man/*.1 $out/share/man/man1/ + ''; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man page for Clang ${version}"; + }); +in self diff --git a/pkgs/development/compilers/llvm/11/clang/purity.patch b/pkgs/development/compilers/llvm/11/clang/purity.patch new file mode 100644 index 00000000000..deb230a36c5 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/clang/purity.patch @@ -0,0 +1,28 @@ +From 4add81bba40dcec62c4ea4481be8e35ac53e89d8 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Thu, 18 May 2017 11:56:12 -0500 +Subject: [PATCH] "purity" patch for 5.0 + +--- + lib/Driver/ToolChains/Gnu.cpp | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/lib/Driver/ToolChains/Gnu.cpp b/lib/Driver/ToolChains/Gnu.cpp +index fe3c0191bb..c6a482bece 100644 +--- a/lib/Driver/ToolChains/Gnu.cpp ++++ b/lib/Driver/ToolChains/Gnu.cpp +@@ -487,12 +487,6 @@ void tools::gnutools::Linker::ConstructJob(Compilation &C, const JobAction &JA, + if (!IsStatic) { + if (Args.hasArg(options::OPT_rdynamic)) + CmdArgs.push_back("-export-dynamic"); +- +- if (!Args.hasArg(options::OPT_shared) && !IsStaticPIE) { +- CmdArgs.push_back("-dynamic-linker"); +- CmdArgs.push_back(Args.MakeArgString(Twine(D.DyldPrefix) + +- ToolChain.getDynamicLinker(Args))); +- } + } + + CmdArgs.push_back("-o"); +-- +2.11.0 diff --git a/pkgs/development/compilers/llvm/11/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/11/compiler-rt-armv7l.patch new file mode 100644 index 00000000000..120cfe6feb2 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/compiler-rt-armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 +@@ -24,7 +24,7 @@ + + + set(ARM64 aarch64) +-set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) ++set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) + set(HEXAGON hexagon) + set(X86 i386) + set(X86_64 x86_64) +diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 ++++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 +@@ -474,6 +474,7 @@ + set(armv7_SOURCES ${arm_SOURCES}) + set(armv7s_SOURCES ${arm_SOURCES}) + set(armv7k_SOURCES ${arm_SOURCES}) ++set(armv7l_SOURCES ${arm_SOURCES}) + set(arm64_SOURCES ${aarch64_SOURCES}) + + # macho_embedded archs +@@ -595,7 +596,7 @@ + foreach (arch ${BUILTIN_SUPPORTED_ARCH}) + if (CAN_TARGET_${arch}) + # For ARM archs, exclude any VFP builtins if VFP is not supported +- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") + check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) + if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/11/compiler-rt-codesign.patch b/pkgs/development/compilers/llvm/11/compiler-rt-codesign.patch new file mode 100644 index 00000000000..3cc12b94b20 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/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/pkgs/development/compilers/llvm/11/compiler-rt.nix b/pkgs/development/compilers/llvm/11/compiler-rt.nix new file mode 100644 index 00000000000..133db365942 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/compiler-rt.nix @@ -0,0 +1,85 @@ +{ stdenv, version, fetch, cmake, python3, llvm, libcxxabi }: + +let + + useLLVM = stdenv.hostPlatform.useLLVM or false; + bareMetal = stdenv.hostPlatform.parsed.kernel.name == "none"; + inherit (stdenv.hostPlatform) isMusl; + +in + +stdenv.mkDerivation rec { + pname = "compiler-rt"; + inherit version; + src = fetch pname "0qfgap6acxffm01hzk38pmzq8ac3isk90531dz0qf7fd5015jvvg"; + + nativeBuildInputs = [ cmake python3 llvm ]; + buildInputs = stdenv.lib.optional stdenv.hostPlatform.isDarwin libcxxabi; + + 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}" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal || isMusl) [ + "-DCOMPILER_RT_BUILD_SANITIZERS=OFF" + "-DCOMPILER_RT_BUILD_XRAY=OFF" + "-DCOMPILER_RT_BUILD_LIBFUZZER=OFF" + "-DCOMPILER_RT_BUILD_PROFILE=OFF" + ] ++ stdenv.lib.optionals (useLLVM || bareMetal) [ + "-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)}" + ] ++ stdenv.lib.optionals (useLLVM) [ + "-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" + ] ++ stdenv.lib.optionals (bareMetal) [ + "-DCOMPILER_RT_OS_DIR=baremetal" + ]; + + outputs = [ "out" "dev" ]; + + patches = [ + ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ]# ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch + ++ stdenv.lib.optional stdenv.hostPlatform.isAarch32 ./compiler-rt-armv7l.patch; + + + # 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 = stdenv.lib.optionalString (!stdenv.isDarwin) '' + substituteInPlace cmake/builtin-config-ix.cmake \ + --replace 'set(X86 i386)' 'set(X86 i386 i486 i586 i686)' + '' + stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace cmake/config-ix.cmake \ + --replace 'set(COMPILER_RT_HAS_TSAN TRUE)' 'set(COMPILER_RT_HAS_TSAN FALSE)' + '' + stdenv.lib.optionalString (useLLVM) '' + substituteInPlace lib/builtins/int_util.c \ + --replace "#include <stdlib.h>" "" + substituteInPlace lib/builtins/clear_cache.c \ + --replace "#include <assert.h>" "" + substituteInPlace lib/builtins/cpu_model.c \ + --replace "#include <assert.h>" "" + ''; + + # Hack around weird upsream RPATH bug + postInstall = stdenv.lib.optionalString (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isWasm) '' + ln -s "$out/lib"/*/* "$out/lib" + '' + stdenv.lib.optionalString (useLLVM) '' + 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; +} diff --git a/pkgs/development/compilers/llvm/11/default.nix b/pkgs/development/compilers/llvm/11/default.nix new file mode 100644 index 00000000000..cbb3df9f687 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/default.nix @@ -0,0 +1,195 @@ +{ lowPrio, newScope, pkgs, stdenv, cmake +, libxml2, python3, isl, fetchurl, overrideCC, wrapCCWith, wrapBintoolsWith +, buildLlvmTools # tools, but from the previous stage, for cross +, targetLlvmLibraries # libraries, but from the next stage, for cross +}: + +let + release_version = "11.0.0"; + candidate = "rc2"; + version = "${release_version}${candidate}"; # differentiating these (variables) is important for RCs + targetConfig = stdenv.targetPlatform.config; + + fetch = name: sha256: fetchurl { + url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-${release_version}-${candidate}/${name}-${version}.src.tar.xz"; + inherit sha256; + }; + + clang-tools-extra_src = fetch "clang-tools-extra" "0bg2a9nmkdbj5qfd0vvqj8bgchcx1yzmylxxgvh8y5hhj4fz13fs"; + + tools = stdenv.lib.makeExtensible (tools: let + callPackage = newScope (tools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); + mkExtraBuildCommands = cc: '' + rsrc="$out/resource-root" + mkdir "$rsrc" + ln -s "${cc}/lib/clang/${release_version}/include" "$rsrc" + ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib" + echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (stdenv.targetPlatform.isLinux && tools.clang-unwrapped ? gcc && !(stdenv.targetPlatform.useLLVM or false)) '' + echo "--gcc-toolchain=${tools.clang-unwrapped.gcc}" >> $out/nix-support/cc-cflags + ''; + in { + + llvm = callPackage ./llvm.nix { }; + + clang-unwrapped = callPackage ./clang { + inherit (tools) lld; + inherit clang-tools-extra_src; + }; + + # disabled until recommonmark supports sphinx 3 + #Llvm-manpages = lowPrio (tools.llvm.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + #}); + + clang-manpages = lowPrio (tools.clang-unwrapped.override { + enableManpages = true; + python3 = pkgs.python3; # don't use python-boot + }); + + # disabled until recommonmark supports sphinx 3 + # lldb-manpages = lowPrio (tools.lldb.override { + # enableManpages = true; + # python3 = pkgs.python3; # don't use python-boot + # }); + + libclang = tools.clang-unwrapped.lib; + + clang = if stdenv.cc.isGNU then tools.libstdcxxClang else tools.libcxxClang; + + libstdcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; # libstdcxx is smuggled in with clang.gcc + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + libcxxClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = mkExtraBuildCommands cc; + }; + + lld = callPackage ./lld.nix {}; + + lldb = callPackage ./lldb.nix {}; + + # Below, is the LLVM bootstrapping logic. It handles building a + # fully LLVM toolchain from scratch. No GCC toolchain should be + # pulled in. As a consequence, it is very quick to build different + # targets provided by LLVM and we can also build for what GCC + # doesn’t support like LLVM. Probably we should move to some other + # file. + + bintools = callPackage ./bintools.nix {}; + + lldClang = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = targetLlvmLibraries.libcxx; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + targetLlvmLibraries.libcxxabi + targetLlvmLibraries.compiler-rt + ] ++ stdenv.lib.optionals (!stdenv.targetPlatform.isWasm) [ + targetLlvmLibraries.libunwind + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt -Wno-unused-command-line-argument" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString (!stdenv.targetPlatform.isWasm) '' + echo "--unwindlib=libunwind" >> $out/nix-support/cc-cflags + '' + stdenv.lib.optionalString stdenv.targetPlatform.isWasm '' + echo "-fno-exceptions" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibcxx = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + }; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + echo "-nostdlib++" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoLibc = wrapCCWith rec { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + libc = null; + }; + extraPackages = [ + targetLlvmLibraries.compiler-rt + ]; + extraBuildCommands = '' + echo "-rtlib=compiler-rt" >> $out/nix-support/cc-cflags + echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags + '' + mkExtraBuildCommands cc; + }; + + lldClangNoCompilerRt = wrapCCWith { + cc = tools.clang-unwrapped; + libcxx = null; + bintools = wrapBintoolsWith { + inherit (tools) bintools; + libc = null; + }; + extraPackages = [ ]; + extraBuildCommands = '' + echo "-nostartfiles" >> $out/nix-support/cc-cflags + ''; + }; + + }); + + libraries = stdenv.lib.makeExtensible (libraries: let + callPackage = newScope (libraries // buildLlvmTools // { inherit stdenv cmake libxml2 python3 isl release_version version fetch; }); + in { + + compiler-rt = callPackage ./compiler-rt.nix ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoCompilerRt; + })); + + stdenv = overrideCC stdenv buildLlvmTools.clang; + + libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang; + + libcxx = callPackage ./libc++ ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); + + libcxxabi = callPackage ./libc++abi.nix ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + libunwind = libraries.libunwind; + })); + + openmp = callPackage ./openmp.nix {}; + + libunwind = callPackage ./libunwind.nix ({} // + (stdenv.lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) { + stdenv = overrideCC stdenv buildLlvmTools.lldClangNoLibcxx; + })); + + }); + +in { inherit tools libraries; } // libraries // tools diff --git a/pkgs/development/compilers/llvm/11/libc++/default.nix b/pkgs/development/compilers/llvm/11/libc++/default.nix new file mode 100644 index 00000000000..a2ea7e29918 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/libc++/default.nix @@ -0,0 +1,52 @@ +{ lib, stdenv, fetch, cmake, python3, libcxxabi, fixDarwinDylibNames, version +, enableShared ? true }: + +stdenv.mkDerivation { + pname = "libc++"; + inherit version; + + src = fetch "libcxx" "0aaci7iblfczv1jb22zjrwzxcrcx6x7klvjivmxm2zni0n2x3bd4"; + + postUnpack = '' + unpackFile ${libcxxabi.src} + export LIBCXXABI_INCLUDE_DIR="$PWD/$(ls -d libcxxabi-${version}*)/include" + ''; + + patches = stdenv.lib.optional stdenv.hostPlatform.isMusl ../../libcxx-0001-musl-hacks.patch; + + preConfigure = '' + # Get headers from the cxxabi source so we can see private headers not installed by the cxxabi package + cmakeFlagsArray=($cmakeFlagsArray -DLIBCXX_CXX_ABI_INCLUDE_PATHS="$LIBCXXABI_INCLUDE_DIR") + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + patchShebangs utils/cat_files.py + ''; + nativeBuildInputs = [ cmake ] + ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) python3; + + buildInputs = [ libcxxabi ] ++ lib.optional stdenv.isDarwin fixDarwinDylibNames; + + cmakeFlags = [ + "-DLIBCXX_LIBCXXABI_LIB_PATH=${libcxxabi}/lib" + "-DLIBCXX_LIBCPPABI_VERSION=2" + "-DLIBCXX_CXX_ABI=libcxxabi" + ] ++ stdenv.lib.optional (stdenv.hostPlatform.isMusl || stdenv.hostPlatform.isWasi) "-DLIBCXX_HAS_MUSL_LIBC=1" + ++ stdenv.lib.optional (stdenv.hostPlatform.useLLVM or false) "-DLIBCXX_USE_COMPILER_RT=ON" + ++ stdenv.lib.optional stdenv.hostPlatform.isWasm [ + "-DLIBCXX_ENABLE_THREADS=OFF" + "-DLIBCXX_ENABLE_FILESYSTEM=OFF" + "-DLIBCXX_ENABLE_EXCEPTIONS=OFF" + ] ++ stdenv.lib.optional (!enableShared) "-DLIBCXX_ENABLE_SHARED=OFF"; + + enableParallelBuilding = true; + + passthru = { + isLLVM = true; + }; + + meta = { + homepage = "https://libcxx.llvm.org/"; + description = "A new implementation of the C++ standard library, targeting C++11"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/11/libc++abi.nix b/pkgs/development/compilers/llvm/11/libc++abi.nix new file mode 100644 index 00000000000..bf7b3fd001d --- /dev/null +++ b/pkgs/development/compilers/llvm/11/libc++abi.nix @@ -0,0 +1,67 @@ +{ stdenv, cmake, fetch, libcxx, libunwind, llvm, version +, enableShared ? true }: + +stdenv.mkDerivation { + pname = "libc++abi"; + inherit version; + + src = fetch "libcxxabi" "04gqdzs13sw7f7a06h5zm5917d9f1k79l4rcm096grgvf0r7lnqx"; + + nativeBuildInputs = [ cmake ]; + buildInputs = stdenv.lib.optional (!stdenv.isDarwin && !stdenv.isFreeBSD && !stdenv.hostPlatform.isWasm) libunwind; + + cmakeFlags = stdenv.lib.optionals (stdenv.hostPlatform.useLLVM or false) [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DLIBCXXABI_USE_LLVM_UNWINDER=ON" + ] ++ stdenv.lib.optionals stdenv.hostPlatform.isWasm [ + "-DLIBCXXABI_ENABLE_THREADS=OFF" + "-DLIBCXXABI_ENABLE_EXCEPTIONS=OFF" + ] ++ stdenv.lib.optionals (!enableShared) [ + "-DLIBCXXABI_ENABLE_SHARED=OFF" + ]; + + patches = [ ./libcxxabi-no-threads.patch ]; + + postUnpack = '' + unpackFile ${libcxx.src} + unpackFile ${llvm.src} + cmakeFlags+=" -DLLVM_PATH=$PWD/$(ls -d llvm-*) -DLIBCXXABI_LIBCXX_PATH=$PWD/$(ls -d libcxx-*)" + '' + stdenv.lib.optionalString stdenv.isDarwin '' + export TRIPLE=x86_64-apple-darwin + '' + stdenv.lib.optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -d $(ls -d libcxx-*) -i ${../libcxx-0001-musl-hacks.patch} + '' + stdenv.lib.optionalString stdenv.hostPlatform.isWasm '' + patch -p1 -d $(ls -d llvm-*) -i ${./libcxxabi-wasm.patch} + ''; + + installPhase = if stdenv.isDarwin + then '' + for file in lib/*.dylib; do + # this should be done in CMake, but having trouble figuring out + # the magic combination of necessary CMake variables + # if you fancy a try, take a look at + # https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling + install_name_tool -id $out/$file $file + done + make install + install -d 755 $out/include + install -m 644 ../include/*.h $out/include + '' + else '' + install -d -m 755 $out/include $out/lib + install -m 644 lib/libc++abi.a $out/lib + install -m 644 ../include/cxxabi.h $out/include + '' + stdenv.lib.optionalString enableShared '' + install -m 644 lib/libc++abi.so.1.0 $out/lib + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so + ln -s libc++abi.so.1.0 $out/lib/libc++abi.so.1 + ''; + + meta = { + homepage = "https://libcxxabi.llvm.org/"; + description = "A new implementation of low level support for a standard C++ library"; + license = with stdenv.lib.licenses; [ ncsa mit ]; + maintainers = with stdenv.lib.maintainers; [ vlstill ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/11/libcxxabi-no-threads.patch b/pkgs/development/compilers/llvm/11/libcxxabi-no-threads.patch new file mode 100644 index 00000000000..787f3e16500 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/libcxxabi-no-threads.patch @@ -0,0 +1,12 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4138acf..41b4763 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -362,6 +362,7 @@ if (NOT LIBCXXABI_ENABLE_THREADS) + " is also set to ON.") + endif() + add_definitions(-D_LIBCXXABI_HAS_NO_THREADS) ++ add_definitions(-D_LIBCPP_HAS_NO_THREADS) + endif() + + if (LIBCXXABI_HAS_EXTERNAL_THREAD_API) diff --git a/pkgs/development/compilers/llvm/11/libcxxabi-wasm.patch b/pkgs/development/compilers/llvm/11/libcxxabi-wasm.patch new file mode 100644 index 00000000000..4ebfe46aa81 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/libcxxabi-wasm.patch @@ -0,0 +1,16 @@ +diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake +index 15497d405e0..33f7f18193a 100644 +--- a/cmake/modules/HandleLLVMOptions.cmake ++++ b/cmake/modules/HandleLLVMOptions.cmake +@@ -127,7 +127,10 @@ else(WIN32) + set(LLVM_HAVE_LINK_VERSION_SCRIPT 1) + endif() + else(FUCHSIA OR UNIX) +- MESSAGE(SEND_ERROR "Unable to determine platform") ++ if(${CMAKE_SYSTEM_NAME} MATCHES "Wasi") ++ else() ++ MESSAGE(SEND_ERROR "Unable to determine platform") ++ endif() + endif(FUCHSIA OR UNIX) + endif(WIN32) + diff --git a/pkgs/development/compilers/llvm/11/libunwind.nix b/pkgs/development/compilers/llvm/11/libunwind.nix new file mode 100644 index 00000000000..03b58ca8d1d --- /dev/null +++ b/pkgs/development/compilers/llvm/11/libunwind.nix @@ -0,0 +1,14 @@ +{ stdenv, version, fetch, cmake, fetchpatch, enableShared ? true }: + +stdenv.mkDerivation rec { + pname = "libunwind"; + inherit version; + + src = fetch pname "1ch4a2yp821lgzxh9898f7nw2fnkrn3wh25sqg05hlks45znv30y"; + + nativeBuildInputs = [ cmake ]; + + enableParallelBuilding = true; + + cmakeFlags = stdenv.lib.optional (!enableShared) "-DLIBUNWIND_ENABLE_SHARED=OFF"; +} diff --git a/pkgs/development/compilers/llvm/11/lld.nix b/pkgs/development/compilers/llvm/11/lld.nix new file mode 100644 index 00000000000..74d18a444fc --- /dev/null +++ b/pkgs/development/compilers/llvm/11/lld.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetch +, cmake +, libxml2 +, llvm +, version +}: + +stdenv.mkDerivation rec { + pname = "lld"; + inherit version; + + src = fetch pname "0lqz5cfids0rrl02p0qq5s18p8ikaa9r5gwa2yvj3bismdhvmar8"; + + nativeBuildInputs = [ cmake ]; + buildInputs = [ llvm libxml2 ]; + + outputs = [ "out" "dev" ]; + + enableParallelBuilding = true; + + postInstall = '' + moveToOutput include "$dev" + moveToOutput lib "$dev" + ''; + + meta = { + description = "The LLVM Linker"; + homepage = "https://lld.llvm.org/"; + license = stdenv.lib.licenses.ncsa; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/11/lldb-procfs.patch b/pkgs/development/compilers/llvm/11/lldb-procfs.patch new file mode 100644 index 00000000000..b075dbaeee0 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/lldb-procfs.patch @@ -0,0 +1,31 @@ +--- a/source/Plugins/Process/Linux/Procfs.h ++++ b/source/Plugins/Process/Linux/Procfs.h +@@ -11,21 +11,12 @@ + // sys/procfs.h on Android/Linux for all supported architectures. + + #include <sys/ptrace.h> ++#include <asm/ptrace.h> + +-#ifdef __ANDROID__ +-#if defined(__arm64__) || defined(__aarch64__) +-typedef unsigned long elf_greg_t; +-typedef elf_greg_t +- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))]; +-typedef struct user_fpsimd_state elf_fpregset_t; +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#elif defined(__mips__) +-#ifndef NT_FPREGSET +-#define NT_FPREGSET NT_PRFPREG +-#endif // NT_FPREGSET +-#endif +-#else // __ANDROID__ ++#if !defined(__GLIBC__) && defined(__powerpc__) ++#define pt_regs musl_pt_regs ++#include <sys/procfs.h> ++#undef pt_regs ++#else + #include <sys/procfs.h> +-#endif // __ANDROID__ ++#endif diff --git a/pkgs/development/compilers/llvm/11/lldb.nix b/pkgs/development/compilers/llvm/11/lldb.nix new file mode 100644 index 00000000000..c0b7f267f75 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/lldb.nix @@ -0,0 +1,101 @@ +{ stdenv +, fetch +, cmake +, zlib +, ncurses +, swig +, which +, libedit +, libxml2 +, llvm +, clang-unwrapped +, python3 +, version +, darwin +, lit +, enableManpages ? false +}: + +stdenv.mkDerivation (rec { + pname = "lldb"; + inherit version; + + src = fetch pname "0hb582kvhxp3kcckz7imrihs0kszdaz09z22xfymyi4vgmcy62q3"; + + patches = [ ./lldb-procfs.patch ]; + + nativeBuildInputs = [ cmake python3 which swig lit ] + ++ stdenv.lib.optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + + buildInputs = [ + ncurses + zlib + libedit + libxml2 + llvm + ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + darwin.libobjc + darwin.apple_sdk.libs.xpc + darwin.apple_sdk.frameworks.Foundation + darwin.bootstrap_cmds + darwin.apple_sdk.frameworks.Carbon + darwin.apple_sdk.frameworks.Cocoa + ]; + + CXXFLAGS = "-fno-rtti"; + hardeningDisable = [ "format" ]; + + cmakeFlags = [ + "-DLLDB_CODESIGN_IDENTITY=" # codesigning makes nondeterministic + "-DClang_DIR=${clang-unwrapped}/lib/cmake" + "-DLLVM_EXTERNAL_LIT=${lit}/bin/lit" + ] ++ stdenv.lib.optionals stdenv.isDarwin [ + "-DLLDB_USE_SYSTEM_DEBUGSERVER=ON" + ] ++ stdenv.lib.optionals enableManpages [ + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + ] +; + + enableParallelBuilding = true; + + postInstall = '' + # Editor support + # vscode: + install -D ../tools/lldb-vscode/package.json $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/package.json + mkdir -p $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ln -s $out/bin/lldb-vscode $out/share/vscode/extensions/llvm-org.lldb-vscode-0.1.0/bin + ''; + + meta = with stdenv.lib; { + description = "A next-generation high-performance debugger"; + homepage = "https://lldb.llvm.org"; + license = licenses.ncsa; + platforms = platforms.all; + }; +} // stdenv.lib.optionalAttrs enableManpages { + pname = "lldb-manpages"; + + buildPhase = '' + make docs-lldb-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + # manually install lldb man page + mkdir -p $out/share/man/man1 + install docs/man/lldb.1 -t $out/share/man/man1/ + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLDB ${version}"; +}) diff --git a/pkgs/development/compilers/llvm/11/llvm-outputs.patch b/pkgs/development/compilers/llvm/11/llvm-outputs.patch new file mode 100644 index 00000000000..40096fa3497 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/llvm-outputs.patch @@ -0,0 +1,26 @@ +diff --git a/tools/llvm-config/llvm-config.cpp b/tools/llvm-config/llvm-config.cpp +index 94d426b..37f7794 100644 +--- a/tools/llvm-config/llvm-config.cpp ++++ b/tools/llvm-config/llvm-config.cpp +@@ -333,6 +333,21 @@ int main(int argc, char **argv) { + ActiveIncludeOption = "-I" + ActiveIncludeDir; + } + ++ /// Nix-specific multiple-output handling: override ActiveLibDir if --link-shared ++ if (!IsInDevelopmentTree) { ++ bool WantShared = true; ++ for (int i = 1; i < argc; ++i) { ++ StringRef Arg = argv[i]; ++ if (Arg == "--link-shared") ++ WantShared = true; ++ else if (Arg == "--link-static") ++ WantShared = false; // the last one wins ++ } ++ ++ if (WantShared) ++ ActiveLibDir = std::string("@lib@") + "/lib" + LLVM_LIBDIR_SUFFIX; ++ } ++ + /// We only use `shared library` mode in cases where the static library form + /// of the components provided are not available; note however that this is + /// skipped if we're run from within the build dir. However, once installed, diff --git a/pkgs/development/compilers/llvm/11/llvm.nix b/pkgs/development/compilers/llvm/11/llvm.nix new file mode 100644 index 00000000000..f15a7d12b80 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/llvm.nix @@ -0,0 +1,190 @@ +{ stdenv +, fetch +, cmake +, python3 +, libffi +, libbfd +, libpfm +, libxml2 +, ncurses +, version +, release_version +, zlib +, buildPackages +, debugVersion ? false +, enableManpages ? false +, enableSharedLibraries ? true +, enablePFM ? !(stdenv.isDarwin + || stdenv.isAarch64 # broken for Ampere eMAG 8180 (c2.large.arm on Packet) #56245 + || stdenv.isAarch32 # broken for the armv7l builder +) +, enablePolly ? false +}: + +let + inherit (stdenv.lib) optional optionals optionalString; + + # Used when creating a version-suffixed symlink of libLLVM.dylib + shortVersion = with stdenv.lib; + concatStringsSep "." (take 1 (splitString "." release_version)); + +in stdenv.mkDerivation (rec { + pname = "llvm"; + inherit version; + + src = fetch pname "151c7nphn18dcw04yxyp6qdj8w19psb8nigf26djf7rhpi1fn0sh"; + polly_src = fetch "polly" "0caxfpaxhf38nam4gkb9xqlrw20v29cm8jf95ykkbngqw64rmgij"; + + unpackPhase = '' + unpackFile $src + mv llvm-${version}* llvm + sourceRoot=$PWD/llvm + '' + optionalString enablePolly '' + unpackFile $polly_src + mv polly-* $sourceRoot/tools/polly + ''; + + outputs = [ "out" "python" ] + ++ optional enableSharedLibraries "lib"; + + nativeBuildInputs = [ cmake python3 ] + ++ optionals enableManpages [ python3.pkgs.sphinx python3.pkgs.recommonmark ]; + + buildInputs = [ libxml2 libffi ] + ++ optional enablePFM libpfm; # exegesis + + propagatedBuildInputs = [ ncurses zlib ]; + + postPatch = optionalString stdenv.isDarwin '' + substituteInPlace cmake/modules/AddLLVM.cmake \ + --replace 'set(_install_name_dir INSTALL_NAME_DIR "@rpath")' "set(_install_name_dir)" \ + --replace 'set(_install_rpath "@loader_path/../lib''${LLVM_LIBDIR_SUFFIX}" ''${extra_libdir})' "" + '' + # Patch llvm-config to return correct library path based on --link-{shared,static}. + + optionalString (enableSharedLibraries) '' + substitute '${./llvm-outputs.patch}' ./llvm-outputs.patch --subst-var lib + patch -p1 < ./llvm-outputs.patch + '' + '' + # FileSystem permissions tests fail with various special bits + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "Path.cpp" "" + rm unittests/Support/Path.cpp + '' + optionalString stdenv.hostPlatform.isMusl '' + patch -p1 -i ${../TLI-musl.patch} + substituteInPlace unittests/Support/CMakeLists.txt \ + --replace "add_subdirectory(DynamicLibrary)" "" + rm unittests/Support/DynamicLibrary/DynamicLibraryTest.cpp + # valgrind unhappy with musl or glibc, but fails w/musl only + rm test/CodeGen/AArch64/wineh4.mir + '' + optionalString stdenv.hostPlatform.isAarch32 '' + # skip failing X86 test cases on 32-bit ARM + rm test/DebugInfo/X86/convert-debugloc.ll + rm test/DebugInfo/X86/convert-inlined.ll + rm test/DebugInfo/X86/convert-linked.ll + rm test/tools/dsymutil/X86/op-convert.test + '' + optionalString (stdenv.hostPlatform.system == "armv6l-linux") '' + # Seems to require certain floating point hardware (NEON?) + rm test/ExecutionEngine/frem.ll + '' + '' + patchShebangs test/BugPoint/compile-custom.ll.py + ''; + + # hacky fix: created binaries need to be run before installation + preBuild = '' + mkdir -p $out/ + ln -sv $PWD/lib $out + ''; + + # E.g. mesa.drivers use the build-id as a cache key (see #93946): + LDFLAGS = optionalString enableSharedLibraries "-Wl,--build-id=sha1"; + + cmakeFlags = with stdenv; [ + "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}" + "-DLLVM_INSTALL_UTILS=ON" # Needed by rustc + "-DLLVM_BUILD_TESTS=ON" + "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_ENABLE_RTTI=ON" + "-DLLVM_HOST_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_DEFAULT_TARGET_TRIPLE=${stdenv.hostPlatform.config}" + "-DLLVM_ENABLE_DUMP=ON" + ] ++ optionals enableSharedLibraries [ + "-DLLVM_LINK_LLVM_DYLIB=ON" + ] ++ optionals enableManpages [ + "-DLLVM_BUILD_DOCS=ON" + "-DLLVM_ENABLE_SPHINX=ON" + "-DSPHINX_OUTPUT_MAN=ON" + "-DSPHINX_OUTPUT_HTML=OFF" + "-DSPHINX_WARNINGS_AS_ERRORS=OFF" + ] ++ optionals (!isDarwin) [ + "-DLLVM_BINUTILS_INCDIR=${libbfd.dev}/include" + ] ++ optionals isDarwin [ + "-DLLVM_ENABLE_LIBCXX=ON" + "-DCAN_TARGET_i386=false" + ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + "-DCMAKE_CROSSCOMPILING=True" + "-DLLVM_TABLEGEN=${buildPackages.llvm_10}/bin/llvm-tblgen" + ]; + + postBuild = '' + rm -fR $out + ''; + + preCheck = '' + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/lib + ''; + + postInstall = '' + mkdir -p $python/share + mv $out/share/opt-viewer $python/share/opt-viewer + '' + + optionalString enableSharedLibraries '' + moveToOutput "lib/libLLVM-*" "$lib" + moveToOutput "lib/libLLVM${stdenv.hostPlatform.extensions.sharedLibrary}" "$lib" + '' + + optionalString (enableSharedLibraries && (!stdenv.isDarwin)) '' + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM-" "$lib/lib/libLLVM-" + '' + + optionalString (stdenv.isDarwin && enableSharedLibraries) '' + substituteInPlace "$out/lib/cmake/llvm/LLVMExports-${if debugVersion then "debug" else "release"}.cmake" \ + --replace "\''${_IMPORT_PREFIX}/lib/libLLVM.dylib" "$lib/lib/libLLVM.dylib" + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${shortVersion}.dylib + ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib + ''; + + doCheck = stdenv.isLinux && (!stdenv.isx86_32); + + checkTarget = "check-all"; + + enableParallelBuilding = true; + + requiredSystemFeatures = [ "big-parallel" ]; + meta = { + description = "Collection of modular and reusable compiler and toolchain technologies"; + homepage = "https://llvm.org/"; + license = stdenv.lib.licenses.ncsa; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; + platforms = stdenv.lib.platforms.all; + }; +} // stdenv.lib.optionalAttrs enableManpages { + pname = "llvm-manpages"; + + buildPhase = '' + make docs-llvm-man + ''; + + propagatedBuildInputs = []; + + installPhase = '' + make -C docs install + ''; + + postPatch = null; + postInstall = null; + + outputs = [ "out" ]; + + doCheck = false; + + meta.description = "man pages for LLVM ${version}"; +}) diff --git a/pkgs/development/compilers/llvm/11/openmp.nix b/pkgs/development/compilers/llvm/11/openmp.nix new file mode 100644 index 00000000000..f4f9bbf2292 --- /dev/null +++ b/pkgs/development/compilers/llvm/11/openmp.nix @@ -0,0 +1,26 @@ +{ stdenv +, fetch +, cmake +, llvm +, perl +, version +}: + +stdenv.mkDerivation rec { + pname = "openmp"; + inherit version; + + src = fetch pname "1025dwn68iw664df831zbkxy8bxilvjkbc6mw4nhv6p5ff7dcw7f"; + + nativeBuildInputs = [ cmake perl ]; + buildInputs = [ llvm ]; + + enableParallelBuilding = true; + + meta = { + description = "Components required to build an executable OpenMP program"; + homepage = "https://openmp.llvm.org/"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/compilers/llvm/11/sanitizers-nongnu.patch b/pkgs/development/compilers/llvm/11/sanitizers-nongnu.patch new file mode 100644 index 00000000000..1f2ac97818e --- /dev/null +++ b/pkgs/development/compilers/llvm/11/sanitizers-nongnu.patch @@ -0,0 +1,412 @@ +From f7a253f8f85d0f49df6b73996737a3e84ac64236 Mon Sep 17 00:00:00 2001 +From: Will Dietz <w@wdtz.org> +Date: Mon, 24 Sep 2018 11:17:25 -0500 +Subject: [PATCH] Ported to 7.0, taken from gentoo-musl project. + +------ +Ported to compiler-rt-sanitizers-5.0.0. Taken from + +https://gist.githubusercontent.com/pwaller/2337f3290f12634cad3e3730cff0a6c1/raw/83c87a8585e2f9662494db5662e5361beb093c26/nongnu.patch +Signed-off-by: Jory A. Pratt <anarchy@gentoo.org> + +Taken from gentoo-musl project, with a few additional minor fixes. +--- + lib/asan/asan_linux.cc | 4 +- + lib/interception/interception_linux.cc | 2 +- + lib/interception/interception_linux.h | 2 +- + lib/msan/msan_linux.cc | 2 +- + lib/sanitizer_common/sanitizer_allocator.cc | 2 +- + .../sanitizer_common_interceptors_ioctl.inc | 4 +- + .../sanitizer_common_syscalls.inc | 2 +- + lib/sanitizer_common/sanitizer_linux.cc | 8 +++- + .../sanitizer_linux_libcdep.cc | 10 ++--- + lib/sanitizer_common/sanitizer_platform.h | 6 +++ + .../sanitizer_platform_interceptors.h | 4 +- + .../sanitizer_platform_limits_posix.cc | 37 +++++++++++-------- + lib/tsan/rtl/tsan_platform_linux.cc | 2 +- + 13 files changed, 51 insertions(+), 34 deletions(-) + +diff --git a/lib/asan/asan_linux.cc b/lib/asan/asan_linux.cc +index 625f32d40..73cf77aca 100644 +--- a/lib/asan/asan_linux.cc ++++ b/lib/asan/asan_linux.cc +@@ -46,7 +46,7 @@ + #include <link.h> + #endif + +-#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS ++#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU + #include <ucontext.h> + extern "C" void* _DYNAMIC; + #elif SANITIZER_NETBSD +@@ -139,7 +139,7 @@ void AsanApplyToGlobals(globals_op_fptr op, const void *needle) { + UNIMPLEMENTED(); + } + +-#if SANITIZER_ANDROID ++#if SANITIZER_ANDROID || SANITIZER_NONGNU + // FIXME: should we do anything for Android? + void AsanCheckDynamicRTPrereqs() {} + void AsanCheckIncompatibleRT() {} +diff --git a/lib/interception/interception_linux.cc b/lib/interception/interception_linux.cc +index 26bfcd8f6..529b234f7 100644 +--- a/lib/interception/interception_linux.cc ++++ b/lib/interception/interception_linux.cc +@@ -43,7 +43,7 @@ bool GetRealFunctionAddress(const char *func_name, uptr *func_addr, + } + + // Android and Solaris do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU + void *GetFuncAddrVer(const char *func_name, const char *ver) { + return dlvsym(RTLD_NEXT, func_name, ver); + } +diff --git a/lib/interception/interception_linux.h b/lib/interception/interception_linux.h +index 942c25609..24a4d5080 100644 +--- a/lib/interception/interception_linux.h ++++ b/lib/interception/interception_linux.h +@@ -36,7 +36,7 @@ void *GetFuncAddrVer(const char *func_name, const char *ver); + (::__interception::uptr) & WRAP(func)) + + // Android, Solaris and OpenBSD do not have dlvsym +-#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD ++#if !SANITIZER_ANDROID && !SANITIZER_SOLARIS && !SANITIZER_OPENBSD && !SANITIZER_NONGNU + #define INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver) \ + (::__interception::real_##func = (func##_f)( \ + unsigned long)::__interception::GetFuncAddrVer(#func, symver)) +diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc +index 385a650c4..6e30a8ce9 100644 +--- a/lib/msan/msan_linux.cc ++++ b/lib/msan/msan_linux.cc +@@ -13,7 +13,7 @@ + //===----------------------------------------------------------------------===// + + #include "sanitizer_common/sanitizer_platform.h" +-#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD ++#if SANITIZER_FREEBSD || (SANITIZER_LINUX && !SANITIZER_NONGNU) || SANITIZER_NETBSD + + #include "msan.h" + #include "msan_report.h" +diff --git a/lib/sanitizer_common/sanitizer_allocator.cc b/lib/sanitizer_common/sanitizer_allocator.cc +index 6bfd5e5ee..048f6154f 100644 +--- a/lib/sanitizer_common/sanitizer_allocator.cc ++++ b/lib/sanitizer_common/sanitizer_allocator.cc +@@ -27,7 +27,7 @@ const char *SecondaryAllocatorName = "LargeMmapAllocator"; + + // ThreadSanitizer for Go uses libc malloc/free. + #if SANITIZER_GO || defined(SANITIZER_USE_MALLOC) +-# if SANITIZER_LINUX && !SANITIZER_ANDROID ++# if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + extern "C" void *__libc_malloc(uptr size); + # if !SANITIZER_GO + extern "C" void *__libc_memalign(uptr alignment, uptr size); +diff --git a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +index 2d633c173..b6eb23116 100644 +--- a/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc ++++ b/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc +@@ -104,7 +104,7 @@ static void ioctl_table_fill() { + _(SIOCGETVIFCNT, WRITE, struct_sioc_vif_req_sz); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + // Conflicting request ids. + // _(CDROMAUDIOBUFSIZ, NONE, 0); + // _(SNDCTL_TMR_CONTINUE, NONE, 0); +@@ -365,7 +365,7 @@ static void ioctl_table_fill() { + _(VT_WAITACTIVE, NONE, 0); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE + _(CYGETDEFTHRESH, WRITE, sizeof(int)); + _(CYGETDEFTIMEOUT, WRITE, sizeof(int)); +diff --git a/lib/sanitizer_common/sanitizer_common_syscalls.inc b/lib/sanitizer_common/sanitizer_common_syscalls.inc +index 469c8eb7e..24f87867d 100644 +--- a/lib/sanitizer_common/sanitizer_common_syscalls.inc ++++ b/lib/sanitizer_common/sanitizer_common_syscalls.inc +@@ -2038,7 +2038,7 @@ POST_SYSCALL(setrlimit)(long res, long resource, void *rlim) { + } + } + +-#if !SANITIZER_ANDROID ++#if !SANITIZER_ANDROID && !SANITIZER_NONGNU + PRE_SYSCALL(prlimit64)(long pid, long resource, const void *new_rlim, + void *old_rlim) { + if (new_rlim) PRE_READ(new_rlim, struct_rlimit64_sz); +diff --git a/lib/sanitizer_common/sanitizer_linux.cc b/lib/sanitizer_common/sanitizer_linux.cc +index 96d6c1eff..9e2b7fb9d 100644 +--- a/lib/sanitizer_common/sanitizer_linux.cc ++++ b/lib/sanitizer_common/sanitizer_linux.cc +@@ -541,13 +541,13 @@ const char *GetEnv(const char *name) { + #endif + } + +-#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD ++#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_NONGNU + extern "C" { + SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end; + } + #endif + +-#if !SANITIZER_GO && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \ ++#if (!SANITIZER_GO || SANITIZER_NONGNU) && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \ + !SANITIZER_OPENBSD + static void ReadNullSepFileToArray(const char *path, char ***arr, + int arr_size) { +@@ -590,6 +590,10 @@ static void GetArgsAndEnv(char ***argv, char ***envp) { + #elif SANITIZER_NETBSD + *argv = __ps_strings->ps_argvstr; + *envp = __ps_strings->ps_envstr; ++#elif SANITIZER_NONGNU ++ static const int kMaxArgv = 2000, kMaxEnvp = 2000; ++ ReadNullSepFileToArray("/proc/self/cmdline", argv, kMaxArgv); ++ ReadNullSepFileToArray("/proc/self/environ", envp, kMaxEnvp); + #else // SANITIZER_FREEBSD + #if !SANITIZER_GO + if (&__libc_stack_end) { +diff --git a/lib/sanitizer_common/sanitizer_linux_libcdep.cc b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +index 4962ff832..438f94dbe 100644 +--- a/lib/sanitizer_common/sanitizer_linux_libcdep.cc ++++ b/lib/sanitizer_common/sanitizer_linux_libcdep.cc +@@ -179,7 +179,7 @@ __attribute__((unused)) static bool GetLibcVersion(int *major, int *minor, + } + + #if !SANITIZER_FREEBSD && !SANITIZER_ANDROID && !SANITIZER_GO && \ +- !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS ++ !SANITIZER_NETBSD && !SANITIZER_OPENBSD && !SANITIZER_SOLARIS && !SANITIZER_NONGNU + static uptr g_tls_size; + + #ifdef __i386__ +@@ -261,7 +261,7 @@ void InitTlsSize() { } + #if (defined(__x86_64__) || defined(__i386__) || defined(__mips__) || \ + defined(__aarch64__) || defined(__powerpc64__) || defined(__s390__) || \ + defined(__arm__)) && \ +- SANITIZER_LINUX && !SANITIZER_ANDROID ++ SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // sizeof(struct pthread) from glibc. + static atomic_uintptr_t thread_descriptor_size; + +@@ -426,7 +426,7 @@ int GetSizeFromHdr(struct dl_phdr_info *info, size_t size, void *data) { + + #if !SANITIZER_GO + static void GetTls(uptr *addr, uptr *size) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # if defined(__x86_64__) || defined(__i386__) || defined(__s390__) + *addr = ThreadSelf(); + *size = GetTlsSize(); +@@ -470,7 +470,7 @@ static void GetTls(uptr *addr, uptr *size) { + #elif SANITIZER_OPENBSD + *addr = 0; + *size = 0; +-#elif SANITIZER_ANDROID ++#elif SANITIZER_ANDROID || SANITIZER_NONGNU + *addr = 0; + *size = 0; + #elif SANITIZER_SOLARIS +@@ -486,7 +486,7 @@ static void GetTls(uptr *addr, uptr *size) { + #if !SANITIZER_GO + uptr GetTlsSize() { + #if SANITIZER_FREEBSD || SANITIZER_ANDROID || SANITIZER_NETBSD || \ +- SANITIZER_OPENBSD || SANITIZER_SOLARIS ++ SANITIZER_OPENBSD || SANITIZER_SOLARIS || SANITIZER_NONGNU + uptr addr, size; + GetTls(&addr, &size); + return size; +diff --git a/lib/sanitizer_common/sanitizer_platform.h b/lib/sanitizer_common/sanitizer_platform.h +index d81e25580..e10680ac8 100644 +--- a/lib/sanitizer_common/sanitizer_platform.h ++++ b/lib/sanitizer_common/sanitizer_platform.h +@@ -208,6 +208,12 @@ + # define SANITIZER_SOLARIS32 0 + #endif + ++#if defined(__linux__) && !defined(__GLIBC__) ++# define SANITIZER_NONGNU 1 ++#else ++# define SANITIZER_NONGNU 0 ++#endif ++ + #if defined(__myriad2__) + # define SANITIZER_MYRIAD2 1 + #else +diff --git a/lib/sanitizer_common/sanitizer_platform_interceptors.h b/lib/sanitizer_common/sanitizer_platform_interceptors.h +index f95539a73..6c53b3415 100644 +--- a/lib/sanitizer_common/sanitizer_platform_interceptors.h ++++ b/lib/sanitizer_common/sanitizer_platform_interceptors.h +@@ -39,7 +39,7 @@ + # include "sanitizer_platform_limits_solaris.h" + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + # define SI_LINUX_NOT_ANDROID 1 + #else + # define SI_LINUX_NOT_ANDROID 0 +@@ -322,7 +322,7 @@ + #define SANITIZER_INTERCEPT_ETHER_R (SI_FREEBSD || SI_LINUX_NOT_ANDROID) + #define SANITIZER_INTERCEPT_SHMCTL \ + (SI_NETBSD || SI_OPENBSD || SI_SOLARIS || \ +- ((SI_FREEBSD || SI_LINUX_NOT_ANDROID) && \ ++ ((SI_FREEBSD || SI_LINUX_NOT_ANDROID || SANITIZER_NONGNU) && \ + SANITIZER_WORDSIZE == 64)) // NOLINT + #define SANITIZER_INTERCEPT_RANDOM_R SI_LINUX_NOT_ANDROID + #define SANITIZER_INTERCEPT_PTHREAD_ATTR_GET SI_POSIX +diff --git a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +index 54da635d7..2f6ff69c3 100644 +--- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ++++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc +@@ -14,6 +14,9 @@ + + #include "sanitizer_platform.h" + ++// Workaround musl <--> linux conflicting definition of 'struct sysinfo' ++#define _LINUX_SYSINFO_H ++ + #if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_MAC + // Tests in this file assume that off_t-dependent data structures match the + // libc ABI. For example, struct dirent here is what readdir() function (as +@@ -138,12 +141,14 @@ typedef struct user_fpregs elf_fpregset_t; + + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include <glob.h> +-#include <obstack.h> ++# if !SANITIZER_NONGNU ++# include <obstack.h> ++# endif + #include <mqueue.h> +-#include <net/if_ppp.h> +-#include <netax25/ax25.h> +-#include <netipx/ipx.h> +-#include <netrom/netrom.h> ++#include <linux/if_ppp.h> ++#include <linux/ax25.h> ++#include <linux/ipx.h> ++#include <linux/netrom.h> + #if HAVE_RPC_XDR_H + # include <rpc/xdr.h> + #elif HAVE_TIRPC_RPC_XDR_H +@@ -251,7 +256,7 @@ namespace __sanitizer { + unsigned struct_itimerspec_sz = sizeof(struct itimerspec); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + // Use pre-computed size of struct ustat to avoid <sys/ustat.h> which + // has been removed from glibc 2.28. + #if defined(__aarch64__) || defined(__s390x__) || defined (__mips64) \ +@@ -322,7 +327,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr)); + unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + #endif + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int glob_nomatch = GLOB_NOMATCH; + int glob_altdirfunc = GLOB_ALTDIRFUNC; + #endif +@@ -416,7 +421,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_termios_sz = sizeof(struct termios); + unsigned struct_winsize_sz = sizeof(struct winsize); + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + unsigned struct_arpreq_sz = sizeof(struct arpreq); + unsigned struct_cdrom_msf_sz = sizeof(struct cdrom_msf); + unsigned struct_cdrom_multisession_sz = sizeof(struct cdrom_multisession); +@@ -466,7 +471,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned struct_vt_mode_sz = sizeof(struct vt_mode); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct); + unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor); + #if EV_VERSION > (0x010000) +@@ -834,7 +839,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr); + unsigned IOCTL_VT_WAITACTIVE = VT_WAITACTIVE; + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH; + unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT; + unsigned IOCTL_CYGETMON = CYGETMON; +@@ -989,7 +994,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phdr); + CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum); + #endif // SANITIZER_LINUX || SANITIZER_FREEBSD + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(glob_t); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc); + CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv); +@@ -1023,6 +1028,7 @@ CHECK_TYPE_SIZE(iovec); + CHECK_SIZE_AND_OFFSET(iovec, iov_base); + CHECK_SIZE_AND_OFFSET(iovec, iov_len); + ++#if !SANITIZER_NONGNU + CHECK_TYPE_SIZE(msghdr); + CHECK_SIZE_AND_OFFSET(msghdr, msg_name); + CHECK_SIZE_AND_OFFSET(msghdr, msg_namelen); +@@ -1036,6 +1042,7 @@ CHECK_TYPE_SIZE(cmsghdr); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level); + CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type); ++#endif + + #ifndef __GLIBC_PREREQ + #define __GLIBC_PREREQ(x, y) 0 +@@ -1145,7 +1152,7 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_passno); + + CHECK_TYPE_SIZE(ether_addr); + +-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID ++#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_NONGNU + CHECK_TYPE_SIZE(ipc_perm); + # if SANITIZER_FREEBSD + CHECK_SIZE_AND_OFFSET(ipc_perm, key); +@@ -1206,7 +1213,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr); + CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_data); + #endif + +-#if SANITIZER_LINUX ++#if SANITIZER_LINUX && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_mallinfo) == sizeof(struct mallinfo)); + #endif + +@@ -1256,7 +1263,7 @@ COMPILER_CHECK(__sanitizer_XDR_DECODE == XDR_DECODE); + COMPILER_CHECK(__sanitizer_XDR_FREE == XDR_FREE); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer_FILE) <= sizeof(FILE)); + CHECK_SIZE_AND_OFFSET(FILE, _flags); + CHECK_SIZE_AND_OFFSET(FILE, _IO_read_ptr); +@@ -1275,7 +1282,7 @@ CHECK_SIZE_AND_OFFSET(FILE, _chain); + CHECK_SIZE_AND_OFFSET(FILE, _fileno); + #endif + +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + COMPILER_CHECK(sizeof(__sanitizer__obstack_chunk) <= sizeof(_obstack_chunk)); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, limit); + CHECK_SIZE_AND_OFFSET(_obstack_chunk, prev); +diff --git a/lib/tsan/rtl/tsan_platform_linux.cc b/lib/tsan/rtl/tsan_platform_linux.cc +index de989b780..51a97b554 100644 +--- a/lib/tsan/rtl/tsan_platform_linux.cc ++++ b/lib/tsan/rtl/tsan_platform_linux.cc +@@ -294,7 +294,7 @@ void InitializePlatform() { + // This is required to properly "close" the fds, because we do not see internal + // closes within glibc. The code is a pure hack. + int ExtractResolvFDs(void *state, int *fds, int nfd) { +-#if SANITIZER_LINUX && !SANITIZER_ANDROID ++#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_NONGNU + int cnt = 0; + struct __res_state *statp = (struct __res_state*)state; + for (int i = 0; i < MAXNS && cnt < nfd; i++) { +-- +2.19.0 + diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index b2fa8fba0dd..a3b320c384f 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -2,12 +2,11 @@ enableX11 ? false, xlibsWrapper ? null }: let - version = "9.2"; + version = "10.1.10"; bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); arch = if stdenv.isi686 then "-i386" - else if stdenv.isx86_64 then "-x86-64" - else ""; + else "-x86-64"; in stdenv.mkDerivation { name = if enableX11 then "mit-scheme-x11-${version}" else "mit-scheme-${version}"; @@ -20,14 +19,10 @@ stdenv.mkDerivation { if stdenv.isi686 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; - sha256 = "1fmlpnhf5a75db93phajh4ysbdgrgl72v45lk3kznriprl0a7jc6"; - } else if stdenv.isx86_64 - then fetchurl { + sha256 = "117lf06vcdbaa5432hwqnskpywc6x8ai0gj99h480a4wzkp3vhy6"; + } else fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; - sha256 = "1skzxxhr0iq96bf0j5m7mvf3i4sppfyfa6gpqn34mwgkw1fx8274"; - } else fetchurl { - url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; - sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"; + sha256 = "1rljv6iddrbssm91c0nn08myj92af36hkix88cc6qwq38xsxs52g"; }; buildInputs = if enableX11 then [xlibsWrapper] else []; diff --git a/pkgs/development/compilers/nextpnr/default.nix b/pkgs/development/compilers/nextpnr/default.nix index dc8f750c567..5dfefa61220 100644 --- a/pkgs/development/compilers/nextpnr/default.nix +++ b/pkgs/development/compilers/nextpnr/default.nix @@ -14,14 +14,14 @@ let in with stdenv; mkDerivation rec { pname = "nextpnr"; - version = "2020.07.08"; + version = "2020.08.22"; srcs = [ (fetchFromGitHub { owner = "YosysHQ"; repo = "nextpnr"; - rev = "3cafb16aa634d2bc369077d8d36760d23973a35b"; - sha256 = "0z6q8f2f97jr037d51h097vck9jspidjn0pb5irlj0xdnb5si0js"; + rev = "c8ecb8341ca766e1e7565cc2b652b63eaba67508"; + sha256 = "1cf9ad7w5x452qdc6m9c3in6v9yzip3n1as978lbdh76f5mc00fv"; name = "nextpnr"; }) (fetchFromGitHub { diff --git a/pkgs/development/compilers/ocaml/4.11.nix b/pkgs/development/compilers/ocaml/4.11.nix index 74e3d354f12..afda8592818 100644 --- a/pkgs/development/compilers/ocaml/4.11.nix +++ b/pkgs/development/compilers/ocaml/4.11.nix @@ -1,6 +1,6 @@ import ./generic.nix { major_version = "4"; minor_version = "11"; - patch_version = "0+beta3"; - sha256 = "18lpgirxil00pgy805cyi97v6ycmg93sdvbkc60i35ili030v1f7"; + patch_version = "1"; + sha256 = "0k4521c0p10c5ams6vjv5qkkjhmpkb0bfn04llcz46ah0f3r2jpa"; } diff --git a/pkgs/development/compilers/openjdk/openjfx/14.nix b/pkgs/development/compilers/openjdk/openjfx/14.nix index 04bb1fa5627..22b5be7dc69 100644 --- a/pkgs/development/compilers/openjdk/openjfx/14.nix +++ b/pkgs/development/compilers/openjdk/openjfx/14.nix @@ -96,7 +96,7 @@ in makePackage { postFixup = '' # Remove references to bootstrap. find "$out" -name \*.so | while read lib; do - new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${openjdk11_headless}[^:]*,,')" + new_refs="$(patchelf --print-rpath "$lib" | sed -E 's,:?${lib.escape ["+"] openjdk11_headless.outPath}[^:]*,,')" patchelf --set-rpath "$new_refs" "$lib" done ''; diff --git a/pkgs/development/compilers/rust/1_45.nix b/pkgs/development/compilers/rust/1_45.nix index c72292679e5..1a634d3f51e 100644 --- a/pkgs/development/compilers/rust/1_45.nix +++ b/pkgs/development/compilers/rust/1_45.nix @@ -16,8 +16,8 @@ } @ args: import ./default.nix { - rustcVersion = "1.45.0"; - rustcSha256 = "0z6dh0yd3fcm3qh960wi4s6fa6pxz9mh77psycsqfkkx5kqra15s"; + rustcVersion = "1.45.2"; + rustcSha256 = "0273a1g3f59plyi1n0azf21qjzwml1yqdnj5z472crz37qggr8xp"; # Note: the version MUST be one version prior to the version we're # building diff --git a/pkgs/development/compilers/sagittarius-scheme/default.nix b/pkgs/development/compilers/sagittarius-scheme/default.nix index 4b1358b7247..dcc3457fe11 100644 --- a/pkgs/development/compilers/sagittarius-scheme/default.nix +++ b/pkgs/development/compilers/sagittarius-scheme/default.nix @@ -16,10 +16,10 @@ let platformLdLibraryPath = if stdenv.isDarwin then "DYLD_FALLBACK_LIBRARY_PATH" in stdenv.mkDerivation rec { pname = "sagittarius-scheme"; - version = "0.9.6"; + version = "0.9.7"; src = fetchurl { url = "https://bitbucket.org/ktakashi/${pname}/downloads/sagittarius-${version}.tar.gz"; - sha256 = "03nvvvfd4gdlvq244zpnikxxajp6w8jj3ymw4bcq83x7zilb2imr"; + sha256 = "18pjj6f5qvixv5hbl1k4d3jqfcmi9qyx0gz0cjwrzpxa8brpwld8"; }; preBuild = '' # since we lack rpath during build, need to explicitly add build path diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 7d645da8b4b..c3185ca4e0e 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yosys"; - version = "2020.07.07"; + version = "2020.08.22"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; - rev = "000fd08198487cd1d36e65e4470f4b0269c23a2b"; - sha256 = "01s252vwh4g1f4y99nfrkpf6hgvh9k63nz8hvpmjza5z8x6zf4i1"; + rev = "12132b6850747aec99715fdfa3184fe3ebefa015"; + sha256 = "1v6x1y2f3r8vi7pnkgx374rrv02xgmg9yg23f61n7d1v2rd6y5cc"; }; enableParallelBuilding = true; diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix index e58e51c63ae..230320671a7 100644 --- a/pkgs/development/coq-modules/coq-elpi/default.nix +++ b/pkgs/development/coq-modules/coq-elpi/default.nix @@ -2,14 +2,14 @@ let params = { "8.11" = rec { - version = "1.5.0"; + version = "1.6.0_8.11"; rev = "v${version}"; - sha256 = "0dlw869j6ib58i8fhbr7x3hq2cy088arihhfanv8i08djqml6g8x"; + sha256 = "0ahxjnzmd7kl3gl38kyjqzkfgllncr2ybnw8bvgrc6iddgga7bpq"; }; "8.12" = rec { - version = "1.5.1"; + version = "1.6.0"; rev = "v${version}"; - sha256 = "1znjc8c8rivsawmz5bgm9ddl69p62p2pwxphvpap1gfmi5cp8lwi"; + sha256 = "0kf99i43mlf750fr7fric764mm495a53mg5kahnbp6zcjcxxrm0b"; }; }; param = params.${coq.coq-version}; diff --git a/pkgs/development/coq-modules/dpdgraph/default.nix b/pkgs/development/coq-modules/dpdgraph/default.nix index 689745003df..54654f37bac 100644 --- a/pkgs/development/coq-modules/dpdgraph/default.nix +++ b/pkgs/development/coq-modules/dpdgraph/default.nix @@ -1,6 +1,10 @@ { stdenv, fetchFromGitHub, autoreconfHook, coq }: let params = { + "8.12" = { + version = "0.6.8"; + sha256 = "1mj6sknsd53xfb387sp3kdwvl4wn80ck24bfzf3s6mgw1a12vyps"; + }; "8.11" = { version = "0.6.7"; sha256 = "01vpi7scvkl4ls1z2k2x9zd65wflzb667idj759859hlz3ps9z09"; diff --git a/pkgs/development/coq-modules/gappalib/default.nix b/pkgs/development/coq-modules/gappalib/default.nix index eb431b9faf2..f6109398da8 100644 --- a/pkgs/development/coq-modules/gappalib/default.nix +++ b/pkgs/development/coq-modules/gappalib/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, which, coq, flocq }: stdenv.mkDerivation { - name = "coq${coq.coq-version}-gappalib-1.4.3"; + name = "coq${coq.coq-version}-gappalib-1.4.4"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/file/38302/gappalib-coq-1.4.3.tar.gz"; - sha256 = "108k9dks04wbcqz38pf0zz11hz5imbzimpnkgjrk5gp1hifih370"; + url = "https://gforge.inria.fr/frs/download.php/file/38338/gappalib-coq-1.4.4.tar.gz"; + sha256 = "1ds9qp3ml07w5ali0rsczlwgdx4xcgasgbcnpi2lssgj1xpxgfpn"; }; nativeBuildInputs = [ which ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; passthru = { - compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" ]; + compatibleCoqVersions = stdenv.lib.flip builtins.elem [ "8.8" "8.9" "8.10" "8.11" "8.12" ]; }; } diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 402c3e781ad..7db4992d1d6 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -235,7 +235,7 @@ let ''; preFixup = (args.preFixup or "") + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; diff --git a/pkgs/development/go-packages/generic/default.nix b/pkgs/development/go-packages/generic/default.nix index 54d1c743bee..de0a35b6934 100644 --- a/pkgs/development/go-packages/generic/default.nix +++ b/pkgs/development/go-packages/generic/default.nix @@ -211,7 +211,7 @@ let ''; preFixup = preFixup + '' - find $out/bin -type f -exec ${removeExpr removeReferences} '{}' + || true + find $out/{bin,libexec,lib} -type f 2>/dev/null | xargs -r ${removeExpr removeReferences} || true ''; strictDeps = true; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 54c4e7c5465..676af26adab 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -375,6 +375,7 @@ self: super: { tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; translatable-intset = dontCheck super.translatable-intset; + trifecta = if pkgs.stdenv.hostPlatform.isAarch64 then dontCheck super.trifecta else super.trifecta; # affected by this bug https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295461 ua-parser = dontCheck super.ua-parser; unagi-chan = dontCheck super.unagi-chan; wai-logger = dontCheck super.wai-logger; @@ -920,7 +921,12 @@ self: super: { # Generate cli completions for dhall. dhall = generateOptparseApplicativeCompletion "dhall" super.dhall; dhall-json = generateOptparseApplicativeCompletions ["dhall-to-json" "dhall-to-yaml"] super.dhall-json; - dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" (super.dhall-nix); + dhall-nix = generateOptparseApplicativeCompletion "dhall-to-nix" ( + super.dhall-nix.overrideScope (self: super: { + dhall = super.dhall_1_34_0; + repline = self.repline_0_4_0_0; + haskeline = self.haskeline_0_8_1_0; + })); # https://github.com/haskell-hvr/netrc/pull/2#issuecomment-469526558 netrc = doJailbreak super.netrc; @@ -972,6 +978,9 @@ self: super: { # Generate shell completions generateOptparseApplicativeCompletion "purs" dontHaddockPurescript; + # Generate shell completion for spago + spago = generateOptparseApplicativeCompletion "spago" super.spago; + # 2020-06-05: HACK: Package can not pass test suite, # Upstream Report: https://github.com/kcsongor/generic-lens/issues/83 generic-lens = dontCheck super.generic-lens; @@ -1152,13 +1161,6 @@ self: super: { # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 binary-instances = dontCheck super.binary-instances; - # Disabling the test suite lets the build succeed on older CPUs - # that are unable to run the generated library because they - # lack support for AES-NI, like some of our Hydra build slaves - # do. See https://github.com/NixOS/nixpkgs/issues/81915 for - # details. - cryptonite = dontCheck super.cryptonite; - # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; @@ -1330,6 +1332,12 @@ self: super: { # https://github.com/ennocramer/monad-dijkstra/issues/4 monad-dijkstra = dontCheck (doJailbreak super.monad-dijkstra); + # Fixed upstream but not released to Hackage yet: + # https://github.com/k0001/hs-libsodium/issues/2 + libsodium = overrideCabal super.libsodium (drv: { + libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.c2hs]; + }); + # https://github.com/kowainik/policeman/issues/57 policeman = doJailbreak super.policeman; @@ -1412,12 +1420,12 @@ self: super: { }); # Testsuite trying to run `which haskeline-examples-Test` - haskeline_0_8_0_0 = dontCheck super.haskeline_0_8_0_0; + haskeline_0_8_1_0 = dontCheck super.haskeline_0_8_1_0; # Requires repline 0.4 which is the default only for ghc8101, override for the rest zre = super.zre.override { repline = self.repline_0_4_0_0.override { - haskeline = self.haskeline_0_8_0_0; + haskeline = self.haskeline_0_8_1_0; }; }; @@ -1438,26 +1446,35 @@ self: super: { # Tests rely on `Int` being 64-bit: https://github.com/hspec/hspec/issues/431. # Also, we need QuickCheck-2.14.x to build the test suite, which isn't easy in LTS-16.x. - # So let's not go there any just disable the tests altogether. + # So let's not go there and just disable the tests altogether. hspec-core = dontCheck super.hspec-core; + # github.com/ucsd-progsys/liquidhaskell/issues/1729 + liquidhaskell = super.liquidhaskell.override { Diff = self.Diff_0_3_4; }; + Diff_0_3_4 = dontCheck super.Diff_0_3_4; + + # We want the latest version of cryptonite. This is a first step towards + # resolving https://github.com/NixOS/nixpkgs/issues/81915. + cryptonite = self.cryptonite_0_27; + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let hlsScopeOverride = self: super: { # haskell-language-server uses its own fork of ghcide # Test disabled: it seems to freeze (is it just that it takes a long time ?) - ghcide = dontCheck self.hls-ghcide; + ghcide = dontCheck super.hls-ghcide; # we are faster than stack here - hie-bios = dontCheck self.hie-bios_0_6_2; - lsp-test = dontCheck self.lsp-test_0_11_0_4; + hie-bios = dontCheck super.hie-bios_0_7_0; + lsp-test = dontCheck super.lsp-test_0_11_0_4; # fourmolu can‘t compile with an older aeson aeson = dontCheck super.aeson_1_5_2_0; # brittany has an aeson upper bound of 1.5 brittany = doJailbreak super.brittany; }; in { - haskell-language-server = dontCheck (super.haskell-language-server.overrideScope hlsScopeOverride); + # jailbreaking for hie-bios 0.7.0 (upstream PR: https://github.com/haskell/haskell-language-server/pull/357) + haskell-language-server = dontCheck (doJailbreak (super.haskell-language-server.overrideScope hlsScopeOverride)); hls-ghcide = dontCheck (super.hls-ghcide.overrideScope hlsScopeOverride); fourmolu = super.fourmolu.overrideScope hlsScopeOverride; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index f2dd8942b8c..5fcff7d9df9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -62,14 +62,16 @@ self: super: { # Jailbreak to fix the build. base-noprelude = doJailbreak super.base-noprelude; - pandoc = doJailbreak super.pandoc; system-fileio = doJailbreak super.system-fileio; unliftio-core = doJailbreak super.unliftio-core; # Use the latest version to fix the build. dhall = self.dhall_1_34_0; lens = self.lens_4_19_2; + optics = self.optics_0_3; optics-core = self.optics-core_0_3_0_1; + optics-extra = self.optics-extra_0_3; + optics-th = self.optics-th_0_3_0_2; repline = self.repline_0_4_0_0; singletons = self.singletons_2_7; th-desugar = self.th-desugar_1_11; @@ -117,4 +119,10 @@ self: super: { executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; })); + # We want the latest version of Pandoc. + pandoc = self.pandoc_2_10_1; + pandoc-citeproc = self.pandoc-citeproc_0_17_0_2; + pandoc-plot = self.pandoc-plot_0_9_2_0; + pandoc-types = self.pandoc-types_1_21; + } diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index a9b0b88eaef..82dbdcf9334 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -64,7 +64,7 @@ core-packages: # # WARNING: This list is generated semiautomatically based on the most recent # LTS package set. If you want to add entries to it, you must do so before the -# comment saying "# LTS Haskell x.y". Any changes after that commend will be +# comment saying "# LTS Haskell x.y". Any changes after that comment will be # lost the next time `update-stackage.sh` runs. default-package-overrides: # This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.10 + # LTS Haskell 16.11 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -207,7 +207,7 @@ default-package-overrides: - amazonka-workspaces ==1.6.1 - amazonka-xray ==1.6.1 - amqp ==0.20.0 - - amqp-utils ==0.4.4.0 + - amqp-utils ==0.4.4.1 - annotated-wl-pprint ==0.7.0 - ansi-terminal ==0.10.3 - ansi-wl-pprint ==0.6.9 @@ -262,7 +262,7 @@ default-package-overrides: - attoparsec-path ==0.0.0.1 - audacity ==0.0.2 - aur ==7.0.3 - - aura ==3.1.7 + - aura ==3.1.8 - authenticate ==1.3.5 - authenticate-oauth ==1.6.0.1 - auto ==0.4.3.1 @@ -366,7 +366,7 @@ default-package-overrides: - bv ==0.5 - bv-little ==1.1.1 - byteable ==0.1.1 - - byte-count-reader ==0.10.0.1 + - byte-count-reader ==0.10.1.1 - bytedump ==1.0 - byte-order ==0.1.2.0 - byteorder ==1.0.4 @@ -760,7 +760,7 @@ default-package-overrides: - extended-reals ==0.2.4.0 - extensible-effects ==5.0.0.1 - extensible-exceptions ==0.1.1.4 - - extra ==1.7.5 + - extra ==1.7.6 - extractable-singleton ==0.0.1 - extrapolate ==0.4.2 - fail ==4.9.0.0 @@ -808,7 +808,7 @@ default-package-overrides: - floatshow ==0.2.4 - flow ==1.0.21 - flush-queue ==1.0.0 - - fmlist ==0.9.3 + - fmlist ==0.9.4 - fmt ==0.6.1.2 - fn ==0.3.0.2 - focus ==1.0.1.3 @@ -1277,7 +1277,7 @@ default-package-overrides: - jwt ==0.10.0 - kan-extensions ==5.2 - kanji ==3.4.1 - - katip ==0.8.4.0 + - katip ==0.8.5.0 - kawhi ==0.3.0 - kazura-queue ==0.1.0.4 - kdt ==0.2.4 @@ -1348,7 +1348,7 @@ default-package-overrides: - linux-file-extents ==0.2.0.0 - linux-namespaces ==0.1.3.0 - List ==0.6.2 - - ListLike ==4.7.1 + - ListLike ==4.7.2 - list-predicate ==0.1.0.1 - listsafe ==0.1.0.1 - list-singleton ==1.0.0.4 @@ -1433,7 +1433,7 @@ default-package-overrides: - midi ==0.2.2.2 - mighty-metropolis ==2.0.0 - mime-mail ==0.5.0 - - mime-mail-ses ==0.4.1 + - mime-mail-ses ==0.4.2 - mime-types ==0.1.0.9 - mini-egison ==1.0.0 - minimal-configuration ==0.1.4 @@ -1558,7 +1558,7 @@ default-package-overrides: - nonce ==1.0.7 - nondeterminism ==1.4 - non-empty ==0.3.2 - - nonempty-containers ==0.3.4.0 + - nonempty-containers ==0.3.4.1 - nonemptymap ==0.0.6.0 - non-empty-sequence ==0.2.0.4 - nonempty-vector ==0.2.0.2 @@ -1613,7 +1613,7 @@ default-package-overrides: - options ==1.2.1.1 - optparse-applicative ==0.15.1.0 - optparse-generic ==1.3.1 - - optparse-simple ==0.1.1.2 + - optparse-simple ==0.1.1.3 - optparse-text ==0.1.1.0 - ordered-containers ==0.2.2 - ormolu ==0.1.2.0 @@ -1859,7 +1859,7 @@ default-package-overrides: - regex-posix ==0.96.0.0 - regex-tdfa ==1.3.1.0 - regex-with-pcre ==1.1.0.0 - - registry ==0.1.9.1 + - registry ==0.1.9.3 - reinterpret-cast ==0.1.0 - relapse ==1.0.0.0 - relational-query ==0.12.2.3 @@ -1902,7 +1902,7 @@ default-package-overrides: - safe ==0.3.19 - safecopy ==0.10.3 - safe-decimal ==0.2.0.0 - - safe-exceptions ==0.1.7.0 + - safe-exceptions ==0.1.7.1 - safe-exceptions-checked ==0.1.0 - safe-foldable ==0.1.0.0 - safeio ==0.0.5.0 @@ -1978,7 +1978,7 @@ default-package-overrides: - servant-purescript ==0.10.0.0 - servant-rawm ==0.3.2.0 - servant-server ==0.16.2 - - servant-static-th ==0.2.3.0 + - servant-static-th ==0.2.4.0 - servant-subscriber ==0.7.0.0 - servant-swagger ==1.1.7.1 - servant-swagger-ui ==0.3.4.3.23.11 @@ -2328,7 +2328,7 @@ default-package-overrides: - unexceptionalio-trans ==0.5.1 - unicode ==0.0.1.1 - unicode-show ==0.1.0.4 - - unicode-transforms ==0.3.6 + - unicode-transforms ==0.3.7 - unification-fd ==0.10.0.1 - union-find ==0.2 - uniplate ==1.6.12 @@ -2395,7 +2395,7 @@ default-package-overrides: - vector-instances ==3.4 - vector-mmap ==0.0.3 - vector-rotcev ==0.1.0.0 - - vector-sized ==1.4.1.0 + - vector-sized ==1.4.2 - vector-space ==0.16 - vector-split ==1.0.0.2 - vector-th-unbox ==0.2.1.7 @@ -2498,7 +2498,7 @@ default-package-overrides: - xss-sanitize ==0.3.6 - xturtle ==0.2.0.0 - xxhash-ffi ==0.2.0.0 - - yaml ==0.11.4.0 + - yaml ==0.11.5.0 - yamlparse-applicative ==0.1.0.1 - yesod ==1.6.1.0 - yesod-auth ==1.6.10 @@ -2560,12 +2560,13 @@ extra-packages: - dbus <1 # for xmonad-0.26 - deepseq == 1.3.0.1 # required to build Cabal with GHC 6.12.3 - dhall == 1.29.0 # required for spago 0.14.0. + - Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729 - doctemplates == 0.8 # required by pandoc-2.9.x - - gi-gdk == 3.0.23 # required for gi-pango 1.0.23 - - gi-gtk == 3.0.35 # required for gi-pango 1.0.23 - generic-deriving == 1.10.5.* # new versions don't compile with GHC 7.10.x - ghc-check == 0.3.0.1 # only version compatible with ghcide 0.2.0 - ghc-tcplugins-extra ==0.3.2 # required for polysemy-plugin 0.2.5.0 + - gi-gdk == 3.0.23 # required for gi-pango 1.0.23 + - gi-gtk == 3.0.35 # required for gi-pango 1.0.23 - gloss < 1.9.3 # new versions don't compile with GHC 7.8.x - haddock == 2.22.* # required on GHC 8.0.x - haddock == 2.23.* # required on GHC < 8.10.x @@ -2579,9 +2580,9 @@ extra-packages: - haskell-src-exts == 1.19.* # required by hindent and structured-haskell-mode - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hoogle == 5.0.14 # required by hie-hoogle + - hslua == 1.1.2 # required for pandoc 2.10 - html-conduit ^>= 1.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - http-conduit ^>= 2.2 # pre-lts-11.x versions neeed by git-annex 6.20180227 - - hslua == 1.1.2 # required for pandoc 2.10 - inline-c < 0.6 # required on GHC 8.0.x - inline-c-cpp < 0.2 # required on GHC 8.0.x - lens-labels == 0.1.* # required for proto-lens-descriptors @@ -2604,6 +2605,7 @@ extra-packages: - resourcet ==1.1.* # pre-lts-11.x versions neeed by git-annex 6.20180227 - seqid < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x - seqid-streams < 0.2 # newer versions depend on transformers 0.4.x which we cannot provide in GHC 7.8.x + - shelly ==1.8.1 # ghcjs depends on shelly < 1.9 - split < 0.2 # newer versions don't work with GHC 6.12.3 - tar < 0.4.2.0 # later versions don't work with GHC < 7.6.x - transformers == 0.4.3.* # the latest version isn't supported by mtl yet @@ -2756,17 +2758,26 @@ dont-distribute-packages: - accelerate-examples - accelerate-fft - accelerate-fourier-benchmark + - accelerate-io-array + - accelerate-io-bmp + - accelerate-io-bytestring + - accelerate-io-cereal + - accelerate-io-JuicyPixels + - accelerate-io-repa + - accelerate-io-vector - accelerate-llvm-ptx - bindings-yices - boolector - ccelerate-cuda + - containers-accelerate - cplex-hs - - cuda # 2020-08-18 because of dependency nvidia-x11 - cublas + - cuda # 2020-08-18 because of dependency nvidia-x11 - cufft - cusolver - cusparse - gloss-raster-accelerate + - hashable-accelerate - libnvvm - matlab - nvvm @@ -3670,6 +3681,7 @@ broken-packages: - cap - Capabilities - capability + - capataz - capnp - capped-list - capri @@ -3959,8 +3971,9 @@ broken-packages: - complexity - compose-trans - composite-aeson + - composite-aeson-path - composite-aeson-refined - - composite-base + - composite-binary - composite-ekg - composite-opaleye - composite-swagger @@ -4292,6 +4305,7 @@ broken-packages: - data-transform - data-type - data-util + - data-validation - data-variant - database-id-groundhog - database-study @@ -4415,7 +4429,6 @@ broken-packages: - dhall-check - dhall-docs - dhall-fly - - dhall-nix - dhall-text - dhall-to-cabal - dhall-yaml @@ -4763,6 +4776,9 @@ broken-packages: - EsounD - espial - ess + - essence-of-live-coding-gloss-example + - essence-of-live-coding-pulse-example + - essence-of-live-coding-warp - estimators - EstProgress - estreps @@ -5322,6 +5338,23 @@ broken-packages: - ghcprofview - ght - gi-cairo-again + - gi-cairo-connector + - gi-cairo-render + - gi-dbusmenu + - gi-dbusmenugtk3 + - gi-gdkx11 + - gi-graphene + - gi-gsk + - gi-gstpbutils + - gi-gsttag + - gi-gtk-declarative + - gi-gtk-declarative-app-simple + - gi-gtk-hs + - gi-gtkosxapplication + - gi-handy + - gi-poppler + - gi-wnck + - gi-xlib - giak - Gifcurry - ginsu @@ -5402,6 +5435,7 @@ broken-packages: - gloss-sodium - glpk-headers - glpk-hs + - gltf-codec - glue - GLUtil - gmap @@ -5793,6 +5827,7 @@ broken-packages: - haskell-src-exts-prisms - haskell-src-exts-qq - haskell-src-exts-sc + - haskell-src-match - haskell-src-meta-mwotton - haskell-stack-trace-plugin - haskell-token-utils @@ -5876,6 +5911,7 @@ broken-packages: - haskore-supercollider - haskore-synthesizer - HaskRel + - haskseg - hasktorch - hasktorch-codegen - hasktorch-ffi-th @@ -6959,6 +6995,7 @@ broken-packages: - jsonsql - jsontsv - jsonxlsx + - jsop - jspath - juandelacosa - judge @@ -7060,6 +7097,7 @@ broken-packages: - ks-test - KSP - ktx + - ktx-codec - kubernetes-client - kubernetes-client-core - kuifje @@ -7248,6 +7286,7 @@ broken-packages: - libconfig - libcspm - libexpect + - libfuse3 - libGenI - libhbb - libinfluxdb @@ -7265,7 +7304,6 @@ broken-packages: - libraft - librandomorg - librato - - libsodium - libssh2 - libssh2-conduit - libsystemd-daemon @@ -7324,17 +7362,6 @@ broken-packages: - lio-fs - lio-simple - lipsum-gen - - liquid - - liquid-base - - liquid-bytestring - - liquid-containers - - liquid-fixpoint - - liquid-ghc-prim - - liquid-parallel - - liquid-platform - - liquid-prelude - - liquid-vector - - liquidhaskell - liquidhaskell-cabal - Liquorice - list-fusion-probe @@ -7403,6 +7430,7 @@ broken-packages: - log4hs - logentries - logger + - logging-effect - logging-effect-extra - logging-effect-extra-file - logging-effect-extra-handler @@ -7475,6 +7503,7 @@ broken-packages: - lye - Lykah - lz4-conduit + - lz4-frame-conduit - lzma-enumerator - lzma-streams - lzo @@ -7691,6 +7720,7 @@ broken-packages: - ministg - minst-idx - mios + - MIP - mirror-tweet - misfortune - miso-action-logger @@ -7733,6 +7763,7 @@ broken-packages: - monad-atom - monad-atom-simple - monad-branch + - monad-classes-logging - monad-exception - monad-finally - monad-fork @@ -7922,6 +7953,7 @@ broken-packages: - mvc - mvc-updates - mvclient + - mwc-probability-transition - mwc-random-accelerate - mxnet - mxnet-dataiter @@ -8605,6 +8637,7 @@ broken-packages: - polydata - polydata-core - polynomial + - polysemy-http - polysemy-optics - polysemy-RandomFu - polysemy-webserver @@ -8702,6 +8735,7 @@ broken-packages: - pretty-ghci - pretty-ncols - prettyprinter-graphviz + - prettyprinter-lucid - prettyprinter-vty - preview - prim @@ -9257,6 +9291,7 @@ broken-packages: - ruler - ruler-core - rungekutta + - runhs - runmany - runtime-arbitrary - rvar @@ -9530,6 +9565,7 @@ broken-packages: - shadower - shake-bindist - shake-cabal-build + - shake-dhall - shake-extras - shake-minify - shake-pack @@ -9805,6 +9841,7 @@ broken-packages: - spanout - sparkle - sparrow + - spars - sparse - sparse-lin-alg - sparsebit @@ -10045,6 +10082,7 @@ broken-packages: - superconstraints - superevent - supermonad + - supernova - supero - supervisor - supervisors @@ -10218,7 +10256,6 @@ broken-packages: - termbox-bindings - terminal-text - termination-combinators - - termonad - termplot - terntup - terrahs @@ -10656,6 +10693,7 @@ broken-packages: - uri-parse - uri-template - uri-templater + - url-bytes - url-decoders - url-generic - URLb diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 29609e86389..afb0087a028 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -35,7 +35,7 @@ in , enableSharedExecutables ? false , enableSharedLibraries ? (ghc.enableShared or false) , enableDeadCodeElimination ? (!stdenv.isDarwin) # TODO: use -dead_strip for darwin -, enableStaticLibraries ? !stdenv.hostPlatform.isWindows +, enableStaticLibraries ? !(stdenv.hostPlatform.isWindows or stdenv.hostPlatform.isWasm) , enableHsc2hsViaAsm ? stdenv.hostPlatform.isWindows && stdenv.lib.versionAtLeast ghc.version "8.4" , extraLibraries ? [], librarySystemDepends ? [], executableSystemDepends ? [] # On macOS, statically linking against system frameworks is not supported; @@ -90,6 +90,7 @@ assert editedCabalFile != null -> revision != null; # --enable-static does not work on windows. This is a bug in GHC. # --enable-static will pass -staticlib to ghc, which only works for mach-o and elf. assert stdenv.hostPlatform.isWindows -> enableStaticLibraries == false; +assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false; let diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index f2d83c8d9fe..36c45377d97 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -4559,6 +4559,24 @@ self: { broken = true; }) {}; + "Diff_0_3_4" = callPackage + ({ mkDerivation, array, base, directory, pretty, process + , QuickCheck, test-framework, test-framework-quickcheck2 + }: + mkDerivation { + pname = "Diff"; + version = "0.3.4"; + sha256 = "0bqcdvhxx8dmqc3793m6axg813wv9ldz2j37f1wygbbrbbndmdvp"; + libraryHaskellDepends = [ array base pretty ]; + testHaskellDepends = [ + array base directory pretty process QuickCheck test-framework + test-framework-quickcheck2 + ]; + description = "O(ND) diff algorithm in haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "Diff" = callPackage ({ mkDerivation, array, base, directory, pretty, process , QuickCheck, test-framework, test-framework-quickcheck2 @@ -10767,8 +10785,8 @@ self: { ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { pname = "HsOpenSSL-x509-system"; - version = "0.1.0.3"; - sha256 = "14hzjdpv8ld3nw5fcx451w49vq0s8fhs1zh984vpm85b5ypbgp2v"; + version = "0.1.0.4"; + sha256 = "15mp70bqg1lzp971bzp6wym3bwzvxb76hzbgckygbfa722xyymhr"; libraryHaskellDepends = [ base bytestring HsOpenSSL unix ]; description = "Use the system's native CA certificate store with HsOpenSSL"; license = stdenv.lib.licenses.bsd3; @@ -12678,27 +12696,6 @@ self: { }: mkDerivation { pname = "ListLike"; - version = "4.7.1"; - sha256 = "1gccb84fma0plkwjdz8hgqa70a5lr6d9gnw6pfky993555ig29mp"; - libraryHaskellDepends = [ - array base bytestring containers deepseq dlist fmlist text - utf8-string vector - ]; - testHaskellDepends = [ - array base bytestring containers dlist fmlist HUnit QuickCheck - random text utf8-string vector - ]; - description = "Generalized support for list-like structures"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "ListLike_4_7_2" = callPackage - ({ mkDerivation, array, base, bytestring, containers, deepseq - , dlist, fmlist, HUnit, QuickCheck, random, text, utf8-string - , vector - }: - mkDerivation { - pname = "ListLike"; version = "4.7.2"; sha256 = "15c1q4rl4kwpgpsdf4x7k17m2fgzimm9915k71cpjiv0sq9b2rn2"; libraryHaskellDepends = [ @@ -12711,7 +12708,6 @@ self: { ]; description = "Generalized support for list-like structures"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "ListT" = callPackage @@ -13101,6 +13097,8 @@ self: { ]; description = "Library for using Mixed Integer Programming (MIP)"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "MSQueue" = callPackage @@ -13202,14 +13200,12 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "MapWith"; - version = "0.1.0.0"; - sha256 = "1dk5b9bi29917sf3mk3q85iqjkfc7vczwb8x8cg6w6gxfqn0444v"; - revision = "1"; - editedCabalFile = "1zkpqgxh2d1zg087766vixw5j9xh9i9z4vdp5gv87xzhc4ig9qbs"; + version = "0.2.0.0"; + sha256 = "1xkyaj83yblf42qawv4nyi8miaynydd8b3ysx62f9y10bqxk7dja"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; benchmarkHaskellDepends = [ base ]; - description = "mapWith: like fmap, but with additional arguments (isFirst, isLast, etc)"; + description = "mapWith: like fmap, but with additional parameters (isFirst, isLast, etc)"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -20637,8 +20633,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.6"; - sha256 = "1zclpawaa1cx1p58asn7lla4lakkr869qnkdvrypxxqki3406hsz"; + version = "0.3.7"; + sha256 = "1y2dmk60dvk8d9n16in98cmin5ckvdx3knwlfzcs0jl6vyh8n51n"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21325,6 +21321,25 @@ self: { inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11_1_9_2" = callPackage + ({ mkDerivation, base, data-default, libX11, libXext, libXinerama + , libXrandr, libXrender, libXScrnSaver + }: + mkDerivation { + pname = "X11"; + version = "1.9.2"; + sha256 = "013yny4dwbs98kp7245j8dv81h4p1cdwn2rsf2hvhsplg6ixkc05"; + libraryHaskellDepends = [ base data-default ]; + librarySystemDepends = [ + libX11 libXext libXinerama libXrandr libXrender libXScrnSaver + ]; + description = "A binding to the X11 graphics library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: mkDerivation { @@ -22125,25 +22140,26 @@ self: { }) {}; "accelerate" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, base-orphans - , bytestring, Cabal, cabal-doctest, constraints, containers - , cryptonite, deepseq, directory, doctest, exceptions, filepath - , ghc-prim, half, hashable, hashtables, hedgehog, lens, mtl, tasty - , tasty-expected-failure, tasty-hedgehog, tasty-hunit - , template-haskell, terminal-size, transformers, unique, unix + ({ mkDerivation, ansi-terminal, base, base-orphans, bytestring + , Cabal, cabal-doctest, containers, cryptonite, deepseq, directory + , doctest, exceptions, filepath, ghc-prim, half, hashable + , hashtables, hedgehog, lens, mtl, prettyprinter + , prettyprinter-ansi-terminal, primitive, tasty, template-haskell + , terminal-size, text, transformers, unique, unix , unordered-containers, vector }: mkDerivation { pname = "accelerate"; - version = "1.2.0.1"; - sha256 = "0vglmasqgq0h8fvm9z8l2b3sygqvix8vr6c3n357gkr2mpz6gq8h"; + version = "1.3.0.0"; + sha256 = "14md9fbxckgwpbkm7hdj95ny11w5b5cj103r8razg0aw2hgid5sb"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint base base-orphans bytestring - constraints containers cryptonite deepseq directory exceptions - filepath ghc-prim half hashable hashtables hedgehog lens mtl tasty - tasty-expected-failure tasty-hedgehog tasty-hunit template-haskell - terminal-size transformers unique unix unordered-containers vector + ansi-terminal base base-orphans bytestring containers cryptonite + deepseq directory exceptions filepath ghc-prim half hashable + hashtables hedgehog lens mtl prettyprinter + prettyprinter-ansi-terminal primitive tasty template-haskell + terminal-size text transformers unique unix unordered-containers + vector ]; testHaskellDepends = [ base doctest ]; description = "An embedded language for accelerated array processing"; @@ -22173,7 +22189,7 @@ self: { }) {}; "accelerate-bignum" = callPackage - ({ mkDerivation, accelerate, accelerate-io, accelerate-llvm + ({ mkDerivation, accelerate, accelerate-io-vector, accelerate-llvm , accelerate-llvm-native, accelerate-llvm-ptx, base, criterion , ghc-prim, hedgehog, llvm-hs-pure, mwc-random, tasty , tasty-hedgehog, template-haskell, vector, vector-th-unbox @@ -22181,10 +22197,8 @@ self: { }: mkDerivation { pname = "accelerate-bignum"; - version = "0.2.0.0"; - sha256 = "0xhnd39fb17kb7q5z9z8svn8zlv6j1wxrbkv3vij4f1q2hkqkl0p"; - revision = "1"; - editedCabalFile = "0lfsmhky8shyy9xhm0j2as91vrmqqrrn9r0fsv2ljc4xjklg723r"; + version = "0.3.0.0"; + sha256 = "1xwqg3d2qilkfx8wmmhp2qq5cas3pnsrpyli3a9z0yxqamibxh33"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base ghc-prim llvm-hs-pure template-haskell @@ -22194,8 +22208,9 @@ self: { tasty tasty-hedgehog ]; benchmarkHaskellDepends = [ - accelerate accelerate-io accelerate-llvm-native accelerate-llvm-ptx - base criterion mwc-random vector vector-th-unbox wide-word + accelerate accelerate-io-vector accelerate-llvm-native + accelerate-llvm-ptx base criterion mwc-random vector + vector-th-unbox wide-word ]; description = "Fixed-length large integer arithmetic for Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -22211,8 +22226,8 @@ self: { }: mkDerivation { pname = "accelerate-blas"; - version = "0.2.0.1"; - sha256 = "00869y2zrh43sl0rap8bbgnzqdvrrxpc2qhzz0zdfasr3440py6k"; + version = "0.3.0.0"; + sha256 = "1ydym6fxvg1b5vx49r8dnn80spsq42ssbg4v01s1djklks054g7y"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base blas-hs bytestring containers cublas cuda @@ -22305,37 +22320,39 @@ self: { "accelerate-examples" = callPackage ({ mkDerivation, accelerate, accelerate-fft, accelerate-io - , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint, base - , binary, bmp, bytestring, bytestring-lexing, cereal + , accelerate-io-bmp, accelerate-io-repa, accelerate-io-vector + , accelerate-llvm-native, accelerate-llvm-ptx, ansi-wl-pprint + , array, base, binary, bmp, bytestring, bytestring-lexing, cereal , colour-accelerate, containers, criterion, criterion-measurement , directory, fclabels, filepath, gloss, gloss-accelerate , gloss-raster-accelerate, gloss-rendering, HUnit, lens-accelerate - , linear, linear-accelerate, matrix-market-attoparsec, mwc-random - , normaldistribution, QuickCheck, random, repa, repa-io, scientific - , test-framework, test-framework-hunit, test-framework-quickcheck2 - , vector, vector-algorithms + , linear-accelerate, matrix-market-attoparsec, mwc-random + , mwc-random-accelerate, normaldistribution, QuickCheck, random + , repa, repa-io, scientific, test-framework, test-framework-hunit + , test-framework-quickcheck2, vector, vector-algorithms }: mkDerivation { pname = "accelerate-examples"; - version = "1.2.0.1"; - sha256 = "0hzk6zas03yhh8xjjrh772knhbvisl0r6q10y4mcq552bcfd8yvj"; + version = "1.3.0.0"; + sha256 = "145m2bi8bini6z2jg6g99vnsc3m7pqz4dc9l34j8fg40fw65rwi0"; configureFlags = [ "-f-opencl" ]; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ accelerate accelerate-llvm-native accelerate-llvm-ptx ansi-wl-pprint base containers criterion directory fclabels HUnit - linear mwc-random QuickCheck test-framework test-framework-hunit + QuickCheck test-framework test-framework-hunit test-framework-quickcheck2 ]; executableHaskellDepends = [ - accelerate accelerate-fft accelerate-io base binary bmp bytestring - bytestring-lexing cereal colour-accelerate containers criterion - criterion-measurement directory fclabels filepath gloss + accelerate accelerate-fft accelerate-io accelerate-io-bmp + accelerate-io-repa accelerate-io-vector array base binary bmp + bytestring bytestring-lexing cereal colour-accelerate containers + criterion criterion-measurement directory fclabels filepath gloss gloss-accelerate gloss-raster-accelerate gloss-rendering lens-accelerate linear-accelerate matrix-market-attoparsec - mwc-random normaldistribution random repa repa-io scientific vector - vector-algorithms + mwc-random mwc-random-accelerate normaldistribution random repa + repa-io scientific vector vector-algorithms ]; description = "Examples using the Accelerate library"; license = stdenv.lib.licenses.bsd3; @@ -22351,10 +22368,8 @@ self: { }: mkDerivation { pname = "accelerate-fft"; - version = "1.2.0.0"; - sha256 = "19p9d59vdd3nq97xjprlb6fz2ajlk6gl37cdyvrm9inag4nnk6lp"; - revision = "2"; - editedCabalFile = "096vhbwbkyvjx8znjqnb3lz43kzqq0x7kcfv1gmmbjjrcmwaj2y5"; + version = "1.3.0.0"; + sha256 = "1a7cwzbs8r3rvaymrq2kfx83lqb3i7wz0gmz3ppz59f40rxn974x"; libraryHaskellDepends = [ accelerate accelerate-llvm accelerate-llvm-native accelerate-llvm-ptx base bytestring carray containers cuda cufft @@ -22433,25 +22448,119 @@ self: { }) {}; "accelerate-io" = callPackage - ({ mkDerivation, accelerate, array, base, bmp, bytestring, hedgehog - , primitive, repa, tasty, tasty-hedgehog, vector - }: + ({ mkDerivation, accelerate, base }: mkDerivation { pname = "accelerate-io"; - version = "1.2.0.0"; - sha256 = "13pqqsd5pbxmgsxnp9w141mnwscnlmbhxaz6f5jx4ssipnma2pwf"; - revision = "2"; - editedCabalFile = "0w8y40p71c6c7cj49n4kanwmsa53s2nydigiiidqp93yxhw0virq"; + version = "1.3.0.0"; + sha256 = "048md40pfacxa1mbzncybxzwp9fzmsaq8i94pd8ai677n2zyw5cg"; + libraryHaskellDepends = [ accelerate base ]; + description = "Convert between Accelerate arrays and raw pointers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "accelerate-io-JuicyPixels" = callPackage + ({ mkDerivation, accelerate, accelerate-io-vector, base + , JuicyPixels, vector + }: + mkDerivation { + pname = "accelerate-io-JuicyPixels"; + version = "0.1.0.0"; + sha256 = "0rr43lwmc16r99si1s4nimxxydlsxb6ck45absrxy6vnkln7x185"; libraryHaskellDepends = [ - accelerate array base bmp bytestring primitive repa vector + accelerate accelerate-io-vector base JuicyPixels vector ]; + description = "Convert between Accelerate arrays and JuicyPixels images"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-array" = callPackage + ({ mkDerivation, accelerate, array, base, hedgehog, primitive + , tasty, tasty-hedgehog + }: + mkDerivation { + pname = "accelerate-io-array"; + version = "0.1.0.0"; + sha256 = "1gcxd4m3h1xr8ia8z7c8sxznm90h2q3mzwhi5vsv8s1gh7sdym9m"; + libraryHaskellDepends = [ accelerate array base primitive ]; testHaskellDepends = [ - accelerate array base hedgehog tasty tasty-hedgehog vector + accelerate array base hedgehog tasty tasty-hedgehog ]; - description = "Read and write Accelerate arrays in various formats"; + description = "Convert between Accelerate and array"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-bmp" = callPackage + ({ mkDerivation, accelerate, accelerate-io-bytestring, base, bmp }: + mkDerivation { + pname = "accelerate-io-bmp"; + version = "0.1.0.0"; + sha256 = "0x7bkn4j7s9dzlfk4q1lh6fyd4bir1zkm4x37c65nl9g86154sc8"; + libraryHaskellDepends = [ + accelerate accelerate-io-bytestring base bmp + ]; + description = "Convert between Accelerate arrays and BMP images"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-bytestring" = callPackage + ({ mkDerivation, accelerate, base, bytestring }: + mkDerivation { + pname = "accelerate-io-bytestring"; + version = "0.1.0.0"; + sha256 = "15j42ahdcqpy4xbpp1xibfbjcrijy0hpfxp4k53qkb9bcqaknyq1"; + libraryHaskellDepends = [ accelerate base bytestring ]; + description = "Convert between Accelerate and ByteString"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-cereal" = callPackage + ({ mkDerivation, accelerate, accelerate-io-bytestring, base, cereal + }: + mkDerivation { + pname = "accelerate-io-cereal"; + version = "0.1.0.0"; + sha256 = "13im1kmrd2yjxxrmpzp2030jhhq9fm9xa76yl11xwpd82z10a2pl"; + libraryHaskellDepends = [ + accelerate accelerate-io-bytestring base cereal + ]; + description = "Binary serialisation of Accelerate arrays using cereal"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-repa" = callPackage + ({ mkDerivation, accelerate, base, repa }: + mkDerivation { + pname = "accelerate-io-repa"; + version = "0.1.0.0"; + sha256 = "084gzvfwz6prwra5393lfm5hgvssxwij0cdf24fq5nahzn7x2wrp"; + libraryHaskellDepends = [ accelerate base repa ]; + description = "Convert between Accelerate and Repa arrays"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "accelerate-io-vector" = callPackage + ({ mkDerivation, accelerate, base, hedgehog, primitive, tasty + , tasty-hedgehog, vector + }: + mkDerivation { + pname = "accelerate-io-vector"; + version = "0.1.0.0"; + sha256 = "1nh7n3qj4csxyzvkhkvfr9bii2vmqky51f32pz3bphrwfvhzdrri"; + libraryHaskellDepends = [ accelerate base primitive vector ]; + testHaskellDepends = [ + accelerate base hedgehog tasty tasty-hedgehog vector + ]; + description = "Convert between Accelerate and vector"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "accelerate-kullback-liebler" = callPackage @@ -22481,20 +22590,19 @@ self: { }) {}; "accelerate-llvm" = callPackage - ({ mkDerivation, abstract-deque, accelerate, base, bytestring - , chaselev-deque, containers, data-default-class, deepseq - , directory, dlist, exceptions, filepath, llvm-hs, llvm-hs-pure - , mtl, mwc-random, primitive, template-haskell - , unordered-containers, vector + ({ mkDerivation, accelerate, base, bytestring, constraints + , containers, data-default-class, deepseq, directory, dlist + , exceptions, filepath, llvm-hs, llvm-hs-pure, mtl, primitive + , template-haskell, unordered-containers, vector }: mkDerivation { pname = "accelerate-llvm"; - version = "1.2.0.1"; - sha256 = "1cv5s7fgkdd3m95vy2rrq2kvzyzxx6vwgsc5nqcmfdp00z8znjhk"; + version = "1.3.0.0"; + sha256 = "1fjjfjav11s6grwl6ihqdrzx738bwki0l25qlp4zzz2hi2440qbp"; libraryHaskellDepends = [ - abstract-deque accelerate base bytestring chaselev-deque containers + accelerate base bytestring constraints containers data-default-class deepseq directory dlist exceptions filepath - llvm-hs llvm-hs-pure mtl mwc-random primitive template-haskell + llvm-hs llvm-hs-pure mtl primitive template-haskell unordered-containers vector ]; description = "Accelerate backend component generating LLVM IR"; @@ -22505,19 +22613,19 @@ self: { "accelerate-llvm-native" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring - , c2hs, Cabal, cereal, containers, directory, dlist, filepath, ghc - , ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure, lockfree-queue - , mtl, template-haskell, time, unique, unix, vector + , c2hs, cereal, containers, deepseq, directory, dlist, filepath + , ghc, ghc-prim, hashable, libffi, llvm-hs, llvm-hs-pure + , lockfree-queue, mtl, template-haskell, unique, unix, vector }: mkDerivation { pname = "accelerate-llvm-native"; - version = "1.2.0.1"; - sha256 = "0sml5rj3dnxlv14i4xbs1sadnprjga1iws7fl7sxkyjzxqc04vrj"; + version = "1.3.0.0"; + sha256 = "1x4wfbp83ppzknd98k2ad160a8kdqh96qqmyfzdqyvy44iskxcn6"; libraryHaskellDepends = [ - accelerate accelerate-llvm base bytestring Cabal cereal containers - directory dlist filepath ghc ghc-prim hashable libffi llvm-hs - llvm-hs-pure lockfree-queue mtl template-haskell time unique unix - vector + accelerate accelerate-llvm base bytestring cereal containers + deepseq directory dlist filepath ghc ghc-prim hashable libffi + llvm-hs llvm-hs-pure lockfree-queue mtl template-haskell unique + unix vector ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ accelerate base ]; @@ -22530,17 +22638,18 @@ self: { "accelerate-llvm-ptx" = callPackage ({ mkDerivation, accelerate, accelerate-llvm, base, bytestring , containers, cuda, deepseq, directory, dlist, file-embed, filepath - , hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty, process - , template-haskell, time, unordered-containers + , ghc-heap, hashable, llvm-hs, llvm-hs-pure, mtl, nvvm, pretty + , process, template-haskell, unordered-containers }: mkDerivation { pname = "accelerate-llvm-ptx"; - version = "1.2.0.1"; - sha256 = "0c9hl19v4si0lnah4l63kqhpxz16zy0wi3cg28gz00mxzgqilivs"; + version = "1.3.0.0"; + sha256 = "0bb7p67dv5csbblnaxbm7hkq8y2qknz0yd1f0rav29igsv3a9rfx"; libraryHaskellDepends = [ accelerate accelerate-llvm base bytestring containers cuda deepseq - directory dlist file-embed filepath hashable llvm-hs llvm-hs-pure - mtl nvvm pretty process template-haskell time unordered-containers + directory dlist file-embed filepath ghc-heap hashable llvm-hs + llvm-hs-pure mtl nvvm pretty process template-haskell + unordered-containers ]; testHaskellDepends = [ accelerate base ]; description = "Accelerate backend for NVIDIA GPUs"; @@ -29137,26 +29246,6 @@ self: { }: mkDerivation { pname = "amqp-utils"; - version = "0.4.4.0"; - sha256 = "07zpmq9sx6lmnma4dxxph0jficghrlfbb568frh3d6fbdiqgmfgl"; - 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 - ]; - description = "Generic Haskell AMQP tools"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "amqp-utils_0_4_4_1" = callPackage - ({ mkDerivation, amqp, base, bytestring, connection, containers - , data-default-class, directory, hinotify, magic, network, process - , text, time, tls, unix, utf8-string, x509-system - }: - mkDerivation { - pname = "amqp-utils"; version = "0.4.4.1"; sha256 = "1vs0p7pc6z9mfjd2vns66wnhl8v1n9rbgabyjw0v832m2pwizzmj"; isLibrary = false; @@ -29168,7 +29257,6 @@ self: { ]; description = "AMQP toolset for the command line"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "amqp-worker" = callPackage @@ -31827,10 +31915,8 @@ self: { }: mkDerivation { pname = "archive-libarchive"; - version = "1.0.0.0"; - sha256 = "0pqq76gnk6y71c5wwjhq99y2695v6bfyzjb8gakp6h3jivcpd2gb"; - revision = "1"; - editedCabalFile = "12wq8nisyr2i1861v2377llha63nqpiys9vk6dvg9rfz7f6qqdch"; + version = "1.0.0.1"; + sha256 = "079wm4c9bahvi693g6655ag9rz9l5g7i4b82q7zm0hz383f94zsl"; libraryHaskellDepends = [ base bytestring composition-prelude libarchive ]; @@ -34888,10 +34974,8 @@ self: { }: mkDerivation { pname = "aura"; - version = "3.1.7"; - sha256 = "0w7m65bh38gdq186b16pcnq7k2nakiy749m7z092cv4k5w72gal5"; - revision = "1"; - editedCabalFile = "1g8hm1bd4yssmy1qkarnwd8w2wz8c2m02gk1agh3pyv60f9q66s7"; + version = "3.1.8"; + sha256 = "19zm9bwpixqdg4a5mcrv2c8fyhygjzawjrwv1jwwhcczqsrjwvrw"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35047,8 +35131,8 @@ self: { }: mkDerivation { pname = "autoapply"; - version = "0.4"; - sha256 = "0b7la51399kcj9a4z9j49xd9v2zs172vygs3djz5qid7fsl37pgm"; + version = "0.4.1"; + sha256 = "1jgzfdi5p0pns6w7543yp2ljglnmym9qplyb4vafynzg3bjhzvz0"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base logict mtl template-haskell th-desugar transformers @@ -37803,8 +37887,8 @@ self: { pname = "base64-bytestring-type"; version = "1.0.1"; sha256 = "03kq4rjj6by02rf3hg815jfdqpdk0xygm5f46r2pn8mb99yd01zn"; - revision = "6"; - editedCabalFile = "05z53pc1gi62lzl262mc1qx12qqrds6ab6rflwpfcxbp0a67c825"; + revision = "7"; + editedCabalFile = "1vry5qh9w1adwyfrlx8x2772knwmdvxgq2nfzng7vybll2cqph4c"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring binary bytestring cereal deepseq hashable http-api-data QuickCheck serialise text @@ -46419,21 +46503,6 @@ self: { }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.0.1"; - sha256 = "0ibckpy0wz2f8590z92lvkmwcf29lv6sby1y3cz3cihxvp3bw3il"; - libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; - testHaskellDepends = [ - base extra hspec parsec parsec-numbers text - ]; - description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "byte-count-reader_0_10_1_1" = callPackage - ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text - }: - mkDerivation { - pname = "byte-count-reader"; version = "0.10.1.1"; sha256 = "0amzhcy60rmiyfp7cgdg7g1xcf7z5zz43kg18i1bwwj565ipb6p8"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; @@ -46442,7 +46511,6 @@ self: { ]; description = "Read strings describing a number of bytes like 2Kb and 0.5 MiB"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "byte-order" = callPackage @@ -48297,8 +48365,8 @@ self: { pname = "cabal-plan"; version = "0.7.0.0"; sha256 = "1wv375dq50fibzg6xa9vrr8q4lhaqcl254b9a2vc42rrjvhxxmzc"; - revision = "1"; - editedCabalFile = "0gc64mgk11nszilkbid351zxh5cpy85kqcc3mrkrw2fsbcga08as"; + revision = "2"; + editedCabalFile = "1c3w9d75kqxhyafjyl8fyzbrp80idvhd693rsd08gws8blkk1vzr"; configureFlags = [ "-fexe" ]; isLibrary = true; isExecutable = true; @@ -49871,6 +49939,8 @@ self: { ]; description = "OTP-like supervision trees in Haskell"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "capnp" = callPackage @@ -57317,10 +57387,8 @@ self: { ({ mkDerivation, accelerate, base }: mkDerivation { pname = "colour-accelerate"; - version = "0.3.0.0"; - sha256 = "0zvzra2w0sajw0hzg2k25khv8c5j1i17g8dnga70w73f3mmh3gbz"; - revision = "1"; - editedCabalFile = "1mbz9wdx396q8gdy6yqsc5vsxrkky9zkxczjblvc9zy542v252cn"; + version = "0.4.0.0"; + sha256 = "1j7ff2wb58yf346z2abr1v1yq498fxm498rdf1g62ppf6vkdplw8"; libraryHaskellDepends = [ accelerate base ]; description = "Working with colours in Accelerate"; license = stdenv.lib.licenses.bsd3; @@ -58541,8 +58609,8 @@ self: { }: mkDerivation { pname = "composite-aeson"; - version = "0.7.3.0"; - sha256 = "0wb15vq95kf6jigfy0n3jampnx8xmkxmh2lnxgfsc8zac9hwls55"; + version = "0.7.4.0"; + sha256 = "1k8m89cff8b3yc1af0l9vd13pav2hjy51gcadahn07zpwv1bszfj"; libraryHaskellDepends = [ aeson aeson-better-errors base composite-base containers contravariant generic-deriving hashable lens mmorph mtl profunctors @@ -58561,14 +58629,27 @@ self: { broken = true; }) {}; + "composite-aeson-path" = callPackage + ({ mkDerivation, base, composite-aeson, path }: + mkDerivation { + pname = "composite-aeson-path"; + version = "0.7.4.0"; + sha256 = "08p988iq7y76px61dlj5jq35drmnrf4khi27wpqgh3pg9d96yihx"; + libraryHaskellDepends = [ base composite-aeson path ]; + description = "Formatting data for the path library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "composite-aeson-refined" = callPackage ({ mkDerivation, aeson-better-errors, base, composite-aeson, mtl , refined }: mkDerivation { pname = "composite-aeson-refined"; - version = "0.7.3.0"; - sha256 = "0g0i8zwky1ygniyxpvgl1r78b4qak1mx1wpy2pj815zrd43x1y60"; + version = "0.7.4.0"; + sha256 = "049lrm5iip5y3c9m9x4sjangaigdprj1553sw2vrcvnvn8xfq57s"; libraryHaskellDepends = [ aeson-better-errors base composite-aeson mtl refined ]; @@ -58579,25 +58660,37 @@ self: { }) {}; "composite-base" = callPackage - ({ mkDerivation, base, exceptions, hspec, lens, monad-control, mtl - , profunctors, QuickCheck, template-haskell, text, transformers - , transformers-base, unliftio-core, vinyl + ({ mkDerivation, base, deepseq, exceptions, hspec, lens + , monad-control, mtl, profunctors, QuickCheck, template-haskell + , text, transformers, transformers-base, unliftio-core, vinyl }: mkDerivation { pname = "composite-base"; - version = "0.7.3.0"; - sha256 = "07zbs89cqm7b78jfh2lwma3spsklc6wq0f58g14p27wgm253xkwp"; + version = "0.7.4.0"; + sha256 = "1ml1y1zh8znvaqydwcnv8n69rzmx7zy2bpzr65gy79xbczz3dxwz"; libraryHaskellDepends = [ - base exceptions lens monad-control mtl profunctors template-haskell - text transformers transformers-base unliftio-core vinyl - ]; - testHaskellDepends = [ - base exceptions hspec lens monad-control mtl profunctors QuickCheck + base deepseq exceptions lens monad-control mtl profunctors template-haskell text transformers transformers-base unliftio-core vinyl ]; + testHaskellDepends = [ + base deepseq exceptions hspec lens monad-control mtl profunctors + QuickCheck template-haskell text transformers transformers-base + unliftio-core vinyl + ]; description = "Shared utilities for composite-* packages"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "composite-binary" = callPackage + ({ mkDerivation, base, binary, composite-base }: + mkDerivation { + pname = "composite-binary"; + version = "0.7.4.0"; + sha256 = "07d88krkpplprnw57j4bqi71p8bmj0wz28yw41wgl2p5g2h7zccp"; + libraryHaskellDepends = [ base binary composite-base ]; + description = "Orphan binary instances"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -58607,8 +58700,8 @@ self: { }: mkDerivation { pname = "composite-ekg"; - version = "0.7.3.0"; - sha256 = "1402ay8gxqp1fh2ija9ry5g366p5vx64ikmfal9hr2c42c2kmcf9"; + version = "0.7.4.0"; + sha256 = "0y8wnp6n1fvqfrkm1lqv8pdfq7a4k7gaxl3i9dh6xfzyamlghg82"; libraryHaskellDepends = [ base composite-base ekg-core lens text vinyl ]; @@ -58618,6 +58711,17 @@ self: { broken = true; }) {}; + "composite-hashable" = callPackage + ({ mkDerivation, base, composite-base, hashable }: + mkDerivation { + pname = "composite-hashable"; + version = "0.7.4.0"; + sha256 = "0zwv6m9nzz0g3ngmfznxh6wmprhcgdbfxrsgylnr6990ppk0bmg1"; + libraryHaskellDepends = [ base composite-base hashable ]; + description = "Orphan hashable instances"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "composite-opaleye" = callPackage ({ mkDerivation, base, bytestring, composite-base, hspec, lens , opaleye, postgresql-simple, product-profunctors, profunctors @@ -58625,8 +58729,8 @@ self: { }: mkDerivation { pname = "composite-opaleye"; - version = "0.7.3.0"; - sha256 = "0b9h0z4v0268qgcwq53p59nkwbbg77dqm9snr4zif71xhmlfscpx"; + version = "0.7.4.0"; + sha256 = "0nzyslqgh7m9ryqw4rajq2m4kfknqzdq0aqnygyz0sblmgixn4hm"; libraryHaskellDepends = [ base bytestring composite-base lens opaleye postgresql-simple product-profunctors profunctors template-haskell text vinyl @@ -58649,8 +58753,8 @@ self: { }: mkDerivation { pname = "composite-swagger"; - version = "0.7.3.0"; - sha256 = "1gzmksq2dfywird7gyjc95v3spgxsab3jbakg5il2fmkx35cc1za"; + version = "0.7.4.0"; + sha256 = "0a7pcs06m0w0mq60y3hhgn4a36gx5daypc1nh1ndsm6x3q3d99q8"; libraryHaskellDepends = [ base composite-base insert-ordered-containers lens swagger2 template-haskell text vinyl @@ -61407,6 +61511,25 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "containers-accelerate" = callPackage + ({ mkDerivation, accelerate, accelerate-llvm-native, base + , containers, half, hashable-accelerate, hedgehog, tasty + , tasty-hedgehog + }: + mkDerivation { + pname = "containers-accelerate"; + version = "0.1.0.0"; + sha256 = "1bfw5k6nq15szgwjkzd17inmlk0ii0pd6a4lrixi8gyjf6ksm6n1"; + libraryHaskellDepends = [ accelerate base hashable-accelerate ]; + testHaskellDepends = [ + accelerate accelerate-llvm-native base containers half + hashable-accelerate hedgehog tasty tasty-hedgehog + ]; + description = "Hashing-based container types"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "containers-benchmark" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , ghc-prim, random @@ -61782,6 +61905,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "contravariant-extras_0_3_5_2" = callPackage + ({ mkDerivation, base, contravariant, template-haskell + , template-haskell-compat-v0208 + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.5.2"; + sha256 = "0ikwzg0992j870yp0x2ssf4mv2hw2nml979apg493m72xnvr1jz9"; + libraryHaskellDepends = [ + base contravariant template-haskell template-haskell-compat-v0208 + ]; + description = "Extras for the \"contravariant\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "control" = callPackage ({ mkDerivation, base, basic, stm, template-haskell, transformers }: @@ -65622,8 +65761,8 @@ self: { }: mkDerivation { pname = "cublas"; - version = "0.5.0.0"; - sha256 = "0s47wrmlb35dpym4dz3688qx8m166i2a9d8pqnfdzxy67zv98g1f"; + version = "0.6.0.0"; + sha256 = "0yxyynvf9zlkc8yhra5j1sk1d8hbiqvzbsh02mc1y8hcf8nzyp61"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cuda half storable-complex template-haskell @@ -65705,10 +65844,8 @@ self: { }: mkDerivation { pname = "cuda"; - version = "0.10.1.0"; - sha256 = "10lyyc652ic3m4r5agszpv2r99y9fnsdwahb5pd4qiga770v45vp"; - revision = "2"; - editedCabalFile = "1nw135pd2ab3mmyq3xmkxynzfb54qr7a8xssq5ivrk83yzvs87im"; + version = "0.10.2.0"; + sha256 = "0fkjibnnxradhsbasx1mw0c088cfwypnk6a5002rxpzxid5qrp9l"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal directory filepath ]; @@ -65768,8 +65905,8 @@ self: { }: mkDerivation { pname = "cufft"; - version = "0.9.0.1"; - sha256 = "1cf11ia4i19bpbs0wzkz2hqzc22hh2dvbn8m5frnwild83zal4n3"; + version = "0.10.0.0"; + sha256 = "1prma5srgfnhjvf1rvxd1kznv42k4svhk05j93mx1pcx7jd1cmvz"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; @@ -66187,8 +66324,8 @@ self: { }: mkDerivation { pname = "cusolver"; - version = "0.2.0.0"; - sha256 = "0v30wm32jcz7jy940y26zcqvjy1058bqf0v44xf73v53dlwkd07a"; + version = "0.3.0.0"; + sha256 = "0xskvpjqlckpfrfvnb2afj29p2gnzafq2v98pbvwsprmn60np9mq"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cublas cuda cusparse half storable-complex template-haskell @@ -66205,8 +66342,8 @@ self: { }: mkDerivation { pname = "cusparse"; - version = "0.2.0.0"; - sha256 = "1y6qnxfdcw3ik3mjp4410846pq1l628d02bdasll1xd4r4r87vh6"; + version = "0.3.0.0"; + sha256 = "0x2ab7sd7j1mmjns8332mm2nzikprq3w6fbrnbcfk5lz2x0bgir2"; setupHaskellDepends = [ base Cabal cuda directory filepath ]; libraryHaskellDepends = [ base cuda half storable-complex ]; libraryToolDepends = [ c2hs ]; @@ -68766,6 +68903,20 @@ self: { broken = true; }) {}; + "data-validation" = callPackage + ({ mkDerivation, base, containers, hspec, template-haskell }: + mkDerivation { + pname = "data-validation"; + version = "0.1.0.1"; + sha256 = "0bc3i4pnz1v516cmsnay1hpmh9r7zglwyv2ai1ncxy2k4l78pih0"; + libraryHaskellDepends = [ base containers template-haskell ]; + testHaskellDepends = [ base containers hspec template-haskell ]; + description = "A library for creating type safe validations"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "data-variant" = callPackage ({ mkDerivation, base, safe }: mkDerivation { @@ -68981,8 +69132,8 @@ self: { }: mkDerivation { pname = "dataflower"; - version = "0.2.2.0"; - sha256 = "169m0yngaslc2pysdpf65pmf9zr037ij7y95rqi6bp3dxcxfcwlg"; + version = "0.3.0.0"; + sha256 = "0nxir4syhbw5spqks3pxj71w781vn8mqxdiig9dqnrv5ks02bqp6"; libraryHaskellDepends = [ base hashable mtl pretty-show stm time transformers vector ]; @@ -72441,8 +72592,6 @@ self: { ]; description = "Dhall to Nix compiler"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "dhall-nixpkgs" = callPackage @@ -76179,21 +76328,21 @@ self: { }) {}; "dobutokO-poetry" = callPackage - ({ mkDerivation, base, dobutokO-poetry-general, mmsyn3, mmsyn6ukr - , mmsyn7s, uniqueness-periods, vector + ({ mkDerivation, base, dobutokO-poetry-general, mmsyn2, mmsyn3 + , mmsyn5, mmsyn6ukr, mmsyn7s, uniqueness-periods, vector }: mkDerivation { pname = "dobutokO-poetry"; - version = "0.15.0.0"; - sha256 = "1091wqxzg138bc8kk55fkgv5ripq48zyvm3in2b2g54zjy6l4f1p"; + version = "0.16.3.0"; + sha256 = "151ncvk2jz2nlgr52485p6mdqix7qlld96kzi9y3hxag2kpb0723"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s + base dobutokO-poetry-general mmsyn2 mmsyn3 mmsyn5 mmsyn6ukr mmsyn7s uniqueness-periods vector ]; executableHaskellDepends = [ - base dobutokO-poetry-general mmsyn3 mmsyn6ukr mmsyn7s + base dobutokO-poetry-general mmsyn2 mmsyn3 mmsyn5 mmsyn6ukr mmsyn7s uniqueness-periods vector ]; description = "Helps to order the 7 or less Ukrainian words to obtain somewhat suitable for poetry or music text"; @@ -76915,8 +77064,8 @@ self: { }: mkDerivation { pname = "dom-lt"; - version = "0.2.1"; - sha256 = "16pf0lzzg0wwk5q44ybbc2hbrjs5hzsai0ssm836xiywsqwp61a7"; + version = "0.2.2"; + sha256 = "0hf0wf4fl671awf87f0r7r4a57cgm88x666081c0wy16qchahffw"; libraryHaskellDepends = [ array base containers ]; testHaskellDepends = [ base containers HUnit ]; benchmarkHaskellDepends = [ base containers criterion deepseq ]; @@ -83348,19 +83497,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding_0_2_2" = callPackage + "essence-of-live-coding_0_2_3" = callPackage ({ mkDerivation, base, containers, foreign-store, mtl, QuickCheck - , syb, test-framework, test-framework-quickcheck2, transformers - , vector-sized + , syb, test-framework, test-framework-quickcheck2, time + , transformers, vector-sized }: mkDerivation { pname = "essence-of-live-coding"; - version = "0.2.2"; - sha256 = "1hczvr1byk8qjkb45w9nvjmbqfmxl15dgn7kvp0rby0dkrn85275"; + version = "0.2.3"; + sha256 = "19sc5wgby356bm5rh7sr41ydhw3v1pqbz76xyf7081kg77qcbc0m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers foreign-store syb transformers vector-sized + base containers foreign-store syb time transformers vector-sized ]; executableHaskellDepends = [ base transformers ]; testHaskellDepends = [ @@ -83387,14 +83536,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-gloss_0_2_2" = callPackage + "essence-of-live-coding-gloss_0_2_3" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store, gloss , syb, transformers }: mkDerivation { pname = "essence-of-live-coding-gloss"; - version = "0.2.2"; - sha256 = "19kxrjyhikgb49qdb7rlap8bbjsvkyi2ni6a1m1hjyxjziypsw0y"; + version = "0.2.3"; + sha256 = "0msc2pfg7096azk4ggb267cfm2vh02kcksgdmzl46rc5if98xmi7"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store gloss syb transformers ]; @@ -83409,8 +83558,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-gloss-example"; - version = "0.2.2"; - sha256 = "07kgmbwm9swdavsypxnqf64fh9b2c2h9rmkm38hcl6lahdb2rb44"; + version = "0.2.3"; + sha256 = "08hzfi3mspxlkbhh8mr1q330yp94s6s9w55pla7x10qj8vda4shc"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83419,6 +83568,8 @@ self: { ]; description = "General purpose live coding framework - Gloss example"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "essence-of-live-coding-pulse" = callPackage @@ -83436,14 +83587,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-pulse_0_2_2" = callPackage + "essence-of-live-coding-pulse_0_2_3" = callPackage ({ mkDerivation, base, essence-of-live-coding, foreign-store , pulse-simple, transformers }: mkDerivation { pname = "essence-of-live-coding-pulse"; - version = "0.2.2"; - sha256 = "15v4bzkx4j6mvprk1d215ywamjjvmf6g13cppd109aj4h40zcxbi"; + version = "0.2.3"; + sha256 = "1mxgicmy5xmmad0r0b3dn18ab9dn8r3rqglqxa6v75kl8lswm0c8"; libraryHaskellDepends = [ base essence-of-live-coding foreign-store pulse-simple transformers ]; @@ -83458,8 +83609,8 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-pulse-example"; - version = "0.2.2"; - sha256 = "1476wxny2yhq2f2cn2bqrcm4dri39mql509pf9yq2kyd76lkrcgx"; + version = "0.2.3"; + sha256 = "0da3l6z0lnjlq62vx18s2jyvrydffxvcjhv2ydlwczrcy0wggdln"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -83468,6 +83619,8 @@ self: { ]; description = "General purpose live coding framework - pulse backend example"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "essence-of-live-coding-quickcheck" = callPackage @@ -83486,14 +83639,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "essence-of-live-coding-quickcheck_0_2_2" = callPackage + "essence-of-live-coding-quickcheck_0_2_3" = callPackage ({ mkDerivation, base, boltzmann-samplers, essence-of-live-coding , QuickCheck, syb, transformers }: mkDerivation { pname = "essence-of-live-coding-quickcheck"; - version = "0.2.2"; - sha256 = "1v7ijzs64bqn8nyp1msrrvk6kfkzx5a87ib74fmcasiww1y4lwgl"; + version = "0.2.3"; + sha256 = "0shbpc1ivqr3m9p76kf1vj7g1rqy3magxyh58w1mxymf4c61a9gr"; libraryHaskellDepends = [ base boltzmann-samplers essence-of-live-coding QuickCheck syb transformers @@ -83509,14 +83662,16 @@ self: { }: mkDerivation { pname = "essence-of-live-coding-warp"; - version = "0.2.2"; - sha256 = "14ygm62ak6gprx0r545xmv5nk544p0gsip3017p7ziy3k01mwhgh"; + version = "0.2.3"; + sha256 = "1rpp6xm3s3fji1pcdajc06iw0zhk3mbd245h6a0z6ygf8id7sh50"; libraryHaskellDepends = [ base essence-of-live-coding http-types wai warp ]; testHaskellDepends = [ base essence-of-live-coding http-client ]; description = "General purpose live coding framework"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "estimator" = callPackage @@ -85968,8 +86123,8 @@ self: { }: mkDerivation { pname = "extra"; - version = "1.7.5"; - sha256 = "1cickrjvg4i25yn3qg4f0id0bmq115siysyqnh0yk9rwjlnrxyn9"; + version = "1.7.6"; + sha256 = "1mdqw88crblabxz4sg803ww6pkl5prnjnpjwh11n32y2npky5ask"; libraryHaskellDepends = [ base clock directory filepath process time unix ]; @@ -85980,6 +86135,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "extra_1_7_7" = callPackage + ({ mkDerivation, base, clock, directory, filepath, process + , QuickCheck, quickcheck-instances, time, unix + }: + mkDerivation { + pname = "extra"; + version = "1.7.7"; + sha256 = "1ark7b6xknc44v8jg5aymxffj5d0qr81frjpg2ffqrkwnhva0w5s"; + libraryHaskellDepends = [ + base clock directory filepath process time unix + ]; + testHaskellDepends = [ + base directory filepath QuickCheck quickcheck-instances unix + ]; + description = "Extra functions I use"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "extract-dependencies" = callPackage ({ mkDerivation, async, base, Cabal, containers , package-description-remote @@ -88878,9 +89052,8 @@ self: { }: mkDerivation { pname = "filestore"; - version = "0.6.4"; - sha256 = "1z967kviqsy3ma8xdfffx864f7ji6nsrbd5riis0nasm1bbwm8rr"; - enableSeparateDataOutput = true; + version = "0.6.5"; + sha256 = "0z29273vdqjsrj4vby0gp7d12wg9nkzq9zgqg18db0p5948jw1dh"; libraryHaskellDepends = [ base bytestring containers Diff directory filepath old-locale parsec process split time utf8-string xml @@ -91122,23 +91295,11 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "fmlist"; - version = "0.9.3"; - sha256 = "1w9nhm2zybdx4c1lalkajwqr8wcs731lfjld2r8gknd7y96x8pwf"; - libraryHaskellDepends = [ base ]; - description = "FoldMap lists"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "fmlist_0_9_4" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "fmlist"; version = "0.9.4"; sha256 = "19h95ph7lh7llw6j1v1rssrdi5k7xw8x0iac9rgzss371s2w3g9d"; libraryHaskellDepends = [ base ]; description = "FoldMap lists"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "fmt" = callPackage @@ -94406,8 +94567,8 @@ self: { }: mkDerivation { pname = "functor-combinators"; - version = "0.3.5.1"; - sha256 = "07hwsy8nly4sps3fsyfmq54cwfb850j1i1darwsyw24ignbd60j4"; + version = "0.3.6.0"; + sha256 = "0idf896xadp5v5k4m0s087xvvs9008sxw61djqb9v0x08rs5zy8f"; libraryHaskellDepends = [ assoc base bifunctors comonad constraints containers contravariant deriving-compat free invariant kan-extensions mmorph mtl @@ -94917,8 +95078,8 @@ self: { }: mkDerivation { pname = "futhark"; - version = "0.16.3"; - sha256 = "0y9g7nldcx2y7h3gb652i5r3lfvbriaqfqs2gnxym1r9w9kki0si"; + version = "0.16.4"; + sha256 = "14k682phqdp2scmv064i6jyymf3j2f3bs25yw1qff76bkymv02vd"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -96563,6 +96724,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-functor" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-functor"; + version = "0.1.0.0"; + sha256 = "02anlx3l0zn4hx9pckpdpp93yp1xyqcafpy6rk7s1zpv7nqk12z2"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; + description = "Deriving generalized functors with GHC.Generics"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-lens" = callPackage ({ mkDerivation, base, doctest, generic-lens-core, HUnit , inspection-testing, lens, profunctors, text @@ -96632,6 +96805,17 @@ self: { broken = true; }) {}; + "generic-match" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "generic-match"; + version = "0.2.0.2"; + sha256 = "16r43gzl3a8ycxbhggqk09mrm63r9db85nk1j2x4j4lzcwap7bid"; + libraryHaskellDepends = [ base ]; + description = "First class pattern matching"; + license = stdenv.lib.licenses.mit; + }) {}; + "generic-maybe" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , directory, doctest, filepath, generic-deriving, ghc-prim, hlint @@ -100041,6 +100225,8 @@ self: { ]; description = "GI friendly Binding to the Cairo library"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-cairo-render" = callPackage @@ -100060,6 +100246,8 @@ self: { libraryToolDepends = [ c2hs ]; description = "GI friendly Binding to the Cairo library"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) cairo;}; "gi-dbusmenu" = callPackage @@ -100079,6 +100267,8 @@ self: { libraryPkgconfigDepends = [ libdbusmenu ]; description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenu_0_4_8" = callPackage @@ -100099,6 +100289,7 @@ self: { description = "Dbusmenu bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libdbusmenu;}; "gi-dbusmenugtk3" = callPackage @@ -100123,6 +100314,8 @@ self: { libraryPkgconfigDepends = [ gtk3 libdbusmenu-gtk3 ]; description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-dbusmenugtk3_0_4_9" = callPackage @@ -100148,6 +100341,7 @@ self: { description = "DbusmenuGtk bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) libdbusmenu-gtk3;}; "gi-gdk" = callPackage @@ -100287,6 +100481,8 @@ self: { libraryPkgconfigDepends = [ gtk3 ]; description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) gtk3;}; "gi-gdkx11_4_0_2" = callPackage @@ -100310,6 +100506,7 @@ self: { description = "GdkX11 bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk4-x11 = null;}; "gi-ggit" = callPackage @@ -100486,6 +100683,8 @@ self: { libraryPkgconfigDepends = [ graphene-gobject ]; description = "Graphene bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {graphene-gobject = null;}; "gi-graphene_1_0_2" = callPackage @@ -100506,6 +100705,7 @@ self: { description = "Graphene bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {graphene-gobject = null;}; "gi-gsk" = callPackage @@ -100530,6 +100730,8 @@ self: { libraryPkgconfigDepends = [ gtk4 ]; description = "Gsk bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk4 = null;}; "gi-gst" = callPackage @@ -100615,6 +100817,8 @@ self: { libraryPkgconfigDepends = [ gstreamer-pbutils ]; description = "GStreamer Plugins Base Utils bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gstreamer-pbutils = null;}; "gi-gsttag" = callPackage @@ -100636,6 +100840,8 @@ self: { libraryPkgconfigDepends = [ gstreamer-tag ]; description = "GStreamer Tag bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gstreamer-tag = null;}; "gi-gstvideo" = callPackage @@ -100755,6 +100961,8 @@ self: { ]; description = "Declarative GTK+ programming in Haskell"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-declarative-app-simple" = callPackage @@ -100773,6 +100981,8 @@ self: { ]; description = "Declarative GTK+ programming in Haskell in the style of Pux"; license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-hs" = callPackage @@ -100790,6 +101000,8 @@ self: { ]; description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtk-hs_0_3_9" = callPackage @@ -100808,6 +101020,7 @@ self: { description = "A wrapper for gi-gtk, adding a few more idiomatic API parts on top"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gi-gtkosxapplication" = callPackage @@ -100829,6 +101042,8 @@ self: { libraryPkgconfigDepends = [ gtk-mac-integration-gtk3 ]; description = "GtkosxApplication bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {gtk-mac-integration-gtk3 = null;}; "gi-gtksource" = callPackage @@ -100877,6 +101092,8 @@ self: { libraryPkgconfigDepends = [ libhandy ]; description = "libhandy bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libhandy;}; "gi-harfbuzz" = callPackage @@ -101076,6 +101293,8 @@ self: { libraryPkgconfigDepends = [ poppler ]; description = "Poppler bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) poppler;}; "gi-secret" = callPackage @@ -101238,6 +101457,8 @@ self: { libraryPkgconfigDepends = [ libwnck ]; description = "Wnck bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) libwnck;}; "gi-xlib" = callPackage @@ -101257,6 +101478,8 @@ self: { libraryPkgconfigDepends = [ xlibsWrapper ]; description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) xlibsWrapper;}; "gi-xlib_2_0_9" = callPackage @@ -101277,6 +101500,7 @@ self: { description = "xlib bindings"; license = stdenv.lib.licenses.lgpl21; hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) xlibsWrapper;}; "giak" = callPackage @@ -101343,6 +101567,39 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ginger_0_10_1_0" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring + , data-default, filepath, http-types, mtl, optparse-applicative + , parsec, process, regex-tdfa, safe, scientific, tasty, tasty-hunit + , tasty-quickcheck, text, time, transformers, unordered-containers + , utf8-string, vector, yaml + }: + mkDerivation { + pname = "ginger"; + version = "0.10.1.0"; + sha256 = "0579ajr1rng0bd0pml69f6yz4aykvk8zcni0p7ck628qx4jzxihx"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring data-default filepath http-types + mtl parsec regex-tdfa safe scientific text time transformers + unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring data-default optparse-applicative process + text transformers unordered-containers utf8-string yaml + ]; + testHaskellDepends = [ + aeson base bytestring data-default mtl tasty tasty-hunit + tasty-quickcheck text time transformers unordered-containers + utf8-string + ]; + description = "An implementation of the Jinja2 template language in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "gingersnap" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq , http-types, microspec, postgresql-simple, resource-pool @@ -103295,14 +103552,16 @@ self: { }) {}; "gloss-accelerate" = callPackage - ({ mkDerivation, accelerate, base, gloss, gloss-rendering }: + ({ mkDerivation, accelerate, base, gloss, gloss-rendering + , linear-accelerate + }: mkDerivation { pname = "gloss-accelerate"; - version = "2.0.0.1"; - sha256 = "106z8kax0m3hzk0381l8m7gxdapl3wf0fdr1ljwb5fgcjc00pac2"; - revision = "1"; - editedCabalFile = "0349yyzxn7r82mz4vr71dibzp0sh45b4a06hm0c0z9d7vlxj0sjj"; - libraryHaskellDepends = [ accelerate base gloss gloss-rendering ]; + version = "2.1.0.0"; + sha256 = "1l09li68r04qij11p7rf9dwfv9cdncj7nm6crq6bm834il3zg4zx"; + libraryHaskellDepends = [ + accelerate base gloss gloss-rendering linear-accelerate + ]; description = "Extras to interface Gloss and Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -103449,10 +103708,8 @@ self: { }: mkDerivation { pname = "gloss-raster-accelerate"; - version = "2.0.0.0"; - sha256 = "1i0qx9wybr66i1x4n3p8ai2z6qx0k5lac422mhh4rvimcjx2bc9d"; - revision = "3"; - editedCabalFile = "0nk901zy01x7v7faa20j0yawqfw3nfl27xr19ip7bn3agmq4sqq2"; + version = "2.1.0.0"; + sha256 = "0yxlpz5wqfriijzkhqgjyv3g0wcmdy33ifbziqrdm9phvsjygvza"; libraryHaskellDepends = [ accelerate base colour-accelerate gloss gloss-accelerate ]; @@ -103529,6 +103786,26 @@ self: { broken = true; }) {inherit (pkgs) glpk;}; + "gltf-codec" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, binary, bytestring + , directory, filepath, scientific, shower, text + , unordered-containers, vector + }: + mkDerivation { + pname = "gltf-codec"; + version = "0.1.0.1"; + sha256 = "0qdwk4ygvhdp4x8bkw101b50wc8zfb6bb54zpxaxkmva40hcv2c2"; + libraryHaskellDepends = [ + aeson base base64-bytestring binary bytestring scientific text + unordered-containers vector + ]; + testHaskellDepends = [ base bytestring directory filepath shower ]; + description = "glTF scene loader"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "glue" = callPackage ({ mkDerivation, async, base, ekg-core, hashable, hspec , lifted-base, monad-control, monad-loops, QuickCheck @@ -107905,6 +108182,36 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "graphql-client" = callPackage + ({ mkDerivation, aeson, aeson-schemas, base, bytestring, file-embed + , http-client, http-client-tls, http-types, mtl + , optparse-applicative, path, path-io, tasty, tasty-hunit + , template-haskell, text, transformers, typed-process + , unliftio-core + }: + mkDerivation { + pname = "graphql-client"; + version = "1.0.0"; + sha256 = "1qzrlk3vkvavi14zz7dkndz8qh449s6rpbrd5phqclgbrah1hj3a"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-schemas base http-client http-client-tls http-types mtl + template-haskell text transformers unliftio-core + ]; + executableHaskellDepends = [ + aeson aeson-schemas base bytestring file-embed http-client + http-client-tls http-types mtl optparse-applicative path path-io + template-haskell text transformers typed-process unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-schemas base http-client http-client-tls http-types mtl + tasty tasty-hunit template-haskell text transformers unliftio-core + ]; + description = "A client for Haskell programs to query a GraphQL API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "graphql-w-persistent" = callPackage ({ mkDerivation, base, containers, json, text }: mkDerivation { @@ -114050,6 +114357,22 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "happy_1_20_0" = callPackage + ({ mkDerivation, array, base, containers, mtl, process }: + mkDerivation { + pname = "happy"; + version = "1.20.0"; + sha256 = "1346r2x5ravs5fqma65bzjragqbb2g6v41wz9maknwm2jf7kl79v"; + isLibrary = false; + isExecutable = true; + enableSeparateDataOutput = true; + executableHaskellDepends = [ array base containers mtl ]; + testHaskellDepends = [ base process ]; + description = "Happy is a parser generator for Haskell"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "happy-dot" = callPackage ({ mkDerivation, array, base, clock, happy, HUnit, language-dot , pretty, transformers, xml @@ -114754,6 +115077,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashable-accelerate" = callPackage + ({ mkDerivation, accelerate, base, template-haskell }: + mkDerivation { + pname = "hashable-accelerate"; + version = "0.1.0.0"; + sha256 = "04cfwd1vyz4xm87ah3x1avs2yzqi6ygcd3sl70v50g492dfl6738"; + libraryHaskellDepends = [ accelerate base template-haskell ]; + description = "A class for types which can be converted into a hash value"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hashable-extras" = callPackage ({ mkDerivation, base, bifunctors, bytestring, directory, doctest , filepath, hashable, transformers, transformers-compat @@ -114924,6 +115259,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hashmap-throw" = callPackage + ({ mkDerivation, base, exceptions, hashable, hashmap }: + mkDerivation { + pname = "hashmap-throw"; + version = "0.1.0.0"; + sha256 = "0dibdmpb6nyhn37xfdw8wgam4a2w8b3hl04ivg08d1ybq4a4m1k5"; + libraryHaskellDepends = [ base exceptions hashable hashmap ]; + description = "Throw behaviour for hashmap lookup"; + license = stdenv.lib.licenses.mit; + }) {}; + "hashrename" = callPackage ({ mkDerivation, base, bytestring, cryptohash, directory, filepath }: @@ -115231,15 +115577,15 @@ self: { broken = true; }) {}; - "haskeline_0_8_0_0" = callPackage + "haskeline_0_8_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory , exceptions, filepath, HUnit, process, stm, terminfo, text , transformers, unix }: mkDerivation { pname = "haskeline"; - version = "0.8.0.0"; - sha256 = "0gqsa5s0drim9m42hv4wrq61mnvcdylxysfxfw3acncwilfrn9pb"; + version = "0.8.1.0"; + sha256 = "0r6skxr45k0qq5vlh9dyl5g5ham994b8z0k3z3v56bi3npvyi6xw"; configureFlags = [ "-fterminfo" ]; isLibrary = true; isExecutable = true; @@ -116567,6 +116913,8 @@ self: { pname = "haskell-src"; version = "1.0.3.1"; sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; + revision = "1"; + editedCabalFile = "1li6czcs54wnij6qnvpx6f66iiw023pggb3zl3jvp74qqflcf5sg"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -116706,6 +117054,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "haskell-src-match" = callPackage + ({ mkDerivation, base, containers, filepath, haskell-src-exts + , hspec, interpolatedstring-perl6, pretty-simple, split + , template-haskell, text, transformers + }: + mkDerivation { + pname = "haskell-src-match"; + version = "0.0.0.1"; + sha256 = "0lhdnmzmwxsiw0if600apdvmkbqz44zwr7sypfclixl9c6h31wg0"; + libraryHaskellDepends = [ + base containers haskell-src-exts interpolatedstring-perl6 + pretty-simple split template-haskell transformers + ]; + testHaskellDepends = [ + base filepath hspec interpolatedstring-perl6 template-haskell text + ]; + description = "Testing code generators piece by piece"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "haskell-src-meta" = callPackage ({ mkDerivation, base, containers, haskell-src-exts, HUnit, pretty , syb, tasty, tasty-hunit, template-haskell, th-orphans @@ -118586,6 +118956,8 @@ self: { ]; description = "Simple unsupervised segmentation model"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hasktags" = callPackage @@ -122670,8 +123042,8 @@ self: { }: mkDerivation { pname = "hercules-ci-agent"; - version = "0.7.3"; - sha256 = "19mz8cqrk7v49h8k2bcpv31qnplx7r10k010gzcwmhhfyrlyrqyg"; + version = "0.7.4"; + sha256 = "0yj9njd168xpj4har99mbb9rr5dqsbnzqs1061s3czrzlp229z3l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -124545,7 +124917,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "hie-bios_0_6_2" = callPackage + "hie-bios_0_7_0" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, conduit-extra, containers, cryptohash-sha1, deepseq , directory, extra, file-embed, filepath, ghc, hslogger @@ -124555,8 +124927,8 @@ self: { }: mkDerivation { pname = "hie-bios"; - version = "0.6.2"; - sha256 = "0x0lgrkbp4f9r96cf65d8qg55hp2qb14xd3zzap5yhybhlp54w8m"; + version = "0.7.0"; + sha256 = "17jfiyxq1m0n1i9a565niczivkkxdd36l9gxqbhfafxsykggliab"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -136143,6 +136515,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-api-data_0_4_2" = callPackage + ({ mkDerivation, attoparsec, attoparsec-iso8601, base, base-compat + , bytestring, containers, cookie, hashable, hspec, hspec-discover + , http-types, HUnit, nats, QuickCheck, quickcheck-instances, tagged + , text, time-compat, transformers, unordered-containers, uuid-types + }: + mkDerivation { + pname = "http-api-data"; + version = "0.4.2"; + sha256 = "0xzfvxxh33ivlnrnzmm19cni3jgb5ph18n9hykkw3d6l3rhwzcnl"; + libraryHaskellDepends = [ + attoparsec attoparsec-iso8601 base base-compat bytestring + containers cookie hashable http-types tagged text time-compat + transformers unordered-containers uuid-types + ]; + testHaskellDepends = [ + base base-compat bytestring cookie hspec HUnit nats QuickCheck + quickcheck-instances text time-compat unordered-containers + uuid-types + ]; + testToolDepends = [ hspec-discover ]; + description = "Converting to/from HTTP API data like URL pieces, headers and query parameters"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-attoparsec" = callPackage ({ mkDerivation, attoparsec, base, bytestring, http-types }: mkDerivation { @@ -136183,7 +136581,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "http-client_0_7_2" = callPackage + "http-client_0_7_2_1" = callPackage ({ mkDerivation, array, async, base, blaze-builder, bytestring , case-insensitive, containers, cookie, deepseq, directory , exceptions, filepath, ghc-prim, hspec, http-types, memory @@ -136192,8 +136590,8 @@ self: { }: mkDerivation { pname = "http-client"; - version = "0.7.2"; - sha256 = "1ld8bx1bnf1gpvdy9wn14b31k94rjvl40zqrgd7nb20zd2l354vp"; + version = "0.7.2.1"; + sha256 = "0b699f07yqa525xqqcs4cn32fryjc2212sv8v83yfqlqwdwzr7jg"; libraryHaskellDepends = [ array base blaze-builder bytestring case-insensitive containers cookie deepseq exceptions filepath ghc-prim http-types memory @@ -136776,6 +137174,31 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; + "http-link-header_1_1_1" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, criterion, directory + , errors, hspec, hspec-attoparsec, http-api-data, network-uri + , QuickCheck, text, transformers + }: + mkDerivation { + pname = "http-link-header"; + version = "1.1.1"; + sha256 = "0bgffcmdswmpw3gl2yricz56y0cxb4x8l0j0qs60c6h16rcp5xwh"; + libraryHaskellDepends = [ + attoparsec base bytestring errors http-api-data network-uri text + ]; + testHaskellDepends = [ + attoparsec base bytestring errors hspec hspec-attoparsec + http-api-data network-uri QuickCheck text + ]; + benchmarkHaskellDepends = [ + attoparsec base bytestring criterion directory errors http-api-data + network-uri text transformers + ]; + description = "A parser and writer for the HTTP Link header per RFC 5988"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "http-listen" = callPackage ({ mkDerivation, base, bytestring, exceptions, HTTP, network , transformers @@ -141518,6 +141941,42 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ihaskell_0_10_1_2" = callPackage + ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal + , cmdargs, containers, directory, filepath, ghc, ghc-boot + , ghc-parser, ghc-paths, haskeline, haskell-src-exts, here, hlint + , hspec, hspec-contrib, http-client, http-client-tls, HUnit + , ipython-kernel, mtl, parsec, process, random, raw-strings-qq + , setenv, shelly, split, stm, strict, text, time, transformers + , unix, unordered-containers, utf8-string, vector + }: + mkDerivation { + pname = "ihaskell"; + version = "0.10.1.2"; + sha256 = "1gs2j0qgxzf346nlnq0zx12yj528ykxia5r3rlldpf6f01zs89v8"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base base64-bytestring bytestring cereal cmdargs containers + directory filepath ghc ghc-boot ghc-parser ghc-paths haskeline + haskell-src-exts hlint http-client http-client-tls ipython-kernel + mtl parsec process random shelly split stm strict text time + transformers unix unordered-containers utf8-string vector + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory ghc ipython-kernel + process strict text transformers unix unordered-containers + ]; + testHaskellDepends = [ + base directory ghc ghc-paths here hspec hspec-contrib HUnit + raw-strings-qq setenv shelly text transformers + ]; + description = "A Haskell backend kernel for the IPython project"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ihaskell-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, here , ihaskell, text @@ -143033,22 +143492,22 @@ self: { }) {}; "indigo" = callPackage - ({ mkDerivation, base, constraints, containers, fmt, hedgehog - , hspec-expectations, HUnit, lorentz, morley, morley-prelude - , reflection, singletons, tasty, tasty-discover, tasty-hedgehog - , tasty-hunit-compat, template-haskell, vinyl + ({ mkDerivation, base, cleveland, constraints, containers, fmt + , hedgehog, hspec-expectations, HUnit, lorentz, morley + , morley-prelude, reflection, singletons, tasty, tasty-discover + , tasty-hedgehog, tasty-hunit-compat, template-haskell, vinyl }: mkDerivation { pname = "indigo"; - version = "0.1.0.0"; - sha256 = "03bspqbw8iz25d58xvy18qzk7wrm5k48k6bvnnslkikqy2bnkcr1"; + version = "0.2.0"; + sha256 = "070ha5s8yirci7zdnh8gy8hdh158zsj7z7blwsr7inw753fsh1jp"; libraryHaskellDepends = [ base constraints containers lorentz morley morley-prelude reflection singletons template-haskell vinyl ]; testHaskellDepends = [ - base containers fmt hedgehog hspec-expectations HUnit lorentz - morley morley-prelude singletons tasty tasty-hedgehog + base cleveland containers fmt hedgehog hspec-expectations HUnit + lorentz morley morley-prelude singletons tasty tasty-hedgehog tasty-hunit-compat ]; testToolDepends = [ tasty-discover ]; @@ -143056,7 +143515,7 @@ self: { license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; - }) {}; + }) {cleveland = null;}; "inf-interval" = callPackage ({ mkDerivation, array, base, deepseq, QuickCheck, text, vector }: @@ -144665,8 +145124,8 @@ self: { ({ mkDerivation, base, containers, text, vector, word8 }: mkDerivation { pname = "intmap-graph"; - version = "1.1.0.0"; - sha256 = "0yg88vvq53kbzw2r8i1w1g4am4bkp8qzgy9qsc7wknb3zwlzs89w"; + version = "1.3.0.0"; + sha256 = "0g4kf7d4yh29jlb5a2f8awjbmaan2f7m1ybkcihayp83lvjld4v0"; libraryHaskellDepends = [ base containers text vector word8 ]; description = "A graph library that allows to explore edges after their type"; license = stdenv.lib.licenses.bsd3; @@ -144732,15 +145191,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "intro_0_8_0_0" = callPackage + "intro_0_9_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, extra, hashable , lens, mtl, optics, QuickCheck, safe, text, transformers , unordered-containers, writer-cps-mtl }: mkDerivation { pname = "intro"; - version = "0.8.0.0"; - sha256 = "1vmhmpcikxlmad2c55bdlsa7j1x30irjb7dp69qii650qslh2rf3"; + version = "0.9.0.0"; + sha256 = "0x48bj9nri2zhsjpwx08nvjmpsjq6zd61npa02zsf357wylxir0x"; libraryHaskellDepends = [ base bytestring containers extra hashable mtl safe text transformers unordered-containers writer-cps-mtl @@ -145599,6 +146058,29 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ipython-kernel_0_10_2_1" = callPackage + ({ mkDerivation, aeson, base, bytestring, cereal, cereal-text + , containers, cryptonite, directory, filepath, memory, mtl, parsec + , process, temporary, text, transformers, unordered-containers + , uuid, zeromq4-haskell + }: + mkDerivation { + pname = "ipython-kernel"; + version = "0.10.2.1"; + sha256 = "016w7bmji3k1cnnl3vq35zq6fnqdvc2x762zfzv4ync2jz63rq38"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson base bytestring cereal cereal-text containers cryptonite + directory filepath memory mtl parsec process temporary text + transformers unordered-containers uuid zeromq4-haskell + ]; + description = "A library for creating kernels for IPython frontends"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "irc" = callPackage ({ mkDerivation, attoparsec, base, bytestring, HUnit, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -146950,8 +147432,8 @@ self: { ({ mkDerivation, base, binary, ixset-typed }: mkDerivation { pname = "ixset-typed-binary-instance"; - version = "0.1.0.0"; - sha256 = "1qa00y5cn3i2b66h87i6sfx6xx4yvgq7gk6maij5b9w4c821h4m4"; + version = "0.1.0.2"; + sha256 = "1jgqc1ys5pvfkha8pyddz5f01qsmv9a83xw0q75njk8zhqajlyvx"; libraryHaskellDepends = [ base binary ixset-typed ]; description = "Binary instance for ixset-typed"; license = stdenv.lib.licenses.mit; @@ -146977,8 +147459,8 @@ self: { ({ mkDerivation, base, hashable, ixset-typed }: mkDerivation { pname = "ixset-typed-hashable-instance"; - version = "0.1.0.1"; - sha256 = "14cd3kzhqv8w9f756drhjpmrr32i6n9sjmp9fk2gngsigaksnvnk"; + version = "0.1.0.2"; + sha256 = "0bwajqlj1kpis2616lrmcymmag66fkmdrsrj0r3kf8j6090zxmyv"; libraryHaskellDepends = [ base hashable ixset-typed ]; description = "Hashable instance for ixset-typed"; license = stdenv.lib.licenses.mit; @@ -149432,25 +149914,27 @@ self: { "jsop" = callPackage ({ mkDerivation, aeson, base, containers, generics-sop, lens , lens-aeson, monoidal-containers, protolude, string-interpolate - , tasty, tasty-discover, tasty-hspec, text + , tasty, tasty-discover, tasty-hspec, text, unordered-containers }: mkDerivation { pname = "jsop"; - version = "0.1.0.0"; - sha256 = "0yaxcpxgn00jf3igvncg59ca6hz28sf791872n617v3vh7arv8y3"; + version = "0.2.0.1"; + sha256 = "05qacp69pk4fm1b1mrk2ax8f8mbfzsb71bkj2qraa116xym61j38"; libraryHaskellDepends = [ aeson base containers generics-sop lens lens-aeson monoidal-containers protolude string-interpolate tasty - tasty-discover tasty-hspec text + tasty-discover tasty-hspec text unordered-containers ]; testHaskellDepends = [ aeson base containers generics-sop lens lens-aeson monoidal-containers protolude string-interpolate tasty - tasty-discover tasty-hspec text + tasty-discover tasty-hspec text unordered-containers ]; testToolDepends = [ tasty-discover ]; description = "Cherry picking in JSON objects"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "jspath" = callPackage @@ -149558,18 +150042,18 @@ self: { }) {}; "juicy-gcode" = callPackage - ({ mkDerivation, base, configurator, lens, linear, matrix + ({ mkDerivation, base, configurator, gitrev, lens, linear, matrix , optparse-applicative, svg-tree, text }: mkDerivation { pname = "juicy-gcode"; - version = "0.1.0.10"; - sha256 = "17ps1kkbjvlvyjzbqagwikw960nn8q4dzjvng0waknr2gaa125bj"; + version = "0.2.0.1"; + sha256 = "1jpdxxfg3wdj9kz41a1pklyshrxxakf2bahcc7y1l7p7jklb3lbi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - base configurator lens linear matrix optparse-applicative svg-tree - text + base configurator gitrev lens linear matrix optparse-applicative + svg-tree text ]; description = "SVG to G-Code converter"; license = stdenv.lib.licenses.bsd3; @@ -150304,41 +150788,6 @@ self: { }: mkDerivation { pname = "katip"; - version = "0.8.4.0"; - sha256 = "0hkhvkdyk4m5pdr0yj1lbdwqvrfr7sq49jw683mk0lxjlyc39xm6"; - libraryHaskellDepends = [ - aeson async auto-update base bytestring containers either hostname - microlens microlens-th monad-control mtl old-locale resourcet - safe-exceptions scientific semigroups stm string-conv - template-haskell text time transformers transformers-base - transformers-compat unix unliftio-core unordered-containers - ]; - testHaskellDepends = [ - aeson base bytestring containers directory microlens - quickcheck-instances regex-tdfa safe-exceptions stm tasty - tasty-golden tasty-hunit tasty-quickcheck template-haskell text - time time-locale-compat unordered-containers - ]; - benchmarkHaskellDepends = [ - aeson async base blaze-builder criterion deepseq directory filepath - safe-exceptions text time transformers unix - ]; - description = "A structured logging framework"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "katip_0_8_5_0" = callPackage - ({ mkDerivation, aeson, async, auto-update, base, blaze-builder - , bytestring, containers, criterion, deepseq, directory, either - , filepath, hostname, microlens, microlens-th, monad-control, mtl - , old-locale, quickcheck-instances, regex-tdfa, resourcet - , safe-exceptions, scientific, semigroups, stm, string-conv, tasty - , tasty-golden, tasty-hunit, tasty-quickcheck, template-haskell - , text, time, time-locale-compat, transformers, transformers-base - , transformers-compat, unix, unliftio-core, unordered-containers - }: - mkDerivation { - pname = "katip"; version = "0.8.5.0"; sha256 = "1kjzsx4fqbknnv158ypg5jhmw7ww1rk1mf99g3dci09xg97wmgjk"; libraryHaskellDepends = [ @@ -150360,7 +150809,6 @@ self: { ]; description = "A structured logging framework"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "katip-datadog" = callPackage @@ -152191,6 +152639,27 @@ self: { broken = true; }) {egl = null; inherit (pkgs) glew;}; + "ktx-codec" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, directory + , filepath, shower, text, vector + }: + mkDerivation { + pname = "ktx-codec"; + version = "0.0.1.1"; + sha256 = "1qvkcmxilvlwsbp5pidkh3njwsj6k19ybz8jw5mcm90zdhx3gya0"; + libraryHaskellDepends = [ + base binary bytestring containers text vector + ]; + testHaskellDepends = [ + base binary bytestring containers directory filepath shower text + vector + ]; + description = "Khronos texture format"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "kubernetes-client" = callPackage ({ mkDerivation, aeson, attoparsec, base, base64-bytestring , bytestring, connection, containers, data-default-class, either @@ -153786,8 +154255,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.3.0.0"; - sha256 = "0pi983l9s182c4xcqj7xq3idv8wnshx7zva5a5wfhws403y5yy7v"; + version = "1.3.0.1"; + sha256 = "0681w4rz547if52yk0k32drhllx0k906nir0gs6xv0pqxkjc07ri"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -156345,12 +156814,10 @@ self: { ({ mkDerivation, accelerate, base, lens }: mkDerivation { pname = "lens-accelerate"; - version = "0.2.0.0"; - sha256 = "099vvakv7gq9sr9mh3hxj5byxxb4dw8lw7y1g3c4j1kz4gf2vxfk"; - revision = "1"; - editedCabalFile = "0ggm157i4bmgh7k0dv9zncgn4agwk7zn5wvsknxsnfqzy45qabi9"; + version = "0.3.0.0"; + sha256 = "1sk3iy5qv24mifx0gwd5z714lf3y3s4zpbff09mqk42whk2sdd0y"; libraryHaskellDepends = [ accelerate base lens ]; - description = "Instances to mix lens with accelerate"; + description = "Instances to mix lens with Accelerate"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -157296,8 +157763,8 @@ self: { }: mkDerivation { pname = "libarchive"; - version = "2.2.5.2"; - sha256 = "1qydgw1c74c0xp2d5d85qbyyng9rgqgxgvj6fhh94wzgkxj99al6"; + version = "3.0.0.0"; + sha256 = "0qwnp5jzmlvi7bpbh1dhz3lp91qf5phr8hb7m3h5q0a50d72dqpp"; setupHaskellDepends = [ base Cabal chs-cabal ]; libraryHaskellDepends = [ base bytestring composition-prelude deepseq dlist filepath mtl @@ -157418,6 +157885,26 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {ffi = null;}; + "libfuse3" = callPackage + ({ mkDerivation, base, bytestring, clock, fuse3, resourcet, time + , unix + }: + mkDerivation { + pname = "libfuse3"; + version = "0.1.0.0"; + sha256 = "0qwlaqcpmi7dfsjk219z0hrqmayg46qx1cwj1vcz1nfv8jlm8yif"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring clock resourcet time unix + ]; + libraryPkgconfigDepends = [ fuse3 ]; + description = "A Haskell binding for libfuse-3.x"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {inherit (pkgs) fuse3;}; + "libgit" = callPackage ({ mkDerivation, base, mtl, process }: mkDerivation { @@ -157968,8 +158455,6 @@ self: { testPkgconfigDepends = [ libsodium ]; description = "Low-level bindings to the libsodium C library"; license = stdenv.lib.licenses.isc; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) libsodium;}; "libssh2" = callPackage @@ -158869,10 +159354,8 @@ self: { }: mkDerivation { pname = "linear-accelerate"; - version = "0.6.0.0"; - sha256 = "1bwqbs4816xrrc0bcf3nllad1an7c8gv2n9d1qv3ybk7s4fw288s"; - revision = "1"; - editedCabalFile = "1sf1jqpymhkdl5xn1br13qkw3zyg7pqmmwcczcw19zpgwk4ai19v"; + version = "0.7.0.0"; + sha256 = "1rdbmchbvrg5g0ndfppswydn15qbp2k9dvx7wapfpy8971qqf2df"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ accelerate base distributive lens linear @@ -159706,23 +160189,19 @@ self: { benchmarkHaskellDepends = [ aeson attoparsec base criterion text ]; description = "Liquid template language library"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-base" = callPackage ({ mkDerivation, base, Cabal, liquid-ghc-prim, liquidhaskell }: mkDerivation { pname = "liquid-base"; - version = "4.14.0.0"; - sha256 = "07qy1xc04wbd46cd0zgw3znczang1h1sgllxswjjimaw1wp49xh3"; + version = "4.14.1.0"; + sha256 = "0w5pwksyf8fbr8v8j5mshcysxlbz4lxdvmayc3pj8cm8xcdrvzkm"; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ base liquid-ghc-prim liquidhaskell ]; description = "Drop-in base replacement for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-bytestring" = callPackage @@ -159738,8 +160217,6 @@ self: { libraryHaskellDepends = [ bytestring liquid-base liquidhaskell ]; description = "LiquidHaskell specs for the bytestring package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-containers" = callPackage @@ -159755,8 +160232,6 @@ self: { libraryHaskellDepends = [ containers liquid-base liquidhaskell ]; description = "LiquidHaskell specs for the containers package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-fixpoint" = callPackage @@ -159769,8 +160244,8 @@ self: { }: mkDerivation { pname = "liquid-fixpoint"; - version = "0.8.10.1"; - sha256 = "0mavpfwsm3a6cnw2p75hvjch1j0nb8qm1rflq304iz6msg9zbhsv"; + version = "0.8.10.2"; + sha256 = "1sdd88p5mz9xfqk9pbn138ixxdrq089iy5imskvhx66dwwrmrr8l"; configureFlags = [ "-fbuild-external" ]; isLibrary = true; isExecutable = true; @@ -159790,8 +160265,6 @@ self: { doCheck = false; description = "Predicate Abstraction-based Horn-Clause/Implication Constraint Solver"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) git; inherit (pkgs) nettools; inherit (pkgs) ocaml; inherit (pkgs) z3;}; @@ -159806,8 +160279,6 @@ self: { libraryHaskellDepends = [ ghc-prim liquidhaskell ]; description = "Drop-in ghc-prim replacement for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-parallel" = callPackage @@ -159822,22 +160293,18 @@ self: { libraryHaskellDepends = [ liquid-base liquidhaskell parallel ]; description = "LiquidHaskell specs for the parallel package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-platform" = callPackage ({ mkDerivation }: mkDerivation { pname = "liquid-platform"; - version = "0.8.10.1"; - sha256 = "1l1qpg08fhf2xbj7i3hy36idm2z4yggg7mlzyncjkjlqxdnmm44k"; + version = "0.8.10.2"; + sha256 = "1rhpq04nl9gcm9rwjd261ssn8q59pdcpfna0xwkcv3gmkgirwzgf"; isLibrary = false; isExecutable = true; description = "A battery-included platform for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-prelude" = callPackage @@ -159846,16 +160313,14 @@ self: { }: mkDerivation { pname = "liquid-prelude"; - version = "0.8.10.1"; - sha256 = "0pcz59spsg3x4c5553yksfqgdjlh2c33id10b6p8hnm6hyqcbjvn"; + version = "0.8.10.2"; + sha256 = "0s52kd2x4h24j6z7cjkrarnqr7kp198qal55y84740rllskv3ijh"; setupHaskellDepends = [ base Cabal liquidhaskell ]; libraryHaskellDepends = [ bytestring containers liquid-base liquidhaskell ]; description = "General utility modules for LiquidHaskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquid-vector" = callPackage @@ -159869,8 +160334,6 @@ self: { libraryHaskellDepends = [ liquid-base liquidhaskell vector ]; description = "LiquidHaskell specs for the vector package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "liquidhaskell" = callPackage @@ -159886,10 +160349,8 @@ self: { }: mkDerivation { pname = "liquidhaskell"; - version = "0.8.10.1"; - sha256 = "0xyxb0sifqgp1hl6lcydf7svw6w968hd3dgmnlly8ddpdmhsw9jm"; - revision = "1"; - editedCabalFile = "0bg9660c5454jiimgwciimd114r81gfjdad6nzbgyhkvilfd0wad"; + version = "0.8.10.2"; + sha256 = "0byh5lia3kb44sgmilya881dp9il3n5qvrn16brnkvl9xhr9rdyi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -159897,9 +160358,9 @@ self: { aeson base binary bytestring Cabal cereal cmdargs containers data-default deepseq Diff directory extra filepath fingertree ghc ghc-boot ghc-paths ghc-prim githash gitrev hashable hscolour - liquid-fixpoint mtl optics optparse-simple parsec pretty split syb - template-haskell temporary text time transformers - unordered-containers vector + liquid-fixpoint mtl optics optparse-applicative optparse-simple + parsec pretty split syb template-haskell temporary text time + transformers unordered-containers vector ]; executableHaskellDepends = [ base ]; testHaskellDepends = [ @@ -159911,8 +160372,6 @@ self: { testSystemDepends = [ z3 ]; description = "Liquid Types for Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) z3;}; "liquidhaskell-cabal" = callPackage @@ -160983,12 +161442,17 @@ self: { }) {}; "llvm-pretty" = callPackage - ({ mkDerivation, base, containers, monadLib, parsec, pretty }: + ({ mkDerivation, base, containers, microlens, microlens-th + , monadLib, parsec, pretty, template-haskell, th-abstraction + }: mkDerivation { pname = "llvm-pretty"; - version = "0.7.1.1"; - sha256 = "17lb4jfkaxz2ahjfvq2mxnb82k209qg13rhdg76v3j8yahr5z0a2"; - libraryHaskellDepends = [ base containers monadLib parsec pretty ]; + version = "0.11.0"; + sha256 = "17jw5i68fz2vk40dcqf8k7j6j6h8acg4fhnyygb72jbk17md4q94"; + libraryHaskellDepends = [ + base containers microlens microlens-th monadLib parsec pretty + template-haskell th-abstraction + ]; description = "A pretty printing library inspired by the llvm binding"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -161579,18 +162043,19 @@ self: { "log-elasticsearch" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring - , bloodhound, bytestring, deepseq, http-client, http-client-tls - , log-base, semigroups, text, text-show, time, transformers - , unordered-containers, vector + , bytestring, deepseq, http-client, http-client-tls, http-types + , log-base, network-uri, semigroups, text, text-show, time + , transformers, unordered-containers, vector }: mkDerivation { pname = "log-elasticsearch"; - version = "0.10.2.0"; - sha256 = "0kcixyklnak34v8vmmpw8vpm1mvf3wll6xpcdvfg1c75wc9n1hqy"; + version = "0.11.0.0"; + sha256 = "1l64mxk3zmlfsqwlhsq62jp8rawj3jbw9izihg7555q51pbqlg5w"; libraryHaskellDepends = [ - aeson aeson-pretty base base64-bytestring bloodhound bytestring - deepseq http-client http-client-tls log-base semigroups text - text-show time transformers unordered-containers vector + aeson aeson-pretty base base64-bytestring bytestring deepseq + http-client http-client-tls http-types log-base network-uri + semigroups text text-show time transformers unordered-containers + vector ]; description = "Structured logging solution (Elasticsearch back end)"; license = stdenv.lib.licenses.bsd3; @@ -161833,6 +162298,8 @@ self: { ]; description = "A mtl-style monad transformer for general purpose & compositional logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "logging-effect-extra" = callPackage @@ -162013,6 +162480,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logict_0_7_0_3" = callPackage + ({ mkDerivation, base, mtl, tasty, tasty-hunit }: + mkDerivation { + pname = "logict"; + version = "0.7.0.3"; + sha256 = "0psihirap7mrn3ly1h9dvgvgjsqbqwji8m13fm48zl205mpfh73r"; + libraryHaskellDepends = [ base mtl ]; + testHaskellDepends = [ base mtl tasty tasty-hunit ]; + description = "A backtracking logic-programming monad"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logict-state" = callPackage ({ mkDerivation, base, logict, mtl, transformers }: mkDerivation { @@ -162560,8 +163040,8 @@ self: { }: mkDerivation { pname = "lorentz"; - version = "0.5.0"; - sha256 = "0wvvxc49bc8cyfhhwzzhrdf3sia03d8hx2cxpjg3jab8bbxbqza1"; + version = "0.6.0"; + sha256 = "1mzw2m46g5gffhihjfwimrhwqlky3z420b5wifdvxybm5vfc0qm2"; libraryHaskellDepends = [ aeson-pretty base bimap bytestring constraints containers data-default first-class-families fmt interpolate lens morley @@ -163093,8 +163573,8 @@ self: { ({ mkDerivation, base, lucid }: mkDerivation { pname = "lucid-cdn"; - version = "0.1.1.1"; - sha256 = "1dl44rc5b3wrgfcllp6h1sw4w18jgglh1grh5w9g37rcxi2cxwll"; + version = "0.2.0.0"; + sha256 = "1b4s4yfhxnixc33kz0hnj2v5vrwag4vnssp8ma0vjgh17b9g4qzr"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; license = stdenv.lib.licenses.mit; @@ -163553,14 +164033,44 @@ self: { broken = true; }) {}; + "lz4-frame-conduit" = callPackage + ({ mkDerivation, base, bytestring, conduit, conduit-extra + , containers, hspec, inline-c, optparse-applicative, QuickCheck + , raw-strings-qq, resourcet, template-haskell, text, unliftio + , unliftio-core + }: + mkDerivation { + pname = "lz4-frame-conduit"; + version = "0.1.0.0"; + sha256 = "0nvvf42m4vbadl869hgyqrzbzbxp9q7rlbrldi4y6zw48ig21r1d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring conduit conduit-extra containers inline-c + raw-strings-qq resourcet template-haskell unliftio unliftio-core + ]; + executableHaskellDepends = [ + base bytestring conduit conduit-extra optparse-applicative + resourcet text + ]; + testHaskellDepends = [ + base bytestring conduit conduit-extra hspec QuickCheck resourcet + unliftio-core + ]; + description = "Conduit implementing the official LZ4 frame streaming format"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "lz4-hs" = callPackage ({ mkDerivation, base, bytestring, c2hs, criterion, filepath, tasty , tasty-hunit, temporary }: mkDerivation { pname = "lz4-hs"; - version = "0.1.4.1"; - sha256 = "15jm8lbwhgp29yvnwsxsmbixvgpxrnw7jc96zwmzbqx365r4dfqr"; + version = "0.1.5.0"; + sha256 = "0qqv6n7hjcjkc1pzhwkdr9l1kfb8rqndx2lfm6j4bhmvrwwrn8lw"; libraryHaskellDepends = [ base bytestring ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base bytestring tasty tasty-hunit ]; @@ -169564,25 +170074,6 @@ self: { }) {}; "mime-mail-ses" = callPackage - ({ mkDerivation, base, base64-bytestring, byteable, bytestring - , conduit, cryptohash, http-client, http-client-tls, http-conduit - , http-types, mime-mail, old-locale, text, time, transformers - , xml-conduit, xml-types - }: - mkDerivation { - pname = "mime-mail-ses"; - version = "0.4.1"; - sha256 = "1w6k4cm5yab9dhg7yn6mp7jzk1zdwpnzc6c1xb3vz3rdwp8jjvx7"; - libraryHaskellDepends = [ - base base64-bytestring byteable bytestring conduit cryptohash - http-client http-client-tls http-conduit http-types mime-mail - old-locale text time transformers xml-conduit xml-types - ]; - description = "Send mime-mail messages via Amazon SES"; - license = stdenv.lib.licenses.mit; - }) {}; - - "mime-mail-ses_0_4_2" = callPackage ({ mkDerivation, base, base16-bytestring, base64-bytestring , byteable, bytestring, case-insensitive, conduit, cryptohash , http-client, http-client-tls, http-conduit, http-types, mime-mail @@ -169609,7 +170100,6 @@ self: { ]; description = "Send mime-mail messages via Amazon SES"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "mime-string" = callPackage @@ -171685,6 +172175,8 @@ self: { ]; description = "monad-classes based typeclass for Ollie's logging-effect LoggingT"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "monad-codec" = callPackage @@ -173747,8 +174239,8 @@ self: { }: mkDerivation { pname = "morley"; - version = "1.5.0"; - sha256 = "151idw4dhdlsw9ga8q0mp3vnv520ljmkr0wm2hhhd7k0xliy177a"; + version = "1.6.0"; + sha256 = "0i06yh7v2zz8lcjhc96k5wsfj9i401mgs05myg46ml04zz4pw408"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -176956,6 +177448,8 @@ self: { ]; description = "A Markov stochastic transition operator with logging"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mwc-random" = callPackage @@ -177001,10 +177495,8 @@ self: { ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { pname = "mwc-random-accelerate"; - version = "0.1.0.0"; - sha256 = "1qrji6b39zp5wrgz5c59xv06l3khhp4fv2ybdmx4ac5i28yx7yih"; - revision = "3"; - editedCabalFile = "1a7xx3mcli9fx5lqg1zxwqbrgzvgbssn3vprh4wp8zg58pqic6ic"; + version = "0.2.0.0"; + sha256 = "1a8b36l60p29461y0gacgjzarlyrncl54r7x4zh2rgvs2w7mjdc5"; libraryHaskellDepends = [ accelerate base mwc-random ]; description = "Generate Accelerate arrays filled with high quality pseudorandom numbers"; license = stdenv.lib.licenses.bsd3; @@ -180687,8 +181179,8 @@ self: { }: mkDerivation { pname = "network-uri-json"; - version = "0.3.1.1"; - sha256 = "0akyhgi79pzhvfq47risrqmr6hi409fnz1ivwpwwfc4laimf3mky"; + version = "0.4.0.0"; + sha256 = "1hnsk8xsa89p4ywvyb4xfdk3l16mlhmb73sy1vbgckc7mlv3mmb4"; libraryHaskellDepends = [ aeson base network-uri text ]; testHaskellDepends = [ aeson base hspec network-arbitrary network-uri test-invariant text @@ -181757,8 +182249,8 @@ self: { }: mkDerivation { pname = "nix-tree"; - version = "0.1.0.0"; - sha256 = "0agj882mfnr53jlpn1cnds31b78qw3a13md1ap6jj2rnxs2zjcai"; + version = "0.1.1.0"; + sha256 = "1dciwsw7cv1f73awrqr3gw3zj3mizaw53q3ibkawq9gbfsfg8yiz"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -182445,8 +182937,8 @@ self: { }: mkDerivation { pname = "nonempty-containers"; - version = "0.3.4.0"; - sha256 = "1np8gypq49j90clavh17wzxp9y6z23lngal815jsg4p35qc0h01l"; + version = "0.3.4.1"; + sha256 = "0cpn0f0gnir9w366hw2906316qx5yc06rrrlv67xba1p66507m83"; libraryHaskellDepends = [ aeson base comonad containers deepseq nonempty-vector semigroupoids these vector @@ -183778,12 +184270,14 @@ self: { }: mkDerivation { pname = "nvvm"; - version = "0.9.0.0"; - sha256 = "00ggaycs5z2b617kgjv851ahrakd4v8w374qbym19r1ccrxkdhhb"; + version = "0.10.0.0"; + sha256 = "188zf4hlqgjj5xgsfvrkynhq8pc29qfkaz6rp61ij3adc30410al"; setupHaskellDepends = [ base Cabal cuda directory filepath template-haskell ]; - libraryHaskellDepends = [ base bytestring cuda template-haskell ]; + libraryHaskellDepends = [ + base bytestring cuda directory filepath template-haskell + ]; libraryToolDepends = [ c2hs ]; description = "FFI bindings to NVVM"; license = stdenv.lib.licenses.bsd3; @@ -185190,6 +185684,35 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_7_0_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-locale-compat, transformers, uuid + , void + }: + mkDerivation { + pname = "opaleye"; + version = "0.7.0.0"; + sha256 = "1a4ymnfw7gdqf2b5lsrfhxf53ybjfcyx31fdxn52fv89jc2h2yiy"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time time-locale-compat + transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -185979,14 +186502,14 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; - "opentelemetry_0_6_0" = callPackage + "opentelemetry_0_6_1" = callPackage ({ mkDerivation, base, bytestring, exceptions, ghc-trace-events , hashable }: mkDerivation { pname = "opentelemetry"; - version = "0.6.0"; - sha256 = "0gl3xax7gz89fc12lyw468qhailgja06skj6siscq9pip03gj6ck"; + version = "0.6.1"; + sha256 = "0i88ciig40gil4gaj95qw28c2racdr2jb6rcpnsf60fzkqc8b3fk"; libraryHaskellDepends = [ base bytestring exceptions ghc-trace-events hashable ]; @@ -186030,7 +186553,7 @@ self: { broken = true; }) {}; - "opentelemetry-extra_0_6_0" = callPackage + "opentelemetry-extra_0_6_1" = callPackage ({ mkDerivation, aeson, async, base, binary, bytestring, clock , containers, directory, exceptions, filepath, gauge , generic-arbitrary, ghc-events, hashable, hashtables, http-client @@ -186041,8 +186564,8 @@ self: { }: mkDerivation { pname = "opentelemetry-extra"; - version = "0.6.0"; - sha256 = "025fsryqzv0cfny1myrhs4bdrdg8sfp86rvxf671sbl8nli48x1a"; + version = "0.6.1"; + sha256 = "0ggxkhcrjj8sg6zf9jnp1j05wwlsay6k95c79j9j3dvw8qy2yjbx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186111,7 +186634,7 @@ self: { broken = true; }) {}; - "opentelemetry-lightstep_0_6_0" = callPackage + "opentelemetry-lightstep_0_6_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, clock, containers , exceptions, filepath, ghc-events, http-client, http-client-tls , http-types, network, opentelemetry, opentelemetry-extra @@ -186120,8 +186643,8 @@ self: { }: mkDerivation { pname = "opentelemetry-lightstep"; - version = "0.6.0"; - sha256 = "09xqda7hxx4dn85hs2zh7y3jjxvi7xprcpv8mmam38hzyhjw2rv7"; + version = "0.6.1"; + sha256 = "1a7rrm5aahqh63j0rr7nvd4y3q64m8qr7is0r0a17fwkkpppmyln"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -186155,14 +186678,14 @@ self: { broken = true; }) {}; - "opentelemetry-wai_0_6_0" = callPackage + "opentelemetry-wai_0_6_1" = callPackage ({ mkDerivation, base, bytestring, http-types, opentelemetry, text , wai }: mkDerivation { pname = "opentelemetry-wai"; - version = "0.6.0"; - sha256 = "1bqq1fs7krckx43w2j4pvfncbyy60rrh6w8n1pcvb629dary5lwn"; + version = "0.6.1"; + sha256 = "0g1a044sphd35z9crc8wbxsk4hfh1gpfi4g8rr1k4f842hznj7nf"; libraryHaskellDepends = [ base bytestring http-types opentelemetry text wai ]; @@ -187074,24 +187597,6 @@ self: { }: mkDerivation { pname = "optparse-simple"; - version = "0.1.1.2"; - sha256 = "1r00hkri42vyx552l8hcd1779fxiyl9w4k0pql915zsprirn8w82"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - base githash optparse-applicative template-haskell transformers - ]; - testHaskellDepends = [ base bytestring directory ]; - description = "Simple interface to optparse-applicative"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "optparse-simple_0_1_1_3" = callPackage - ({ mkDerivation, base, bytestring, directory, githash - , optparse-applicative, template-haskell, transformers - }: - mkDerivation { - pname = "optparse-simple"; version = "0.1.1.3"; sha256 = "1wymqhac2sngkka8w880gq6y1kk3xs0flbv4mrhfgzrplhax8r9k"; isLibrary = true; @@ -187102,7 +187607,6 @@ self: { testHaskellDepends = [ base bytestring directory ]; description = "Simple interface to optparse-applicative"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "optparse-text" = callPackage @@ -189072,7 +189576,7 @@ self: { broken = true; }) {}; - "pandoc-plot_0_9_1_0" = callPackage + "pandoc-plot_0_9_2_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec , hspec-expectations, lifted-async, mtl, optparse-applicative @@ -189081,8 +189585,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.9.1.0"; - sha256 = "0vfcn0h5x9jsf3jjriqd6wfa9cpi7icz4k8pkqmhjz5sgs2yv7i4"; + version = "0.9.2.0"; + sha256 = "0fryriyqlmfc82nqbqw7a8n7325wwag29v3ag61s600jw66i9fsc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -189521,7 +190025,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pantry_0_5_1_1" = callPackage + "pantry_0_5_1_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal , casa-client, casa-types, conduit, conduit-extra, containers , cryptonite, cryptonite-conduit, digest, exceptions, filelock @@ -189535,8 +190039,8 @@ self: { }: mkDerivation { pname = "pantry"; - version = "0.5.1.1"; - sha256 = "1q1q8jflhd5r70czsclkj27yqk4v8b1njdw8f4qb3xvf9c3gzl70"; + version = "0.5.1.2"; + sha256 = "1ix1y334l4a7zcqm8i849g67mgvkqzikbhcbkqc1d6hg1lhc7xzr"; libraryHaskellDepends = [ aeson ansi-terminal base bytestring Cabal casa-client casa-types conduit conduit-extra containers cryptonite cryptonite-conduit @@ -191533,8 +192037,8 @@ self: { ({ mkDerivation, base, binary, path }: mkDerivation { pname = "path-binary-instance"; - version = "0.1.0.0"; - sha256 = "1mrmp58s7f88hyq493h39c1f19r92yh2qw1diml61iwhm765j7ir"; + version = "0.1.0.1"; + sha256 = "19ck3ja66vcgl90wyw6r9d2h50kdv9gjs7sxjgciam6v6867vb0y"; libraryHaskellDepends = [ base binary path ]; description = "Binary instance for Path"; license = stdenv.lib.licenses.mit; @@ -191594,8 +192098,8 @@ self: { ({ mkDerivation, base, path }: mkDerivation { pname = "path-like"; - version = "0.2.0.1"; - sha256 = "03d5kqs6xr22dl7gjydi1nlzy13wsc0dkmd93pwf37yp85y4bxrp"; + version = "0.2.0.2"; + sha256 = "1hr58zcgcybd34zzas5kf0jgcm5z2wdlbhskwj9233503nnlwkq9"; libraryHaskellDepends = [ base path ]; description = "PathLike, FileLike and DirLike type classes for the Path library"; license = stdenv.lib.licenses.mit; @@ -193683,8 +194187,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.10.0.0"; - sha256 = "1z895y21raak3x9qw05hgif5qyvr6c7pkc59wzg7irk8mxijyf4n"; + version = "2.10.0.1"; + sha256 = "194cxlxyaxwzgm7a7q8530bh842s5s1vmq33pclldp78nfy1dczm"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -193896,24 +194400,23 @@ self: { }) {}; "persistent-redis" = callPackage - ({ mkDerivation, aeson, attoparsec, base, binary, bytestring, hedis - , http-api-data, monad-control, mtl, path-pieces, persistent - , persistent-template, scientific, template-haskell, text, time - , transformers, utf8-string + ({ mkDerivation, aeson, base, binary, bytestring, hedis + , http-api-data, mtl, path-pieces, persistent, persistent-template + , scientific, template-haskell, text, time, transformers + , utf8-string }: mkDerivation { pname = "persistent-redis"; - version = "2.5.2.2"; - sha256 = "1mkdc3s39h0zqzf86zzwyfxfpc4fasrhpfdypkj8mkljbh7v1i1l"; + version = "2.5.2.5"; + sha256 = "0h2bwr5svj36n3axnrgnrzkysg4ywf9d97x4fwwsjgn01gwr262k"; libraryHaskellDepends = [ - aeson attoparsec base binary bytestring hedis http-api-data - monad-control mtl path-pieces persistent scientific text time - transformers utf8-string + aeson base binary bytestring hedis http-api-data mtl path-pieces + persistent scientific text time transformers utf8-string ]; testHaskellDepends = [ - aeson attoparsec base binary bytestring hedis http-api-data - monad-control mtl path-pieces persistent persistent-template - scientific template-haskell text time transformers utf8-string + aeson base binary bytestring hedis http-api-data mtl path-pieces + persistent persistent-template scientific template-haskell text + time transformers utf8-string ]; description = "Backend for persistent library using Redis"; license = stdenv.lib.licenses.bsd3; @@ -194144,6 +194647,30 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-test_2_0_3_2" = callPackage + ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit + , containers, exceptions, hspec, hspec-expectations, HUnit + , monad-control, monad-logger, mtl, path-pieces, persistent + , persistent-template, QuickCheck, quickcheck-instances, random + , resourcet, text, time, transformers, transformers-base, unliftio + , unliftio-core, unordered-containers + }: + mkDerivation { + pname = "persistent-test"; + version = "2.0.3.2"; + sha256 = "0d7a6m4qm6xzyv7h2fqn9hgv7r7q6dwh7x04ddsrygjxdgpwgqf3"; + libraryHaskellDepends = [ + aeson base blaze-html bytestring conduit containers exceptions + hspec hspec-expectations HUnit monad-control monad-logger mtl + path-pieces persistent persistent-template QuickCheck + quickcheck-instances random resourcet text time transformers + transformers-base unliftio unliftio-core unordered-containers + ]; + description = "Tests for Persistent"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-typed-db" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, esqueleto, hspec , http-api-data, monad-logger, path-pieces, persistent @@ -198377,6 +198904,40 @@ self: { broken = true; }) {}; + "polysemy-http" = callPackage + ({ mkDerivation, aeson, ansi-terminal, base-noprelude, bytestring + , case-insensitive, co-log-core, co-log-polysemy, composition + , containers, data-default, either, hedgehog, http-client + , http-client-tls, http-conduit, http-types, lens, mono-traversable + , network, polysemy, polysemy-plugin, relude, servant + , servant-client, servant-server, string-interpolate, tasty + , tasty-hedgehog, template-haskell, text, warp + }: + mkDerivation { + pname = "polysemy-http"; + version = "0.1.0.0"; + sha256 = "025dch3cq8bgyy78yg4jrcxxmkdyl03y38zrgjhfv00rrwcffhm0"; + libraryHaskellDepends = [ + aeson ansi-terminal base-noprelude bytestring case-insensitive + co-log-core co-log-polysemy composition containers data-default + either http-client http-client-tls http-conduit http-types lens + mono-traversable polysemy polysemy-plugin relude string-interpolate + template-haskell text + ]; + testHaskellDepends = [ + aeson ansi-terminal base-noprelude bytestring case-insensitive + co-log-core co-log-polysemy composition containers data-default + either hedgehog http-client http-client-tls http-conduit http-types + lens mono-traversable network polysemy polysemy-plugin relude + servant servant-client servant-server string-interpolate tasty + tasty-hedgehog template-haskell text warp + ]; + description = "Polysemy effect for http-client"; + license = "BSD-2-Clause-Patent"; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-optics" = callPackage ({ mkDerivation, base, optics, polysemy, polysemy-zoo }: mkDerivation { @@ -201980,6 +202541,8 @@ self: { libraryHaskellDepends = [ base lucid prettyprinter text ]; description = "A prettyprinter backend for lucid"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "prettyprinter-vty" = callPackage @@ -203532,8 +204095,8 @@ self: { }: mkDerivation { pname = "prolog"; - version = "0.3"; - sha256 = "02i79irax13rny953k6fvswsgbif9nnvysnnbq3k4w37b3g5maiv"; + version = "0.3.2"; + sha256 = "1clh7gfqh2yf17jc453y8cc8qcga9h0j5a60nfr1sjd5byr8j8ab"; libraryHaskellDepends = [ base containers mtl parsec syb template-haskell th-lift transformers @@ -204138,8 +204701,8 @@ self: { }: mkDerivation { pname = "proto-lens-jsonpb"; - version = "0.2.0.1"; - sha256 = "0hsjn0iy0bbpb1sczk6vj2vah5f60w8cpm2gach5zlb9qpvkg4x4"; + version = "0.2.0.2"; + sha256 = "1r98841byxkg5941yjrw15n56i0x68qr3gk29bimwcfifdf0idm2"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring proto-lens-runtime text vector @@ -204792,6 +205355,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "psql-utils" = callPackage + ({ mkDerivation, aeson, base, hashable, postgresql-simple + , resource-pool, time + }: + mkDerivation { + pname = "psql-utils"; + version = "0.1.0.0"; + sha256 = "09s26lqqdy2qah6i0yim9g2h61hramhij7r9kbcccbc3fgv4sd6s"; + libraryHaskellDepends = [ + aeson base hashable postgresql-simple resource-pool time + ]; + description = "PostgreSQL Simple util tools"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "psqueues" = callPackage ({ mkDerivation, array, base, containers, criterion, deepseq , fingertree-psqueue, ghc-prim, hashable, HUnit, mtl, PSQueue @@ -207453,6 +208031,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickjs-hs" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, exceptions + , HUnit, inline-c, mtl, QuickCheck, scientific, string-conv, tasty + , tasty-hunit, tasty-quickcheck, text, time, transformers + , unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "quickjs-hs"; + version = "0.1.2.1"; + sha256 = "0dbypa7p3x5j2nmbw2qvs4aik74jfkfa9b0mmv2290p6sj9ag1hd"; + revision = "1"; + editedCabalFile = "0f18980s2sky2fnrdnadyhivjhbzxcq9m3isnji8q2gbzpbywca7"; + libraryHaskellDepends = [ + aeson base bytestring containers exceptions inline-c mtl scientific + string-conv text time transformers unliftio-core + unordered-containers vector + ]; + testHaskellDepends = [ + aeson base exceptions HUnit QuickCheck tasty tasty-hunit + tasty-quickcheck text unordered-containers vector + ]; + description = "Wrapper for the QuickJS Javascript Engine"; + license = stdenv.lib.licenses.mit; + }) {}; + "quicklz" = callPackage ({ mkDerivation, base, bytestring, QuickCheck, test-framework , test-framework-quickcheck2 @@ -208686,6 +209289,8 @@ self: { pname = "random"; version = "1.2.0"; sha256 = "1pmr7zbbqg58kihhhwj8figf5jdchhi7ik2apsyxbgsqq3vrqlg4"; + revision = "1"; + editedCabalFile = "11l9bcjy63qvcm4n7djp2l1l8668hbckkkdb2nj5g6iyy9pb2sa9"; libraryHaskellDepends = [ base bytestring deepseq mtl splitmix ]; testHaskellDepends = [ base bytestring containers doctest mwc-random primitive smallcheck @@ -210786,28 +211391,35 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "reanimate_0_4_1_0" = callPackage + "reanimate_0_4_2_0" = callPackage ({ mkDerivation, aeson, ansi-terminal, array, attoparsec, base - , base64-bytestring, bytestring, cassava, cereal, chiphunk, colour - , containers, cubicbezier, directory, earcut, filepath, fsnotify - , geojson, hashable, hmatrix, JuicyPixels, lens, linear, matrix - , mtl, neat-interpolation, open-browser, optparse-applicative - , parallel, process, random, random-shuffle, reanimate-svg, split - , temporary, text, time, vector, vector-space, websockets, xml + , base64-bytestring, bytestring, cassava, cereal, colour + , containers, cubicbezier, directory, filelock, filepath, fsnotify + , geojson, ghcid, hashable, hgeometry, hgeometry-combinatorial + , JuicyPixels, lens, linear, matrix, mtl, neat-interpolation + , open-browser, optparse-applicative, parallel, process, QuickCheck + , random, random-shuffle, reanimate-svg, split, tasty, tasty-golden + , tasty-hunit, tasty-quickcheck, tasty-rerun, temporary, text, time + , vector, vector-space, websockets, xml }: mkDerivation { pname = "reanimate"; - version = "0.4.1.0"; - sha256 = "12mql2i3433y3cj4x3rcilmvja4cnyk9y5cykw16sg30kbp1riki"; + version = "0.4.2.0"; + sha256 = "0dihh2k0cvh17qb37pfn1h6g620yzp923wrjqy22qbmlld896snk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson ansi-terminal array attoparsec base base64-bytestring - bytestring cassava cereal chiphunk colour containers cubicbezier - directory earcut filepath fsnotify geojson hashable hmatrix - JuicyPixels lens linear matrix mtl neat-interpolation open-browser - optparse-applicative parallel process random random-shuffle - reanimate-svg split temporary text time vector vector-space - websockets xml + bytestring cassava cereal colour containers cubicbezier directory + filelock filepath fsnotify geojson ghcid hashable hgeometry + hgeometry-combinatorial JuicyPixels lens linear matrix mtl + neat-interpolation open-browser optparse-applicative parallel + process random random-shuffle reanimate-svg split temporary text + time vector vector-space websockets xml + ]; + testHaskellDepends = [ + base bytestring directory filepath linear process QuickCheck tasty + tasty-golden tasty-hunit tasty-quickcheck tasty-rerun temporary + text vector ]; description = "Animation library based on SVGs"; license = stdenv.lib.licenses.publicDomain; @@ -210973,8 +211585,8 @@ self: { }: mkDerivation { pname = "recommender-als"; - version = "0.2.0.0"; - sha256 = "14nw3ns52da4jlbwblbavchxzv1pjhc1zkjzcwfrqznxgsd5525p"; + version = "0.2.1.1"; + sha256 = "0qc91hn42mc2pmljb836chdas1jzsrqbg44cjylx31y0y72dmhdq"; libraryHaskellDepends = [ base containers data-default-class hmatrix parallel random vector ]; @@ -213461,35 +214073,6 @@ self: { }: mkDerivation { pname = "registry"; - version = "0.1.9.1"; - sha256 = "0vnx2sq3m6mqm1wcicknf7b8pfamx4pbn51hmzs6arwnvsq23vng"; - libraryHaskellDepends = [ - base containers exceptions hashable mmorph mtl protolude resourcet - semigroupoids semigroups template-haskell text transformers-base - ]; - testHaskellDepends = [ - async base bytestring containers directory exceptions generic-lens - hashable hedgehog io-memoize mmorph MonadRandom mtl multimap - protolude random resourcet semigroupoids semigroups tasty - tasty-discover tasty-hedgehog tasty-th template-haskell text - transformers-base universum - ]; - testToolDepends = [ tasty-discover ]; - description = "data structure for assembling components"; - license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {}; - - "registry_0_1_9_3" = callPackage - ({ mkDerivation, async, base, bytestring, containers, directory - , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph - , MonadRandom, mtl, multimap, protolude, random, resourcet - , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog - , tasty-th, template-haskell, text, transformers-base, universum - }: - mkDerivation { - pname = "registry"; version = "0.1.9.3"; sha256 = "1x418lv2nnw5ryrinciq1dg7wgmz0zsvv8v3mfrp38rx5x88hbic"; libraryHaskellDepends = [ @@ -214504,8 +215087,8 @@ self: { pname = "repa-io"; version = "3.4.1.1"; sha256 = "1nm9kfin6fv016r02l74c9hf8pr1rz7s33i833cqpyw8m6bcmnxm"; - revision = "4"; - editedCabalFile = "1lswfxmfn31gm2ayqwns9q9kpbad69scxpq6ybyzxkb9jd0jx4bl"; + revision = "5"; + editedCabalFile = "1v9bza21a3h0pkaxs628jjfli157d44i757da250fxwwamk8sg88"; libraryHaskellDepends = [ base binary bmp bytestring old-time repa vector ]; @@ -219009,6 +219592,8 @@ self: { testHaskellDepends = [ base directory hspec process ]; description = "Stack wrapper for single-file Haskell programs"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "runmany" = callPackage @@ -219263,10 +219848,8 @@ self: { }: mkDerivation { pname = "safe-exceptions"; - version = "0.1.7.0"; - sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; - revision = "6"; - editedCabalFile = "0x82m44qwf3fls3ypbdca958l9hhfqyfip6rzzxi7648f0sasv21"; + version = "0.1.7.1"; + sha256 = "0gkxacfiqp55xzbmpz5i5c4kqma8jal49q7c8gl9n9qq5c5dvxjb"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; description = "Safe, consistent, and easy exception handling"; @@ -219364,8 +219947,8 @@ self: { pname = "safe-json"; version = "1.1.0"; sha256 = "18zsf2dccgf755a8g4ar3zc7ilmampsrvqa6f9p27zrayl7j87hw"; - revision = "3"; - editedCabalFile = "12jjph25vffkj55ds468zv144qxwyrb6qmp2g1pb03732n6z9596"; + revision = "4"; + editedCabalFile = "12z5z68bfrzv3laagbssdcv7g97bpk2wf1bjirrivbhdbslf6l4q"; libraryHaskellDepends = [ aeson base bytestring containers dlist hashable scientific tasty tasty-hunit tasty-quickcheck text time unordered-containers @@ -223130,21 +223713,19 @@ self: { "semantic-source" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, deepseq - , doctest, generic-monoid, hashable, hedgehog, lingo, pathtype - , QuickCheck, semilattices, tasty, tasty-hedgehog, tasty-hunit - , text + , hashable, hedgehog, lingo, pathtype, semilattices, tasty + , tasty-hedgehog, tasty-hunit, text }: mkDerivation { pname = "semantic-source"; - version = "0.1.0.0"; - sha256 = "179rxsn1cyh77yn7vzmii38ipgcjpavlyf5xbx4j8zzgh1jklmc5"; + version = "0.1.0.1"; + sha256 = "1v4q9yc91lrx02wdhxp1njzm8g9qlwr40593lwcn6bxlad5sk6yd"; libraryHaskellDepends = [ - aeson base bytestring containers deepseq generic-monoid hashable - lingo pathtype semilattices text + aeson base bytestring containers deepseq hashable lingo pathtype + semilattices text ]; testHaskellDepends = [ - base doctest hedgehog QuickCheck tasty tasty-hedgehog tasty-hunit - text + base hedgehog tasty tasty-hedgehog tasty-hunit text ]; description = "Types and functionality for working with source code"; license = stdenv.lib.licenses.mit; @@ -225661,14 +226242,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-lucid_0_9_0_1" = callPackage + "servant-lucid_0_9_0_2" = callPackage ({ mkDerivation, base, http-media, lucid, servant, servant-server , text, wai, warp }: mkDerivation { pname = "servant-lucid"; - version = "0.9.0.1"; - sha256 = "1jhs9qy36vccy90s24cd9bmhqs604xqd9m8a4fbkjxrcpgdzfjgq"; + version = "0.9.0.2"; + sha256 = "0l68dffx746j3p2l5x59cj5cdng2dw6vjq5x5h44m0ccbsmlckpz"; libraryHaskellDepends = [ base http-media lucid servant text ]; testHaskellDepends = [ base lucid servant-server wai warp ]; description = "Servant support for lucid"; @@ -226225,8 +226806,8 @@ self: { }: mkDerivation { pname = "servant-reflex"; - version = "0.3.4"; - sha256 = "1k7dkzs2lsdjj94ai7p225zm09l9sgbxpb4av14xgy9m54rih5kk"; + version = "0.3.5"; + sha256 = "0b4ppjnfas6pwypd16vkq98q1fs0l7cw32hhliv582xfvc0v3k8l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -226516,8 +227097,8 @@ self: { }: mkDerivation { pname = "servant-static-th"; - version = "0.2.3.0"; - sha256 = "0gyfjrrq7anhn4b613gnaa0r2xm8rkminx1nrrbpn6bw47axadj4"; + version = "0.2.4.0"; + sha256 = "1xmikym19kq912apmh6zcdjzbz23mhn580pvsy5ll35ylqziaflk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -228248,14 +228829,16 @@ self: { }: mkDerivation { pname = "shake-dhall"; - version = "0.1.1.2"; - sha256 = "0jlbq9d6sjrbywd0afgsqqw1ffjlh5k4mr5v2bn45js29hipkivk"; + version = "0.1.1.3"; + sha256 = "1crakjnib9hvqph8f0wn0ii0y4hp9vix40kd8fpz85mdqfsynf5q"; libraryHaskellDepends = [ base containers dhall directory filepath shake text ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Dhall dependencies"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "shake-elm" = callPackage @@ -228439,12 +229022,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "shake-plus_0_3_2_0" = callPackage + "shake-plus_0_3_3_0" = callPackage ({ mkDerivation, base, extra, path, rio, shake }: mkDerivation { pname = "shake-plus"; - version = "0.3.2.0"; - sha256 = "0cgn1hgxp3kly7yp4s8mx714p1gnf30jpp6vjl47l19vc21hfzj5"; + version = "0.3.3.0"; + sha256 = "13a5n6gh1msrygi671lk5y83shcd75yz64x3r2smxif5hsfazwqv"; libraryHaskellDepends = [ base extra path rio shake ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; @@ -228452,18 +229035,19 @@ self: { }) {}; "shake-plus-extended" = callPackage - ({ mkDerivation, base, comonad, extra, ixset-typed - , ixset-typed-binary-instance, ixset-typed-hashable-instance, path - , path-binary-instance, rio, shake, shake-plus, within + ({ mkDerivation, aeson, base, binary-instances, comonad, extra + , http-conduit, ixset-typed, ixset-typed-binary-instance + , ixset-typed-hashable-instance, path, path-binary-instance, rio + , shake, shake-plus, within }: mkDerivation { pname = "shake-plus-extended"; - version = "0.3.0.0"; - sha256 = "040g0h0a03wmwhbqn06jxwf5h0lwsiqfa1x1x9wzyw8m52f5ngn4"; + version = "0.4.0.0"; + sha256 = "1y12hcsyp8slzacjz8dim64m9sr09z7ppv3s4l30wyha9r395x8i"; libraryHaskellDepends = [ - base comonad extra ixset-typed ixset-typed-binary-instance - ixset-typed-hashable-instance path path-binary-instance rio shake - shake-plus within + aeson base binary-instances comonad extra http-conduit ixset-typed + ixset-typed-binary-instance ixset-typed-hashable-instance path + path-binary-instance rio shake shake-plus within ]; description = "Experimental extensions to shake-plus"; license = stdenv.lib.licenses.mit; @@ -228578,6 +229162,32 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "shakespeare_2_0_25" = callPackage + ({ mkDerivation, aeson, base, blaze-html, blaze-markup, bytestring + , containers, directory, exceptions, ghc-prim, hspec, HUnit, parsec + , process, scientific, template-haskell, text, th-lift, time + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "shakespeare"; + version = "2.0.25"; + sha256 = "1fjv3yg425d87d3dih0l3ff95g5a5yp9w85m58sjara6xqivj9s4"; + libraryHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim parsec process scientific template-haskell text + th-lift time transformers unordered-containers vector + ]; + testHaskellDepends = [ + aeson base blaze-html blaze-markup bytestring containers directory + exceptions ghc-prim hspec HUnit parsec process template-haskell + text time transformers + ]; + description = "A toolkit for making compile-time interpolated templates"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "shakespeare-babel" = callPackage ({ mkDerivation, base, classy-prelude, data-default, directory , process, shakespeare, template-haskell @@ -229132,6 +229742,38 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "shelly_1_8_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib + , HUnit, lifted-async, lifted-base, monad-control, mtl, process + , system-fileio, system-filepath, text, time, transformers + , transformers-base, unix, unix-compat + }: + mkDerivation { + pname = "shelly"; + version = "1.8.1"; + sha256 = "023fbvbqs5gdwm30j5517gbdcc7fvz0md70dgwgpypkskj3i926y"; + revision = "1"; + editedCabalFile = "0crf0m077wky76f5nav2p9q4fa5q4yhv5l4bq9hd073dzdaywhz0"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions lifted-async lifted-base monad-control mtl process + system-fileio system-filepath text time transformers + transformers-base unix unix-compat + ]; + testHaskellDepends = [ + async base bytestring containers directory enclosed-exceptions + exceptions filepath hspec hspec-contrib HUnit lifted-async + lifted-base monad-control mtl process system-fileio system-filepath + text time transformers transformers-base unix unix-compat + ]; + description = "shell-like (systems) programming in Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "shelly" = callPackage ({ mkDerivation, async, base, bytestring, containers, directory , enclosed-exceptions, exceptions, filepath, hspec, hspec-contrib @@ -235576,18 +236218,18 @@ self: { "souffle-haskell" = callPackage ({ mkDerivation, array, base, containers, deepseq, directory, extra , filepath, hedgehog, hspec, hspec-hedgehog, megaparsec, mtl - , process, template-haskell, temporary, text, type-errors-pretty - , vector + , neat-interpolation, process, template-haskell, temporary, text + , type-errors-pretty, vector }: mkDerivation { pname = "souffle-haskell"; - version = "1.1.0"; - sha256 = "0s8zl7f6v89m6a3yhlmji1lb8k3rfwzyyg307m3f35a9kms0988p"; + version = "2.0.0"; + sha256 = "0x6v1g5in762w1hhwcg5ipa0c491wp0mflqljjpl99da6kr1l93f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - array base deepseq directory filepath mtl process template-haskell - temporary text type-errors-pretty vector + array base containers deepseq directory filepath mtl process + template-haskell temporary text type-errors-pretty vector ]; executableHaskellDepends = [ array base containers deepseq directory extra filepath megaparsec @@ -235595,9 +236237,9 @@ self: { vector ]; testHaskellDepends = [ - array base deepseq directory filepath hedgehog hspec hspec-hedgehog - mtl process template-haskell temporary text type-errors-pretty - vector + array base containers deepseq directory filepath hedgehog hspec + hspec-hedgehog mtl neat-interpolation process template-haskell + temporary text type-errors-pretty vector ]; description = "Souffle Datalog bindings for Haskell"; license = stdenv.lib.licenses.mit; @@ -236009,6 +236651,19 @@ self: { broken = true; }) {}; + "spars" = callPackage + ({ mkDerivation, base, containers }: + mkDerivation { + pname = "spars"; + version = "0.1.0.0"; + sha256 = "1q1vpwrr96k41p9zj5x7mjd3817iq9a762q3jfqkwd0cb41iyka6"; + libraryHaskellDepends = [ base containers ]; + description = "A sparse set-based parsing library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "sparse" = callPackage ({ mkDerivation, array, base, bytestring, containers, contravariant , criterion, deepseq, directory, doctest, filepath, hlint @@ -243692,6 +244347,28 @@ self: { broken = true; }) {}; + "supernova" = callPackage + ({ mkDerivation, aeson, async, base, bifunctor, binary, bytestring + , Cabal, crc32c, exceptions, lens-family-core, logging, managed + , network, proto-lens, proto-lens-runtime, proto-lens-setup + , streamly, text, unliftio + }: + mkDerivation { + pname = "supernova"; + version = "0.0.1"; + sha256 = "0v0x1xk63kxrf2ihhdr24z7ami557d3w2zizd0g8xqp02pr5gs8z"; + setupHaskellDepends = [ base Cabal proto-lens-setup ]; + libraryHaskellDepends = [ + base bifunctor binary bytestring crc32c exceptions lens-family-core + logging managed network proto-lens proto-lens-runtime text unliftio + ]; + testHaskellDepends = [ aeson async base bytestring streamly text ]; + description = "Apache Pulsar client for Haskell"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "supero" = callPackage ({ mkDerivation, base, containers, cpphs, directory, filepath , haskell-src-exts, mtl, process, time, uniplate @@ -248765,6 +249442,18 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "template-haskell-compat-v0208_0_1_4" = callPackage + ({ mkDerivation, base, template-haskell }: + mkDerivation { + pname = "template-haskell-compat-v0208"; + version = "0.1.4"; + sha256 = "0byc81m07v5a765vs4jpwgmgkf54c2n5yaqz8ava1sspmmf2p9fh"; + libraryHaskellDepends = [ base template-haskell ]; + description = "A backwards compatibility layer for Template Haskell newer than 2.8"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "template-haskell-util" = callPackage ({ mkDerivation, base, GenericPretty, ghc-prim, template-haskell }: mkDerivation { @@ -249605,8 +250294,6 @@ self: { ]; description = "Terminal emulator configurable in Haskell"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {inherit (pkgs) gtk3; inherit (pkgs) pcre2; vte_291 = pkgs.vte;}; @@ -254913,8 +255600,8 @@ self: { pname = "token-bucket"; version = "0.1.0.1"; sha256 = "1l3axqdkrjf28pxhrvdvlpf9wi79czsfvhi33w4v2wbj0g00j9ii"; - revision = "5"; - editedCabalFile = "049d9bk5f8qa6d7gjgg4nqd56xz1mrxr1rxcwxsrk4vkqcpmzs6q"; + revision = "6"; + editedCabalFile = "15p4iycphz4q58kgq00kmz0ik0hzv3vx47k2dkp93xavb0dny46v"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base time ]; description = "Rate limiter using lazy bucket algorithm"; @@ -256959,8 +257646,8 @@ self: { pname = "tree-diff"; version = "0.1"; sha256 = "1156nbqn0pn9lp4zjsy4vv5g5wmy4zxwmbqdgvq349rydynh3ng3"; - revision = "4"; - editedCabalFile = "0zl94ppd94szvmqa7vnpbcr2zfppbqm4k6isidzks2mz2ji9dc1i"; + revision = "5"; + editedCabalFile = "1b60x9cgp7hn42hc97q866ybhg5hx3sp45j6gngpbwryg29r2p4h"; libraryHaskellDepends = [ aeson ansi-terminal ansi-wl-pprint base base-compat bytestring bytestring-builder containers hashable parsec parsers pretty @@ -258954,8 +259641,8 @@ self: { }: mkDerivation { pname = "twirp"; - version = "0.2.0.0"; - sha256 = "00dc6bil998fdvb5p0r2782cy3nknw6s8k5a0cv4yqmha4iyn32m"; + version = "0.2.0.1"; + sha256 = "05np0zvnvy8wrm9lirrkwhd0n8f44j4xwr6lrywxxy9r00mx8bbl"; libraryHaskellDepends = [ aeson base bytestring http-media http-types proto-lens proto-lens-jsonpb proto-lens-runtime servant text wai @@ -261725,28 +262412,6 @@ self: { }) {}; "unicode-transforms" = callPackage - ({ mkDerivation, base, bitarray, bytestring, deepseq, filepath - , gauge, getopt-generics, optparse-applicative, path, path-io - , QuickCheck, split, text - }: - mkDerivation { - pname = "unicode-transforms"; - version = "0.3.6"; - sha256 = "1akscvyssif4hki3g6hy0jmjyr8cqly1whzvzj0km2b3qh0x09l3"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base bitarray bytestring text ]; - testHaskellDepends = [ - base deepseq getopt-generics QuickCheck split text - ]; - benchmarkHaskellDepends = [ - base deepseq filepath gauge optparse-applicative path path-io text - ]; - description = "Unicode normalization"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "unicode-transforms_0_3_7" = callPackage ({ mkDerivation, base, bytestring, deepseq, filepath, gauge , getopt-generics, ghc-prim, hspec, path, path-io, QuickCheck , split, text @@ -261766,7 +262431,6 @@ self: { ]; description = "Unicode normalization"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "unicode-tricks" = callPackage @@ -262455,7 +263119,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "universum_1_7_0" = callPackage + "universum_1_7_1" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, doctest , gauge, ghc-prim, Glob, hashable, hedgehog, microlens , microlens-mtl, mtl, safe-exceptions, stm, tasty, tasty-hedgehog @@ -262463,8 +263127,8 @@ self: { }: mkDerivation { pname = "universum"; - version = "1.7.0"; - sha256 = "079sck4cfhvx4zda5qiz7vs3050l87ik9hx8yjc6bihrzlqvmgfb"; + version = "1.7.1"; + sha256 = "0jsdzhy0h5d6znnrdgzr29b6qkriidck5s6yp52pci30rfv1d29z"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -263638,6 +264302,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "url-bytes" = callPackage + ({ mkDerivation, base, byteslice, bytesmith, bytestring, deepseq + , gauge, HUnit, primitive, tasty, tasty-hunit, template-haskell + , uri-bytestring, weigh + }: + mkDerivation { + pname = "url-bytes"; + version = "0.1.0.0"; + sha256 = "0nbxnmz1m2icg3vvdndr4zydwr8nbgxhb70ak2jzc6d92c3vhvqi"; + libraryHaskellDepends = [ + base byteslice bytesmith primitive template-haskell + ]; + testHaskellDepends = [ + base byteslice HUnit primitive tasty tasty-hunit + ]; + benchmarkHaskellDepends = [ + base byteslice bytestring deepseq gauge primitive uri-bytestring + weigh + ]; + description = "Memory efficient url type and parser"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "url-decoders" = callPackage ({ mkDerivation, base, base-prelude, binary-parser, bytestring , criterion, http-types, QuickCheck, quickcheck-instances, rerebase @@ -266133,23 +266822,6 @@ self: { }: mkDerivation { pname = "vector-sized"; - version = "1.4.1.0"; - sha256 = "14l6c8l8l29f6kdffknd70kkccfjcf105i1zd0kchgsgjnr9p6l1"; - libraryHaskellDepends = [ - adjunctions base binary comonad deepseq distributive - finite-typelits hashable indexed-list-literals primitive vector - ]; - description = "Size tagged vectors"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "vector-sized_1_4_2" = callPackage - ({ mkDerivation, adjunctions, base, binary, comonad, deepseq - , distributive, finite-typelits, hashable, indexed-list-literals - , primitive, vector - }: - mkDerivation { - pname = "vector-sized"; version = "1.4.2"; sha256 = "02a7jzik6a6w1xb6bwpvl6hmii6jgi9wr0q7p48bfbq0mlqjv42h"; libraryHaskellDepends = [ @@ -266158,7 +266830,6 @@ self: { ]; description = "Size tagged vectors"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "vector-space" = callPackage @@ -267655,8 +268326,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.5"; - sha256 = "17r0rn2xs5l5x9vwa5vyc4q11gyw2v29qs7vqicla0qb4hh140fj"; + version = "3.6.6"; + sha256 = "09mq11jqrd9sgx4xcy3xxji21yfhzl9a49mh5fp80y2mxsxdl0v9"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -272193,14 +272864,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "within_0_2_0_0" = callPackage + "within_0_2_0_1" = callPackage ({ mkDerivation, base, comonad, exceptions, free, hashable, path , path-like }: mkDerivation { pname = "within"; - version = "0.2.0.0"; - sha256 = "1jvfxcxyavadcbslb50a6ad7bmnwz45d6zaxyc38y61kh0r82242"; + version = "0.2.0.1"; + sha256 = "1yzfzizx45ngvvbshgw9z8hxl8z7vcr1gann6wnxq4b9669h29ic"; libraryHaskellDepends = [ base comonad exceptions free hashable path path-like ]; @@ -275657,8 +276328,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.35.1"; - sha256 = "1fizszhij2if9wxwzi728l93j9p5y9kfqnwnxk6nl66g64rsbp5x"; + version = "0.36"; + sha256 = "0kqnadgsqn7m3zw2vk22ssf4aw67rij9l1lpjfsnv2qw0m5apsdl"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -276813,35 +277484,6 @@ self: { }: mkDerivation { pname = "yaml"; - version = "0.11.4.0"; - sha256 = "0v69d10ni6ydj4g63ajcmnx6a2j3kbl91vpz678l7k5mkd3chkns"; - configureFlags = [ "-fsystem-libyaml" ]; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bytestring conduit containers directory - filepath libyaml mtl resourcet scientific template-haskell text - transformers unordered-containers vector - ]; - testHaskellDepends = [ - aeson attoparsec base base-compat bytestring conduit containers - directory filepath hspec HUnit libyaml mockery mtl raw-strings-qq - resourcet scientific template-haskell temporary text transformers - unordered-containers vector - ]; - description = "Support for parsing and rendering YAML documents"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "yaml_0_11_5_0" = callPackage - ({ mkDerivation, aeson, attoparsec, base, base-compat, bytestring - , conduit, containers, directory, filepath, hspec, HUnit, libyaml - , mockery, mtl, raw-strings-qq, resourcet, scientific - , template-haskell, temporary, text, transformers - , unordered-containers, vector - }: - mkDerivation { - pname = "yaml"; version = "0.11.5.0"; sha256 = "1bfdsqckzql50j6ni4fa1470cvkmfiy4skb98cdwnj4rss5p93mj"; configureFlags = [ "-fsystem-libyaml" ]; @@ -276860,7 +277502,6 @@ self: { ]; description = "Support for parsing and rendering YAML documents"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "yaml-combinators" = callPackage @@ -279935,15 +280576,20 @@ self: { }) {}; "yhseq" = callPackage - ({ mkDerivation, base, hspec, hspec-discover }: + ({ mkDerivation, base, containers, hspec, hspec-discover, vector }: mkDerivation { pname = "yhseq"; - version = "0.2.1.2"; - sha256 = "1mxjfbnic6pn4jnyc83afpmgq4wnb09f72d359pwx693mfi6vbiy"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base hspec hspec-discover ]; + version = "0.3.0.1"; + sha256 = "1daipppqia4ig7xa9wxy2g3gcxrcwhxm1g6j5l81v56vfh0smg9r"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base containers vector ]; + executableHaskellDepends = [ base containers vector ]; + testHaskellDepends = [ + base containers hspec hspec-discover vector + ]; testToolDepends = [ hspec-discover ]; - description = "Calculation of Y-sequence Hexirp edition"; + description = "Calculation of YH sequence system"; license = stdenv.lib.licenses.asl20; }) {}; @@ -280993,8 +281639,8 @@ self: { }: mkDerivation { pname = "zenacy-html"; - version = "2.0.1"; - sha256 = "074iidhiwzajz207q4k7f8sdg6w4421qfwr2s905226jd2xm1680"; + version = "2.0.2"; + sha256 = "12m953skm4ms6y211ahjrr6gkmrh4p3h2snpcpg1fc039nxgkc9p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -281018,6 +281664,22 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "zenacy-unicode" = callPackage + ({ mkDerivation, base, bytestring, HUnit, test-framework + , test-framework-hunit, text, vector, word8 + }: + mkDerivation { + pname = "zenacy-unicode"; + version = "1.0.0"; + sha256 = "03sksmmmn380nvh0f139g63b4yx42ziimv79xjja7yx6mhaa0pqf"; + libraryHaskellDepends = [ base bytestring vector word8 ]; + testHaskellDepends = [ + base bytestring HUnit test-framework test-framework-hunit text + ]; + description = "Unicode utilities for Haskell"; + license = stdenv.lib.licenses.mit; + }) {}; + "zenc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -281765,8 +282427,8 @@ self: { }: mkDerivation { pname = "zipper-extra"; - version = "0.1.3.1"; - sha256 = "1n6amxaydfannxhgnbj5g315m96h5wvgrdw89n6761vii76csky4"; + version = "0.1.3.2"; + sha256 = "0cq21hf40qp025ir9kihsp6b09bsrlgiqd5cfq688w57c2vhcmci"; libraryHaskellDepends = [ base comonad comonad-extras exceptions split ]; diff --git a/pkgs/development/interpreters/chibi/default.nix b/pkgs/development/interpreters/chibi/default.nix index 08db1b077a3..7bf4c0fd52d 100644 --- a/pkgs/development/interpreters/chibi/default.nix +++ b/pkgs/development/interpreters/chibi/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, makeWrapper }: let - version = "0.9"; + version = "0.9.1"; name = "chibi-scheme-${version}"; in stdenv.mkDerivation { @@ -18,7 +18,7 @@ stdenv.mkDerivation { owner = "ashinn"; repo = "chibi-scheme"; rev = version; - sha256 = "1lnap41gl9vg82h557f4rlr69jgmd2gh0iqs6cxm77d39kv1scb8"; + sha256 = "0nd63i924ifh39cba1hd4sbi6vh1cb73v97nrn4bf8rrjh3k8pdi"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 7d0857f4e78..53cef387ae4 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.1.590"; + version = "1.10.1.645"; src = fetchurl { url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "18x8xkxsqwnv3k1mf42ylfv7zzjllm7yiagq16b2gkq62j5sm1k7"; + sha256 = "1z6a9an8ls992y4japmzdxay7c5d2z9s2q1xl4g615r23jwpcsf9"; }; nativeBuildInputs = [ @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { cp clojure-tools-${version}.jar $out/libexec cp example-deps.edn $out cp deps.edn $out + cp clj_exec.clj $out substituteInPlace clojure --replace PREFIX $out diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 1572f5e4be2..97e997bdd69 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "groovy"; - version = "3.0.2"; + version = "3.0.3"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; - sha256 = "1ddw3fqrmwh4w6z6xgck4jhmq33rwgbmpjw07g12ri1vgw4xks9w"; + sha256 = "0xdm70b61pdj8z3g08az16y9b6cpz5hv7iwvwfyfyxrjdi47h419"; }; buildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix index b5b83e18025..5b26b38dbd4 100644 --- a/pkgs/development/interpreters/guile/2.0.nix +++ b/pkgs/development/interpreters/guile/2.0.nix @@ -59,7 +59,7 @@ # "libgcc_s.so.1 must be installed for pthread_cancel to work". # don't have "libgcc_s.so.1" on darwin - LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; + LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin && !stdenv.hostPlatform.isMusl) "-lgcc_s"; configureFlags = [ "--with-libreadline-prefix" ] ++ stdenv.lib.optionals stdenv.isSunOS [ diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 8e6b434281e..e2bf921f882 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, readline, libedit, bc -, avxSupport ? false +, avxSupport ? stdenv.hostPlatform.avxSupport }: stdenv.mkDerivation rec { diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index e96a7c604c7..afb5dd9c5b6 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2020-08-05"; - rev = "2211f6f"; + version = "2.0.5-2020-08-09"; + rev = "e296f56"; isStable = true; - sha256 = "01adxmknq2xyb3w9sn8ilnar8181h7ksd9i80yrsbwzix5lwkn6m"; + sha256 = "0g4wvpmmrxj8ir6yi86gg93khy8ri7x4w091jihpxsmn670da21f"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index f08bbd0e972..cb0320c7c7c 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2020-08-05"; - rev = "10ddae7"; + version = "2.1.0-2020-08-27"; + rev = "ff1e72a"; isStable = false; - sha256 = "1lmjs0gz9vgbhh5f45jvvibpj7f3sz81r8cz4maln9yhc67f2zmk"; + sha256 = "0rlh5y48jbxnamr3a5i3szzh7y9ycvq052rw6m82gdhrb1jlamdz"; } diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix index 27ccb6f22c6..8f539d23392 100644 --- a/pkgs/development/interpreters/perl/default.nix +++ b/pkgs/development/interpreters/perl/default.nix @@ -28,7 +28,7 @@ let # TODO: Add a "dev" output containing the header files. outputs = [ "out" "man" "devdoc" ] ++ - optional crossCompiling "dev"; + optional crossCompiling "mini"; setOutputFlags = false; disallowedReferences = [ stdenv.cc ]; @@ -144,13 +144,13 @@ let --replace "$man" /no-such-path '' + optionalString crossCompiling '' - mkdir -p $dev/lib/perl5/cross_perl/${version} + mkdir -p $mini/lib/perl5/cross_perl/${version} for dir in cnf/{stub,cpan}; do - cp -r $dir/* $dev/lib/perl5/cross_perl/${version} + cp -r $dir/* $mini/lib/perl5/cross_perl/${version} done - mkdir -p $dev/bin - install -m755 miniperl $dev/bin/perl + mkdir -p $mini/bin + install -m755 miniperl $mini/bin/perl export runtimeArch="$(ls $out/lib/perl5/site_perl/${version})" # wrapProgram should use a runtime-native SHELL by default, but @@ -161,9 +161,9 @@ let # miniperl can't load the native modules there. However, it can # (and sometimes needs to) load and run some of the pure perl # code there, so we add it anyway. When needed, stubs can be put - # into $dev/lib/perl5/cross_perl/${version}. - wrapProgram $dev/bin/perl --prefix PERL5LIB : \ - "$dev/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch" + # into $mini/lib/perl5/cross_perl/${version}. + wrapProgram $mini/bin/perl --prefix PERL5LIB : \ + "$mini/lib/perl5/cross_perl/${version}:$out/lib/perl5/${version}:$out/lib/perl5/${version}/$runtimeArch" ''; # */ meta = { diff --git a/pkgs/development/interpreters/perl/setup-hook-cross.sh b/pkgs/development/interpreters/perl/setup-hook-cross.sh index 95aae0b2670..a7aad6f2453 100644 --- a/pkgs/development/interpreters/perl/setup-hook-cross.sh +++ b/pkgs/development/interpreters/perl/setup-hook-cross.sh @@ -9,4 +9,4 @@ addPerlLibPath () { addToSearchPath PERL5LIB $1/lib/perl5/site_perl/@version@/@runtimeArch@ } -addEnvHooks "$targetOffset" addPerlLibPath +addEnvHooks "$hostOffset" addPerlLibPath diff --git a/pkgs/development/interpreters/python/cpython/2.7/CVE-2019-20907.patch b/pkgs/development/interpreters/python/cpython/2.7/CVE-2019-20907.patch new file mode 100644 index 00000000000..cf67ae2b51b --- /dev/null +++ b/pkgs/development/interpreters/python/cpython/2.7/CVE-2019-20907.patch @@ -0,0 +1,24 @@ +From 5a8d121a1f3ef5ad7c105ee378cc79a3eac0c7d4 Mon Sep 17 00:00:00 2001 +From: Rishi <rishi_devan@mail.com> +Date: Wed, 15 Jul 2020 13:51:00 +0200 +Subject: [PATCH] bpo-39017: Avoid infinite loop in the tarfile module + (GH-21454) + +Avoid infinite loop when reading specially crafted TAR files using the tarfile module +(CVE-2019-20907). +--- + Lib/tarfile.py | 2 ++ + +diff --git a/Lib/tarfile.py b/Lib/tarfile.py +index e2b60532f6..6769066cab 100755 +--- a/Lib/tarfile.py ++++ b/Lib/tarfile.py +@@ -1249,6 +1249,8 @@ class TarInfo(object): + + length, keyword = match.groups() + length = int(length) ++ if length == 0: ++ raise InvalidHeaderError("invalid header") + value = buf[match.end(2) + 1:match.start(1) + length - 1] + + # Normally, we could just use "utf-8" as the encoding and "strict" diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 62aae7b2212..2cfaa69a4c8 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -90,6 +90,9 @@ let # Backport from CPython 3.8 of a good list of tests to run for PGO. ./profile-task.patch + + # Patch is likely to go away in the next release (if there is any) + ./CVE-2019-20907.patch ] ++ optionals (x11Support && stdenv.isDarwin) [ ./use-correct-tcl-tk-on-darwin.patch ] ++ optionals stdenv.isLinux [ diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 4a8d4ab4bfb..b25d613eb7f 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -156,6 +156,8 @@ in with passthru; stdenv.mkDerivation { ]; postPatch = '' + substituteInPlace Lib/subprocess.py \ + --replace "'/bin/sh'" "'${bash}/bin/sh'" '' + optionalString (x11Support && (tix != null)) '' substituteInPlace "Lib/tkinter/tix.py" --replace "os.environ.get('TIX_LIBRARY')" "os.environ.get('TIX_LIBRARY') or '${tix}/lib'" ''; @@ -289,6 +291,13 @@ in with passthru; stdenv.mkDerivation { find $out -name "*.py" | ${pythonForBuildInterpreter} -OO -m compileall -q -f -x "lib2to3" -i - '' + optionalString stripBytecode '' find $out -type d -name __pycache__ -print0 | xargs -0 -I {} rm -rf "{}" + '' + '' + # *strip* shebang from libpython gdb script - it should be dual-syntax and + # interpretable by whatever python the gdb in question is using, which may + # not even match the major version of this python. doing this after the + # bytecode compilations for the same reason. + mkdir -p $out/share/gdb + sed '/^#!/d' Tools/gdb/libpython.py > $out/share/gdb/libpython.py ''; preFixup = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' @@ -306,6 +315,8 @@ in with passthru; stdenv.mkDerivation { pythonForBuild buildPackages.bash ]; + separateDebugInfo = true; + inherit passthru; enableParallelBuilding = true; diff --git a/pkgs/development/interpreters/python/tests.nix b/pkgs/development/interpreters/python/tests.nix index 03a3b953709..dcfa41cc308 100644 --- a/pkgs/development/interpreters/python/tests.nix +++ b/pkgs/development/interpreters/python/tests.nix @@ -6,67 +6,81 @@ }: let - envs = let - inherit python; - pythonEnv = python.withPackages(ps: with ps; [ ]); - pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); - in { - # Plain Python interpreter - plain = rec { - env = python; - interpreter = env.interpreter; - is_venv = "False"; - is_nixenv = "False"; - is_virtualenv = "False"; - }; - } // lib.optionalAttrs (!python.isPyPy) { - # Use virtualenv from a Nix env. - nixenv-virtualenv = rec { - env = runCommand "${python.name}-virtualenv" {} '' - ${pythonVirtualEnv.interpreter} -m virtualenv $out - ''; - interpreter = "${env}/bin/${python.executable}"; - is_venv = "False"; - is_nixenv = "True"; - is_virtualenv = "True"; - }; - } // lib.optionalAttrs (python.implementation != "graal") { - # Python Nix environment (python.buildEnv) - nixenv = rec { - env = pythonEnv; - interpreter = env.interpreter; - is_venv = "False"; - is_nixenv = "True"; - is_virtualenv = "False"; - }; - } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { - # Venv built using plain Python - # Python 2 does not support venv - # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. - plain-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${python.interpreter} -m venv $out - ''; - interpreter = "${env}/bin/${python.executable}"; - is_venv = "True"; - is_nixenv = "False"; - is_virtualenv = "False"; - }; + environmentTests = let + envs = let + inherit python; + pythonEnv = python.withPackages(ps: with ps; [ ]); + pythonVirtualEnv = python.withPackages(ps: with ps; [ virtualenv ]); + in { + # Plain Python interpreter + plain = rec { + env = python; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "False"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (!python.isPyPy) { + # Use virtualenv from a Nix env. + nixenv-virtualenv = rec { + env = runCommand "${python.name}-virtualenv" {} '' + ${pythonVirtualEnv.interpreter} -m virtualenv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "True"; + }; + } // lib.optionalAttrs (python.implementation != "graal") { + # Python Nix environment (python.buildEnv) + nixenv = rec { + env = pythonEnv; + interpreter = env.interpreter; + is_venv = "False"; + is_nixenv = "True"; + is_virtualenv = "False"; + }; + } // lib.optionalAttrs (python.isPy3k && (!python.isPyPy)) rec { + # Venv built using plain Python + # Python 2 does not support venv + # TODO: PyPy executable name is incorrect, it should be pypy-c or pypy-3c instead of pypy and pypy3. + plain-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${python.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${python.executable}"; + is_venv = "True"; + is_nixenv = "False"; + is_virtualenv = "False"; + }; - } // lib.optionalAttrs (python.pythonAtLeast "3.8") { - # Venv built using Python Nix environment (python.buildEnv) - # TODO: Cannot create venv from a nix env - # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. - nixenv-venv = rec { - env = runCommand "${python.name}-venv" {} '' - ${pythonEnv.interpreter} -m venv $out - ''; - interpreter = "${env}/bin/${pythonEnv.executable}"; - is_venv = "True"; - is_nixenv = "True"; - is_virtualenv = "False"; + } // lib.optionalAttrs (python.pythonAtLeast "3.8") { + # Venv built using Python Nix environment (python.buildEnv) + # TODO: Cannot create venv from a nix env + # Error: Command '['/nix/store/ddc8nqx73pda86ibvhzdmvdsqmwnbjf7-python3-3.7.6-venv/bin/python3.7', '-Im', 'ensurepip', '--upgrade', '--default-pip']' returned non-zero exit status 1. + nixenv-venv = rec { + env = runCommand "${python.name}-venv" {} '' + ${pythonEnv.interpreter} -m venv $out + ''; + interpreter = "${env}/bin/${pythonEnv.executable}"; + is_venv = "True"; + is_nixenv = "True"; + is_virtualenv = "False"; + }; }; - }; + + testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ + inherit (python) pythonVersion; + } // attrs) '' + cp -r ${./tests/test_environments} tests + chmod -R +w tests + substituteAllInPlace tests/test_python.py + ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py + mkdir $out + touch $out/success + ''; + + in lib.mapAttrs testfun envs; # All PyPy package builds are broken at the moment integrationTests = lib.optionalAttrs (python.pythonAtLeast "3.7" && (!python.isPyPy)) rec { @@ -76,15 +90,6 @@ let }; }; - testfun = name: attrs: runCommand "${python.name}-tests-${name}" ({ - inherit (python) pythonVersion; - } // attrs) '' - cp -r ${./tests} tests - chmod -R +w tests - substituteAllInPlace tests/test_python.py - ${attrs.interpreter} -m unittest discover --verbose tests #/test_python.py - mkdir $out - touch $out/success - ''; -in lib.mapAttrs testfun envs // integrationTests + +in environmentTests // integrationTests diff --git a/pkgs/development/interpreters/python/tests/test_python.py b/pkgs/development/interpreters/python/tests/test_environments/test_python.py index 0fc4b8a9e91..0fc4b8a9e91 100644 --- a/pkgs/development/interpreters/python/tests/test_python.py +++ b/pkgs/development/interpreters/python/tests/test_environments/test_python.py diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix index a1185fcae37..0c708cd3171 100644 --- a/pkgs/development/interpreters/rakudo/default.nix +++ b/pkgs/development/interpreters/rakudo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "rakudo"; - version = "2020.07"; + version = "2020.08.2"; src = fetchurl { url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz"; - sha256 = "1f6ay09k4n7dbcvvla45yg1lfb7vk2ssymmll2xiagjb77hlsqir"; + sha256 = "16qsq6alvk2x44x39j2fzxigvm5cvmz85i0nkjcw0wz29yyf8lch"; }; buildInputs = [ icu zlib gmp perl ]; diff --git a/pkgs/development/interpreters/rakudo/moarvm.nix b/pkgs/development/interpreters/rakudo/moarvm.nix index f0a800764b7..702fccd7b6b 100644 --- a/pkgs/development/interpreters/rakudo/moarvm.nix +++ b/pkgs/development/interpreters/rakudo/moarvm.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "moarvm"; - version = "2020.07"; + version = "2020.08"; src = fetchurl { url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz"; - sha256 = "1kzp76vqvny8gpp0b4xg1hg4vih4gmic4w1lddc9gqz03dx8hj6s"; + sha256 = "1gq7z4z5lnkai01721waawkkal82sdmyra05nnbfb1986mq5xpiy"; }; buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ]; diff --git a/pkgs/development/interpreters/rakudo/nqp.nix b/pkgs/development/interpreters/rakudo/nqp.nix index bf6a9ccc61b..3f5f7afcfed 100644 --- a/pkgs/development/interpreters/rakudo/nqp.nix +++ b/pkgs/development/interpreters/rakudo/nqp.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "nqp"; - version = "2020.07"; + version = "2020.08.2"; src = fetchurl { - url = "https://github.com/perl6/nqp/releases/download/${version}/nqp-${version}.tar.gz"; - sha256 = "0kian8xsyj51m120nh68c9q359l7iipkddph3r8yzvn41zql3y8v"; + url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz"; + sha256 = "14zr1swprxl284k0h1w72pcypj24sga15170ylaqjb8wxy8h1mqw"; }; buildInputs = [ perl ]; diff --git a/pkgs/development/interpreters/red/default.nix b/pkgs/development/interpreters/red/default.nix index e1460ec51a2..554dc81bffb 100644 --- a/pkgs/development/interpreters/red/default.nix +++ b/pkgs/development/interpreters/red/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "red"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { - rev = "6a43c767fa2e85d668b83f749158a18e62c30f70"; + rev = "755eb943ccea9e78c2cab0f20b313a52404355cb"; owner = "red"; repo = "red"; - sha256 = "1zh6xc728bs7r4v5jz1jjrdk0xd838xsxmvy9gfg75a3zffm0slr"; + sha256 = "sha256:045rrg9666zczgrwyyyglivzdzja103s52b0fzj7hqmr1fz68q37"; }; rebol = fetchurl { @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ${r2} -qw red.r tests/hello.red # Compiling the Red console... - ${r2} -qw red.r -r environment/console/console.red + ${r2} -qw red.r -r environment/console/CLI/console.red # Generating docs... cd docs diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index 1157142e5b8..1bb79a64ba1 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "alembic"; - version = "1.7.13"; + version = "1.7.14"; src = fetchFromGitHub { owner = "alembic"; repo = "alembic"; rev = version; - sha256 = "01j4fsq917jckdh16nvmc35xiy11j4g1sc17y6g8qxa00s2sfsa4"; + sha256 = "0yri063v7j5jsvqbmlwr0hf2d1a55dgc1nj85rf10sxqhijwzk55"; }; outputs = [ "bin" "dev" "out" "lib" ]; diff --git a/pkgs/development/libraries/appindicator-sharp/default.nix b/pkgs/development/libraries/appindicator-sharp/default.nix new file mode 100644 index 00000000000..9eff4e3895b --- /dev/null +++ b/pkgs/development/libraries/appindicator-sharp/default.nix @@ -0,0 +1,43 @@ +{ + autoreconfHook, + fetchFromGitHub, + lib, + libappindicator, + mono, + gtk-sharp-3_0, + pkg-config, + stdenv, +}: + +stdenv.mkDerivation rec { + pname = "appindicator-sharp"; + version = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37"; + + src = fetchFromGitHub { + owner = "stsundermann"; + repo = "appindicator-sharp"; + rev = version; + sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l"; + }; + + nativeBuildInputs = [ + autoreconfHook + mono + pkg-config + ]; + + buildInputs = [ + gtk-sharp-3_0 + libappindicator + ]; + + ac_cv_path_MDOC = "no"; + installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"]; + + meta = { + description = "Bindings for appindicator using gobject-introspection"; + homepage = "https://github.com/stsundermann/appindicator-sharp"; + license = lib.licenses.lgpl3Only; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/pkgs/development/libraries/aspell/dictionaries.nix b/pkgs/development/libraries/aspell/dictionaries.nix index fac55b60651..32405d6a525 100644 --- a/pkgs/development/libraries/aspell/dictionaries.nix +++ b/pkgs/development/libraries/aspell/dictionaries.nix @@ -694,18 +694,18 @@ in rec { pt_BR = buildOfficialDict { language = "pt_BR"; - version = "20090702-0"; + version = "20131030-12-0"; fullName = "Brazilian Portuguese"; filename = "aspell6"; - sha256 = "1y09lx9zf2rnp55r16b2vgj953l3538z1vaqgflg9mdvm555bz3p"; + sha256 = "1xqlpk21s93c6blkdnpk7l62q9fxjvzdv2x86chl8p2x1gdrj3gb"; }; pt_PT = buildOfficialDict { language = "pt_PT"; - version = "20070510-0"; + version = "20190329-1-0"; fullName = "Portuguese"; filename = "aspell6"; - sha256 = "1mnr994cwlag6shy8865ky99lymysiln07mbldcncahg90dagdxq"; + sha256 = "0ld0d0ily4jqifjfsxfv4shbicz6ymm2gk56fq9gbzra1j4qnw75"; }; qu = buildOfficialDict { diff --git a/pkgs/development/libraries/assimp/default.nix b/pkgs/development/libraries/assimp/default.nix index a6f27f4476b..c1972aa1ca8 100644 --- a/pkgs/development/libraries/assimp/default.nix +++ b/pkgs/development/libraries/assimp/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { homepage = "http://assimp.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ ehmry ]; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix index 41e4c92e56b..66ead87daa0 100644 --- a/pkgs/development/libraries/ayatana-ido/default.nix +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "ayatana-ido"; - version = "0.4.90"; + version = "0.8.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = pname; rev = version; - sha256 = "02vqjryni96zzrpkq5d7kvgw7nf252d2fm2xq8fklvvb2vz3fa0w"; + sha256 = "1jmdvvgrgicpnpnygc24qcisqb9y026541gb6lw6fwapvc9aj73p"; }; nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc vala ]; diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index e98fa465e0b..be000e457c4 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "check"; - version = "0.15.0"; + version = "0.15.2"; src = fetchurl { url = "https://github.com/libcheck/check/releases/download/${version}/check-${version}.tar.gz"; - sha256 = "0q5cs6rqbq8a1m9ij3dxnsjcs31mvg0b2i77g0iykqd6iz3f78mf"; + sha256 = "02m25y9m46pb6n46s51av62kpd936lkfv3b13kfpckgvmh5lxpm8"; }; # Test can randomly fail: https://hydra.nixos.org/build/7243912 diff --git a/pkgs/development/libraries/dlib/default.nix b/pkgs/development/libraries/dlib/default.nix index 3f59368c278..43ac2530cc1 100644 --- a/pkgs/development/libraries/dlib/default.nix +++ b/pkgs/development/libraries/dlib/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, libX11 # see http://dlib.net/compile.html -, avxSupport ? true +, avxSupport ? stdenv.hostPlatform.avxSupport , cudaSupport ? true }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { rm -rf dlib/external ''; - cmakeFlags = [ + cmakeFlags = [ "-DUSE_DLIB_USE_CUDA=${if cudaSupport then "1" else "0"}" "-DUSE_AVX_INSTRUCTIONS=${if avxSupport then "yes" else "no"}" ]; diff --git a/pkgs/development/libraries/enchant/2.x.nix b/pkgs/development/libraries/enchant/2.x.nix index 65d85eddbe4..51f13de08a8 100644 --- a/pkgs/development/libraries/enchant/2.x.nix +++ b/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.8"; + version = "2.2.9"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "0m9m564qqwbssvvf7y3dlz1yxzqsjiqy1yd2zsmb3l0d7y2y5df7"; + sha256 = "0g1gf86jzxxhnhkn7jvgi0k9agzav2zr8pjnpgdwpvgmfci3v6mj"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/ethash/default.nix b/pkgs/development/libraries/ethash/default.nix index 3522ff231ab..749005e09a9 100644 --- a/pkgs/development/libraries/ethash/default.nix +++ b/pkgs/development/libraries/ethash/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "ethash"; - version = "0.4.4"; + version = "0.5.2"; src = fetchFromGitHub { owner = "chfast"; repo = "ethash"; rev = "v${version}"; - sha256 = "1gfs8s4nv2ikkn3rhzifr0dx5m0c1kpnhmzf8x6zlwhw3qwlc98w"; + sha256 = "0shr3m33raxy9j2mpm3q9mdbchs3nhgfaywidyxgmwqaiw1xpyif"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/fflas-ffpack/default.nix b/pkgs/development/libraries/fflas-ffpack/default.nix index bc84039a9aa..23b31fe439f 100644 --- a/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/pkgs/development/libraries/fflas-ffpack/default.nix @@ -31,19 +31,21 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lcblas" "--with-lapack-libs=-llapacke" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) # for now we need to be careful to disable *all* relevant versions of an instruction set explicitly (https://github.com/linbox-team/fflas-ffpack/issues/284) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - westmere = [ "--disable-avx" "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-avx512f" "--disable-avx512dq" "--disable-avx512vl" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; - + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512f" + "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512dq" + "--${if stdenv.hostPlatform.avx512Support then "enable" else "disable"}-avx512vl" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ]; doCheck = true; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 5b98884c1fc..d763fb51354 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -126,6 +126,7 @@ stdenv.mkDerivation rec { # Docs (ifMinVer "0.6" "--disable-doc") # External Libraries + "--enable-libass" "--enable-bzlib" "--enable-gnutls" (ifMinVer "1.0" "--enable-fontconfig") diff --git a/pkgs/development/libraries/g2o/default.nix b/pkgs/development/libraries/g2o/default.nix index 7167112b6bd..675d994cf0e 100644 --- a/pkgs/development/libraries/g2o/default.nix +++ b/pkgs/development/libraries/g2o/default.nix @@ -27,16 +27,13 @@ mkDerivation rec { # Detection script is broken "-DQGLVIEWER_INCLUDE_DIR=${libqglviewer}/include/QGLViewer" "-DG2O_BUILD_EXAMPLES=OFF" - ] ++ lib.optionals stdenv.isx86_64 ([ "-DDO_SSE_AUTODETECT=OFF" ] ++ { - default = [ "-DDISABLE_SSE3=ON" "-DDISABLE_SSE4_1=ON" "-DDISABLE_SSE4_2=ON" "-DDISABLE_SSE4_A=ON" ]; - westmere = [ "-DDISABLE_SSE4_A=ON" ]; - sandybridge = [ "-DDISABLE_SSE4_A=ON" ]; - ivybridge = [ "-DDISABLE_SSE4_A=ON" ]; - haswell = [ "-DDISABLE_SSE4_A=ON" ]; - broadwell = [ "-DDISABLE_SSE4_A=ON" ]; - skylake = [ "-DDISABLE_SSE4_A=ON" ]; - skylake-avx512 = [ "-DDISABLE_SSE4_A=ON" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}); + ] ++ lib.optionals stdenv.isx86_64 [ + "-DDO_SSE_AUTODETECT=OFF" + "-DDISABLE_SSE3=${ if stdenv.hostPlatform.sse3Support then "OFF" else "ON"}" + "-DDISABLE_SSE4_1=${if stdenv.hostPlatform.sse4_1Support then "OFF" else "ON"}" + "-DDISABLE_SSE4_2=${if stdenv.hostPlatform.sse4_2Support then "OFF" else "ON"}" + "-DDISABLE_SSE4_A=${if stdenv.hostPlatform.sse4_aSupport then "OFF" else "ON"}" + ]; meta = with lib; { description = "A General Framework for Graph Optimization"; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 7f3e796bbf1..72135f1a62d 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,14 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.0.4"; + # broken with poppler 20.08, however, can't fetch patches cleanly + version = "3.1.2.post2020-08-26"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; - rev = "v${version}"; - sha256 = "00a7q9wv8s1bmdhqxvixkq2afr8aibg3pkc76gg50r8lavf6j84c"; + rev = "9a8df672204a8b3b33c36e09a32f747e21166fe9"; + sha256 = "1n25jma4x1l7slwxk702q77r84vxr90fyn4c3zpkr07q1b8wqql9"; }; sourceRoot = "source/gdal"; @@ -57,7 +58,7 @@ stdenv.mkDerivation rec { "--with-proj=${proj.dev}" # optional "--with-geos=${geos}/bin/geos-config" # optional "--with-hdf4=${hdf4.dev}" # optional - "--with-xml2=${libxml2.dev}/bin/xml2-config" # optional + "--with-xml2=yes" # optional (if netcdfSupport then "--with-netcdf=${netcdf}" else "") ]; diff --git a/pkgs/development/libraries/gensio/default.nix b/pkgs/development/libraries/gensio/default.nix index 169506e66cc..daca5fc0bdb 100644 --- a/pkgs/development/libraries/gensio/default.nix +++ b/pkgs/development/libraries/gensio/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gensio"; - version = "2.1.3"; + version = "2.1.4"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "0sdqv4j1jjjc2nxnd9h7r4w66bdjl5ksvfia4i4cjj7jfl0hhynl"; + sha256 = "0c44qhhrknjl7sp94q34z7nv7bvnlqs8wzm385661liy4mnfn4dc"; }; configureFlags = [ diff --git a/pkgs/development/libraries/givaro/default.nix b/pkgs/development/libraries/givaro/default.nix index fdaf518c611..78b6b088270 100644 --- a/pkgs/development/libraries/givaro/default.nix +++ b/pkgs/development/libraries/givaro/default.nix @@ -17,17 +17,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"}; + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ]; # On darwin, tests are linked to dylib in the nix store, so we need to make # sure tests run after installPhase. diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f7b0667741d..cb2b8a11c03 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -16,9 +16,6 @@ with stdenv.lib; assert stdenv.isLinux -> utillinuxMinimal != null; # TODO: -# * Add gio-module-fam -# Problem: cyclic dependency on gamin -# Possible solution: build as a standalone module, set env. vars # * Make it build without python # Problem: an example (test?) program needs it. # Possible solution: disable compilation of this example somehow diff --git a/pkgs/development/libraries/goffice/default.nix b/pkgs/development/libraries/goffice/default.nix index 308a4db2800..46b40d00d78 100644 --- a/pkgs/development/libraries/goffice/default.nix +++ b/pkgs/development/libraries/goffice/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "goffice"; - version = "0.10.47"; + version = "0.10.48"; outputs = [ "out" "dev" "devdoc" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xmigfdzvmlpa0fw79mf3xwchmxc8rlidryn5syv8bz7msmrb215"; + sha256 = "1z6f3q8fxkd1ysqrwdxdi0844zqa00vjpf07gq8mh3kal8picfd4"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/development/libraries/gtk-layer-shell/default.nix b/pkgs/development/libraries/gtk-layer-shell/default.nix index c00e8035f18..14f822432ee 100644 --- a/pkgs/development/libraries/gtk-layer-shell/default.nix +++ b/pkgs/development/libraries/gtk-layer-shell/default.nix @@ -2,7 +2,10 @@ , fetchFromGitHub , meson , ninja -, pkgconfig +, pkg-config +, gtk-doc +, docbook-xsl-nons +, docbook_xml_dtd_43 , wayland , gtk3 , gobject-introspection @@ -10,30 +13,39 @@ stdenv.mkDerivation rec { pname = "gtk-layer-shell"; - version = "0.1.0"; + version = "0.2.0"; + + outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "wmww"; repo = "gtk-layer-shell"; rev = "v${version}"; - sha256 = "1fwvlbwp5w1zly6mksvlzbx18ikq4bh7pdj9q0k94qlj6x2zdwg8"; + sha256 = "0kas84z44p3vz92sljbnahh43wfj69knqsy1za729j8phrlwqdmg"; }; nativeBuildInputs = [ - meson ninja pkgconfig + meson + ninja + pkg-config + gobject-introspection + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ - wayland gtk3 gobject-introspection + wayland + gtk3 ]; mesonFlags = [ - "-Dout=${placeholder "out"}" + "-Ddocs=true" ]; meta = with stdenv.lib; { description = "A library to create panels and other desktop components for Wayland using the Layer Shell protocol"; - license = licenses.mit; + license = licenses.lgpl3Plus; maintainers = with maintainers; [ eonpatapon ]; platforms = platforms.unix; }; diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index d27021280a3..8110f13d14c 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -1,28 +1,34 @@ -{ stdenv, fetchurl, pkgconfig, glib, freetype, cairo, libintl +{ stdenv, fetchFromGitHub, pkgconfig, glib, freetype, cairo, libintl +, meson, ninja , gobject-introspection , icu, graphite2, harfbuzz # The icu variant uses and propagates the non-icu one. , ApplicationServices, CoreText , withCoreText ? false , withIcu ? false # recommended by upstream as default, but most don't needed and it's big , withGraphite2 ? true # it is small and major distros do include it -, python +, python3 +, gtk-doc, docbook-xsl-nons, docbook_xml_dtd_43 }: let - version = "2.6.7"; + version = "2.7.1"; inherit (stdenv.lib) optional optionals optionalString; + mesonFeatureFlag = opt: b: + "-D${opt}=${if b then "enabled" else "disabled"}"; in stdenv.mkDerivation { name = "harfbuzz${optionalString withIcu "-icu"}-${version}"; - src = fetchurl { - url = "https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-${version}.tar.xz"; - sha256 = "065jg6s8xix45s4msj0l2r0iycw5yyyjdylripv7pyfzdk883r29"; + src = fetchFromGitHub { + owner = "harfbuzz"; + repo = "harfbuzz"; + rev = version; + sha256 = "172jmwp666xbs6yy1pc2495gnkz8xw11b8zkz3j19jxlvvp4mxcs"; }; postPatch = '' - patchShebangs src/gen-def.py + patchShebangs src/*.py patchShebangs test '' + stdenv.lib.optionalString stdenv.isDarwin '' # ApplicationServices.framework headers have cast-align warnings. @@ -30,22 +36,25 @@ stdenv.mkDerivation { --replace '#pragma GCC diagnostic error "-Wcast-align"' "" ''; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "devdoc" ]; outputBin = "dev"; - configureFlags = [ - # not auto-detected by default - "--with-graphite2=${if withGraphite2 then "yes" else "no"}" - "--with-icu=${if withIcu then "yes" else "no"}" - "--with-gobject=yes" - "--enable-introspection=yes" - ] - ++ stdenv.lib.optional withCoreText "--with-coretext=yes"; + mesonFlags = [ + (mesonFeatureFlag "graphite" withGraphite2) + (mesonFeatureFlag "icu" withIcu) + (mesonFeatureFlag "coretext" withCoreText) + ]; nativeBuildInputs = [ + meson + ninja gobject-introspection libintl pkgconfig + python3 + gtk-doc + docbook-xsl-nons + docbook_xml_dtd_43 ]; buildInputs = [ glib freetype cairo ] # recommended by upstream @@ -55,11 +64,10 @@ stdenv.mkDerivation { ++ optional withGraphite2 graphite2 ++ optionals withIcu [ icu harfbuzz ]; - checkInputs = [ python ]; - doInstallCheck = false; # fails, probably a bug + doCheck = true; # Slightly hacky; some pkgs expect them in a single directory. - postInstall = optionalString withIcu '' + postFixup = optionalString withIcu '' rm "$out"/lib/libharfbuzz.* "$dev/lib/pkgconfig/harfbuzz.pc" ln -s {'${harfbuzz.out}',"$out"}/lib/libharfbuzz.la ln -s {'${harfbuzz.dev}',"$dev"}/lib/pkgconfig/harfbuzz.pc @@ -71,12 +79,9 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "An OpenType text shaping engine"; - homepage = "http://www.freedesktop.org/wiki/Software/HarfBuzz"; - downloadPage = "https://www.freedesktop.org/software/harfbuzz/release/"; + homepage = "https://harfbuzz.github.io/"; maintainers = [ maintainers.eelco ]; license = licenses.mit; platforms = with platforms; linux ++ darwin; - inherit version; - updateWalker = true; }; } diff --git a/pkgs/development/libraries/ilmbase/cross.patch b/pkgs/development/libraries/ilmbase/cross.patch deleted file mode 100644 index 207a440a0d8..00000000000 --- a/pkgs/development/libraries/ilmbase/cross.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Helmut Grohne <> -Subject: compile build tools with the build architecture compiler - -Patch-Source: https://github.com/openexr/openexr/issues/221 - -Index: ilmbase-2.2.0/configure.ac -=================================================================== ---- ilmbase-2.2.0.orig/configure.ac -+++ ilmbase-2.2.0/configure.ac -@@ -28,6 +28,7 @@ - AC_PROG_LN_S - AC_PROG_LIBTOOL - AC_PROG_MAKE_SET -+AX_PROG_CXX_FOR_BUILD - - dnl - dnl PKGCONFIG preparations -Index: ilmbase-2.2.0/Half/Makefile.am -=================================================================== ---- ilmbase-2.2.0.orig/Half/Makefile.am -+++ ilmbase-2.2.0/Half/Makefile.am -@@ -17,9 +17,11 @@ - - CLEANFILES = eLut eLut.h toFloat toFloat.h - --eLut_SOURCES = eLut.cpp -+eLut$(EXEEXT): eLut.cpp -+ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ - --toFloat_SOURCES = toFloat.cpp -+toFloat$(EXEEXT): toFloat.cpp -+ $(CXX_FOR_BUILD) $(CXXFLAGS_FOR_BUILD) $< -o $@ - - eLut.h: eLut - ./eLut > eLut.h diff --git a/pkgs/development/libraries/ilmbase/default.nix b/pkgs/development/libraries/ilmbase/default.nix index ac78257b74a..68bd677cf77 100644 --- a/pkgs/development/libraries/ilmbase/default.nix +++ b/pkgs/development/libraries/ilmbase/default.nix @@ -2,7 +2,6 @@ , lib , buildPackages , cmake -, libtool , openexr }: @@ -12,26 +11,23 @@ stdenv.mkDerivation rec { # the project no longer provides separate tarballs. We may even want to merge # the ilmbase package into openexr in the future. - src = openexr.src; - - sourceRoot = "source/IlmBase"; + inherit (openexr) src patches; outputs = [ "out" "dev" ]; - nativeBuildInputs = [ cmake libtool ]; + nativeBuildInputs = [ cmake ]; depsBuildBuild = [ buildPackages.stdenv.cc ]; - patches = [ - ./cross.patch - ] ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "glibc") [ - openexr.non_glibc_fpstate_patch # see description of this patch in `openexr` - ]; - # fails 1 out of 1 tests with # "lt-ImathTest: testBoxAlgo.cpp:892: void {anonymous}::boxMatrixTransform(): Assertion `b21 == b2' failed" # at least on i686. spooky! doCheck = stdenv.isx86_64; + preConfigure = '' + # Need to cd after patches for openexr patches to apply. + cd IlmBase + ''; + meta = with stdenv.lib; { description = " A library for 2D/3D vectors and matrices and other mathematical objects, functions and data types for computer graphics"; homepage = "https://www.openexr.com/"; diff --git a/pkgs/development/libraries/imlib2/default.nix b/pkgs/development/libraries/imlib2/default.nix index 36b1063531e..458b3d29d52 100644 --- a/pkgs/development/libraries/imlib2/default.nix +++ b/pkgs/development/libraries/imlib2/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { pname = "imlib2"; - version = "1.6.1"; + version = "1.7.0"; src = fetchurl { url = "mirror://sourceforge/enlightenment/${pname}-${version}.tar.bz2"; - sha256 = "0v8n3dswx7rxqfd0q03xwc7j2w1mv8lv18rdxv487a1xw5vklfad"; + sha256 = "0zdk4afdrrr1539f2q15zja19j4wwfmpswzws2ffgflcnhywlxhr"; }; buildInputs = [ diff --git a/pkgs/development/libraries/intel-gmmlib/default.nix b/pkgs/development/libraries/intel-gmmlib/default.nix index c1e2fa5a6f6..89305baaee8 100644 --- a/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "20.2.3"; + version = "20.2.5"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "1gsjcsad70pxafhw0jhxdrnfqwv8ffp5sawbgylvc009jlzxh5l8"; + sha256 = "0jg3kc74iqmbclx77a6dp4h85va8wi210x4zf5jypiq35c57r8hh"; }; nativeBuildInputs = [ cmake ]; @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { license = licenses.mit; description = "Intel Graphics Memory Management Library"; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jfrankenau ]; + maintainers = with maintainers; [ danieldk ]; }; } diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 84dedfa0b3b..1288242faf2 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "itk"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "InsightSoftwareConsortium"; repo = "ITK"; rev = "v${version}"; - sha256 = "0rvkp00xj1js60021jv2ydyl74wvbyb205gm9d7hf8gy2q456hgl"; + sha256 = "1z7rmqrhgl7hfb3d0077kvp8vpi05r2zk3qyqzmv7bzbal5sqqhv"; }; cmakeFlags = [ diff --git a/pkgs/development/libraries/java/hsqldb/default.nix b/pkgs/development/libraries/java/hsqldb/default.nix index d9139ec1d82..88f32866b0d 100644 --- a/pkgs/development/libraries/java/hsqldb/default.nix +++ b/pkgs/development/libraries/java/hsqldb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "hsqldb"; - version = "2.5.0"; + version = "2.5.1"; underscoreMajMin = stdenv.lib.strings.replaceChars ["."] ["_"] (stdenv.lib.versions.majorMinor version); src = fetchurl { url = "mirror://sourceforge/project/hsqldb/hsqldb/hsqldb_${underscoreMajMin}/hsqldb-${version}.zip"; - sha256 = "0s64w7qq5vayrzcmdhrdfmd6iqqv6x6fpiq9lpy2gva3dckv3q6j"; + sha256 = "0yd9px85y036bp3q1assj3fgaykxrwnhnc7cbjgic39cykfy5hrg"; }; nativeBuildInputs = [ unzip makeWrapper ]; diff --git a/pkgs/development/libraries/java/lombok/default.nix b/pkgs/development/libraries/java/lombok/default.nix index f48c4821d92..5928d99b6c2 100644 --- a/pkgs/development/libraries/java/lombok/default.nix +++ b/pkgs/development/libraries/java/lombok/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.18.10"; + name = "lombok-1.18.12"; src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "1ymjwxg01dq8qq89hx23yvk5h46hwfb8ihbqbvabmz1vh9afjdi8"; + sha256 = "01jl6i5wzjxyk36fcq6ji90x9h143gvnwhv86cbkqaxhxh41af29"; }; buildCommand = '' diff --git a/pkgs/development/libraries/kde-frameworks/default.nix b/pkgs/development/libraries/kde-frameworks/default.nix index 9ac3ed11b49..02e25692ef1 100644 --- a/pkgs/development/libraries/kde-frameworks/default.nix +++ b/pkgs/development/libraries/kde-frameworks/default.nix @@ -112,6 +112,7 @@ let kitemmodels = callPackage ./kitemmodels.nix {}; kitemviews = callPackage ./kitemviews.nix {}; kplotting = callPackage ./kplotting.nix {}; + kquickcharts = callPackage ./kquickcharts.nix {}; kwayland = callPackage ./kwayland.nix {}; kwidgetsaddons = callPackage ./kwidgetsaddons.nix {}; kwindowsystem = callPackage ./kwindowsystem {}; @@ -146,10 +147,11 @@ let kbookmarks = callPackage ./kbookmarks.nix {}; kcmutils = callPackage ./kcmutils {}; kconfigwidgets = callPackage ./kconfigwidgets {}; + kdav = callPackage ./kdav.nix {}; kdeclarative = callPackage ./kdeclarative.nix {}; kded = callPackage ./kded.nix {}; kdesignerplugin = callPackage ./kdesignerplugin.nix {}; - kdesu = callPackage ./kdesu.nix {}; + kdesu = callPackage ./kdesu {}; kdewebkit = callPackage ./kdewebkit.nix {}; kemoticons = callPackage ./kemoticons.nix {}; kglobalaccel = callPackage ./kglobalaccel.nix {}; diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh index 81a755bd3ba..839b2eb466d 100644 --- a/pkgs/development/libraries/kde-frameworks/fetch.sh +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -1 +1 @@ -WGET_ARGS=(https://download.kde.org/stable/frameworks/5.71/) +WGET_ARGS=(https://download.kde.org/stable/frameworks/5.73/) diff --git a/pkgs/applications/kde/kdav.nix b/pkgs/development/libraries/kde-frameworks/kdav.nix index 800c92511de..a03cca3fdf2 100644 --- a/pkgs/applications/kde/kdav.nix +++ b/pkgs/development/libraries/kde-frameworks/kdav.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, kdepimTeam, + mkDerivation, lib, extra-cmake-modules, kdoctools, kcoreaddons, kio, qtxmlpatterns, }: @@ -8,7 +8,6 @@ mkDerivation { name = "kdav"; meta = { license = with lib.licenses; [ gpl2 lgpl21 fdl12 ]; - maintainers = kdepimTeam; }; nativeBuildInputs = [ extra-cmake-modules kdoctools ]; buildInputs = [ kcoreaddons kio qtxmlpatterns ]; diff --git a/pkgs/development/libraries/kde-frameworks/kdesu.nix b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix index df60511b511..cd7055c4ea8 100644 --- a/pkgs/development/libraries/kde-frameworks/kdesu.nix +++ b/pkgs/development/libraries/kde-frameworks/kdesu/default.nix @@ -11,4 +11,5 @@ mkDerivation { buildInputs = [ kcoreaddons ki18n kpty kservice qtbase ]; propagatedBuildInputs = [ kpty ]; outputs = [ "out" "dev" ]; + patches = [ ./kdesu-search-for-wrapped-daemon-first.patch ]; } diff --git a/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch new file mode 100644 index 00000000000..f82bf828e8e --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kdesu/kdesu-search-for-wrapped-daemon-first.patch @@ -0,0 +1,38 @@ +From 01af4d2a098e5819c09bca37568941dcd4b89d0b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com> +Date: Thu, 16 Jul 2020 13:21:42 -0300 +Subject: [PATCH] Search for the daemon first in /run/wrappers/bin + +If looking first in libexec, the eventually wrapped one in +/run/wrappers/bin can not be found. +--- + src/client.cpp | 13 ++++++++----- + 1 file changed, 8 insertions(+), 5 deletions(-) + +diff --git a/src/client.cpp b/src/client.cpp +index 44fbacd..6b5abf5 100644 +--- a/src/client.cpp ++++ b/src/client.cpp +@@ -378,11 +378,14 @@ int KDEsuClient::stopServer() + + static QString findDaemon() + { +- QString daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); +- if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH +- daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); +- if (daemon.isEmpty()) { +- qCWarning(KSU_LOG) << "kdesud daemon not found."; ++ QString daemon = QFile::decodeName("/run/wrappers/bin/kdesud"); ++ if (!QFile::exists(daemon)) { // if not in wrappers ++ daemon = QFile::decodeName(CMAKE_INSTALL_FULL_LIBEXECDIR_KF5 "/kdesud"); ++ if (!QFile::exists(daemon)) { // if not in libexec, find it in PATH ++ daemon = QStandardPaths::findExecutable(QStringLiteral("kdesud")); ++ if (daemon.isEmpty()) { ++ qCWarning(KSU_LOG) << "kdesud daemon not found."; ++ } + } + } + return daemon; +-- +2.27.0 + diff --git a/pkgs/development/libraries/kde-frameworks/kquickcharts.nix b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix new file mode 100644 index 00000000000..5a06d4c1cad --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/kquickcharts.nix @@ -0,0 +1,15 @@ +{ + mkDerivation, lib, + extra-cmake-modules, + qtquickcontrols2, +}: + +mkDerivation { + name = "kquickcharts"; + meta = { + maintainers = [ lib.maintainers.ttuegel ]; + }; + nativeBuildInputs = [ extra-cmake-modules ]; + propagatedBuildInputs = [ qtquickcontrols2 ]; + outputs = [ "out" "dev" ]; +} diff --git a/pkgs/development/libraries/kde-frameworks/krunner.nix b/pkgs/development/libraries/kde-frameworks/krunner.nix index 7dd91ffb247..990c3c4fdf9 100644 --- a/pkgs/development/libraries/kde-frameworks/krunner.nix +++ b/pkgs/development/libraries/kde-frameworks/krunner.nix @@ -9,13 +9,6 @@ let self = mkDerivation { name = "krunner"; meta = { maintainers = [ lib.maintainers.ttuegel ]; }; - patches = [ - # Un-deprecate virtual method to restore binary compatibility. - (assert !(lib.versionOlder "5.72" self.version); fetchpatch { - url = "https://invent.kde.org/frameworks/krunner/-/commit/8f7ce559b84ee0c21de0256e6591793e4b95f411.diff"; - sha256 = "124xqxpgmc5fdn1mcf8x1564pqc5y81j7lhzcirql2xcs0sbcyby"; - }) - ]; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ kconfig kcoreaddons ki18n kio kservice qtdeclarative solid diff --git a/pkgs/development/libraries/kde-frameworks/kwayland.nix b/pkgs/development/libraries/kde-frameworks/kwayland.nix index c19836ed7a7..36e0ddc3f94 100644 --- a/pkgs/development/libraries/kde-frameworks/kwayland.nix +++ b/pkgs/development/libraries/kde-frameworks/kwayland.nix @@ -1,7 +1,7 @@ { mkDerivation, lib, propagateBin, extra-cmake-modules, - qtbase, wayland, wayland-protocols + plasma-wayland-protocols, qtbase, wayland, wayland-protocols }: mkDerivation { @@ -11,7 +11,7 @@ mkDerivation { broken = builtins.compareVersions qtbase.version "5.7.0" < 0; }; nativeBuildInputs = [ extra-cmake-modules ]; - buildInputs = [ wayland wayland-protocols ]; + buildInputs = [ plasma-wayland-protocols wayland wayland-protocols ]; propagatedBuildInputs = [ qtbase ]; setupHook = propagateBin; # XDG_CONFIG_DIRS } diff --git a/pkgs/development/libraries/kde-frameworks/srcs.nix b/pkgs/development/libraries/kde-frameworks/srcs.nix index 8ac9d33c8de..070b11f6bfb 100644 --- a/pkgs/development/libraries/kde-frameworks/srcs.nix +++ b/pkgs/development/libraries/kde-frameworks/srcs.nix @@ -4,659 +4,667 @@ { attica = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/attica-5.71.0.tar.xz"; - sha256 = "9e24fd7f58c66879a05e056b781637196eea69d3276ed470643c505f9fd46d3d"; - name = "attica-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/attica-5.73.0.tar.xz"; + sha256 = "011240a6ff59e2b39bcf6d4ba6128e6e60c6318c185e7316a71cfec28e69c69a"; + name = "attica-5.73.0.tar.xz"; }; }; baloo = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/baloo-5.71.0.tar.xz"; - sha256 = "23378213d00ecf1f26eeb417987984f5a63bbd643359403dfd20638cbc1ec84b"; - name = "baloo-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/baloo-5.73.0.tar.xz"; + sha256 = "887077ae3e090d673d2ffe7eb869a0ab6f5d14e9dae2dccd619e4689699a2dfe"; + name = "baloo-5.73.0.tar.xz"; }; }; bluez-qt = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/bluez-qt-5.71.0.tar.xz"; - sha256 = "7014e946f16db62218fe8e9af808999922d447034355f17b9e09b31321e53bad"; - name = "bluez-qt-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/bluez-qt-5.73.0.tar.xz"; + sha256 = "70264edb82b2627c0ec3740374b90b8402e0f432fe4a10650fa3d22191d8cfd4"; + name = "bluez-qt-5.73.0.tar.xz"; }; }; breeze-icons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/breeze-icons-5.71.0.tar.xz"; - sha256 = "72217c46e071b204a80ff8064b1b7319c7a7f9f0b08e69d8add2065e5d301155"; - name = "breeze-icons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/breeze-icons-5.73.0.tar.xz"; + sha256 = "b6caff26f69008a3e0d53ae5fcfcf070b70ad1b17d407daecbbabeb6a606a08b"; + name = "breeze-icons-5.73.0.tar.xz"; }; }; extra-cmake-modules = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/extra-cmake-modules-5.71.0.tar.xz"; - sha256 = "64f41c0b4b3164c7be8fcab5c0181253d97d1e9d62455fd540cb463afd051878"; - name = "extra-cmake-modules-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/extra-cmake-modules-5.73.0.tar.xz"; + sha256 = "c5e3ef0253f7d5ab3adf9185950e34fd620a3d5baaf3bcc15892f971fc3274c4"; + name = "extra-cmake-modules-5.73.0.tar.xz"; }; }; frameworkintegration = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/frameworkintegration-5.71.0.tar.xz"; - sha256 = "f5ba2d5c363dcb09177424b82d9a59ce0f0a6b2dea372799dcba000452764961"; - name = "frameworkintegration-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/frameworkintegration-5.73.0.tar.xz"; + sha256 = "21ef7f1a6d48f9fb14ccac9bc37e803c92cf83c9e235a5ca8bd7eb08fd0a6fb3"; + name = "frameworkintegration-5.73.0.tar.xz"; }; }; kactivities = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kactivities-5.71.0.tar.xz"; - sha256 = "b4e63fec6532e4bdc41470985cea46b0a88c1b2298b80286cbf0ed2d2139b66f"; - name = "kactivities-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kactivities-5.73.0.tar.xz"; + sha256 = "5098f2535175ac12da91568ca554e3f5d970ae05415da1a8ba17305cb8ac3a1a"; + name = "kactivities-5.73.0.tar.xz"; }; }; kactivities-stats = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kactivities-stats-5.71.0.tar.xz"; - sha256 = "79fe4f674d7bae457ce6af0357104a8691f5822963b0ef1f99cd5a43e3666978"; - name = "kactivities-stats-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kactivities-stats-5.73.0.tar.xz"; + sha256 = "df4b00c52e83608b2dd7345cd220143e07b65cb431cead5e9abb1e4ffd6ecd5a"; + name = "kactivities-stats-5.73.0.tar.xz"; }; }; kapidox = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kapidox-5.71.0.tar.xz"; - sha256 = "da75660fc2808f38441ec0f59d3c58ce29fcfdcea29e251308a11a92546f1ed5"; - name = "kapidox-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kapidox-5.73.0.tar.xz"; + sha256 = "b49ff6673906817ed95a3de56535594de02a9f95bcb2726abe52d0c0e0161be5"; + name = "kapidox-5.73.0.tar.xz"; }; }; karchive = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/karchive-5.71.0.tar.xz"; - sha256 = "cc81e856365dec2bcf3ec78aa01d42347ca390a2311ea12050f309dfbdb09624"; - name = "karchive-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/karchive-5.73.0.tar.xz"; + sha256 = "25481ebbba8f58d9ab45bde804ab0d873c45550b482e27e7856b362cd9aa434f"; + name = "karchive-5.73.0.tar.xz"; }; }; kauth = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kauth-5.71.0.tar.xz"; - sha256 = "a0de83bd662e20253011216ab8cba597f8db7429f8706237e7307580125025b5"; - name = "kauth-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kauth-5.73.0.tar.xz"; + sha256 = "e334705bfc3f81c5e2f66315d40badd26d88426128432788f790ebefce1694d9"; + name = "kauth-5.73.0.tar.xz"; }; }; kbookmarks = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kbookmarks-5.71.0.tar.xz"; - sha256 = "e00db1e62a769863a1bf90bb508f108f2740298aa40173cad34ef34a1c23a01a"; - name = "kbookmarks-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kbookmarks-5.73.0.tar.xz"; + sha256 = "b925ec1b8a1b4a2b7f2526fdbc7761de065b3c9573e41ac274773ed1b576aa51"; + name = "kbookmarks-5.73.0.tar.xz"; }; }; kcalendarcore = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcalendarcore-5.71.0.tar.xz"; - sha256 = "d5138db971f6be606be8ae7d761bad778af3cacada8e85fb2f469190c347cd94"; - name = "kcalendarcore-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcalendarcore-5.73.0.tar.xz"; + sha256 = "e3486b41b833c0ba72f839d8a61bdffaf9b3ece3da20f478c2981b3296e7b713"; + name = "kcalendarcore-5.73.0.tar.xz"; }; }; kcmutils = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcmutils-5.71.0.tar.xz"; - sha256 = "27743a81e9aa48baac12bb844e48d3098250699122ed6040b1e3c50a5e8f276d"; - name = "kcmutils-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcmutils-5.73.0.tar.xz"; + sha256 = "b28bf672bbe21e8d1b4e6ea924c1bb318c81c43dcbb86bebb3f5775e18945ca9"; + name = "kcmutils-5.73.0.tar.xz"; }; }; kcodecs = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcodecs-5.71.0.tar.xz"; - sha256 = "3392c4df652e3a44a2b941ccb419dee9521642e503104de403ec1c6be9f43a28"; - name = "kcodecs-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcodecs-5.73.0.tar.xz"; + sha256 = "3bcb22b4f3b2f164759ab912d117c3b4b50695ae38d524f2cfb79a29488cce67"; + name = "kcodecs-5.73.0.tar.xz"; }; }; kcompletion = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcompletion-5.71.0.tar.xz"; - sha256 = "bf0b6ce1ee133900f169662dbd35da6f766d3e4e02c0c102a9402e20450a22a4"; - name = "kcompletion-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcompletion-5.73.0.tar.xz"; + sha256 = "72b0650e5ae9f30ad4ec30b55e660c826d93edfda0ef4f9436f226cbb8a9705a"; + name = "kcompletion-5.73.0.tar.xz"; }; }; kconfig = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kconfig-5.71.0.tar.xz"; - sha256 = "618ff0d168abf8fb73dc83431b9a76f7859d522bea100ff07c7e1632e129e3f4"; - name = "kconfig-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kconfig-5.73.0.tar.xz"; + sha256 = "6046bbb8da5f3261aac7f868bfa8a8ce1015a3a8257fe0b2d37dce9e2bc3952e"; + name = "kconfig-5.73.0.tar.xz"; }; }; kconfigwidgets = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kconfigwidgets-5.71.0.tar.xz"; - sha256 = "5778523c49a5294e9376ce8ee6db1a51ffaa506418a19e8632f73287a596276f"; - name = "kconfigwidgets-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kconfigwidgets-5.73.0.tar.xz"; + sha256 = "ed8a0a8158f895aebd46c4a725f77178d942cd9476a864a615a9df343da51f8e"; + name = "kconfigwidgets-5.73.0.tar.xz"; }; }; kcontacts = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcontacts-5.71.0.tar.xz"; - sha256 = "57f511a624406b27a7de25c83deb4104c95e851f9fda4f6d94450155ab08f4bd"; - name = "kcontacts-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcontacts-5.73.0.tar.xz"; + sha256 = "4351bf80f5a5417ba7e99fe557a851d1c7173fd7511fc1426375c66692e748bb"; + name = "kcontacts-5.73.0.tar.xz"; }; }; kcoreaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcoreaddons-5.71.0.tar.xz"; - sha256 = "e95008b032e299cf47f596739d9236701e2f55e507734f33b8ea497882fd130b"; - name = "kcoreaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcoreaddons-5.73.0.tar.xz"; + sha256 = "24a7713eaef2f40e648a586e22b030192321f9fecdbae77013b00446fa0d6d51"; + name = "kcoreaddons-5.73.0.tar.xz"; }; }; kcrash = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kcrash-5.71.0.tar.xz"; - sha256 = "526242aa9fde7cff11ecaa88bf75d6fbbfc412f46bf19a7a9e185f2adb616005"; - name = "kcrash-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kcrash-5.73.0.tar.xz"; + sha256 = "49b6f4d6109ddf3a6b93f833f59483e5a1a748e4b829c4739fdaaaef59c9b583"; + name = "kcrash-5.73.0.tar.xz"; + }; + }; + kdav = { + version = "5.73.0"; + src = fetchurl { + url = "${mirror}/stable/frameworks/5.73/kdav-5.73.0.tar.xz"; + sha256 = "03c8af96e7bb1b1d2d633e54c6362c7c2de078b8aba5654042b7a11d968efa31"; + name = "kdav-5.73.0.tar.xz"; }; }; kdbusaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdbusaddons-5.71.0.tar.xz"; - sha256 = "b441f525248d9d675333cebedf97ee0232a3a9b7aa9aff84d825dfcdb3bcd23c"; - name = "kdbusaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdbusaddons-5.73.0.tar.xz"; + sha256 = "f7f7e57b4d4650cf90a191b08b1fe874d0005c34163b9177dcc787415841e8ba"; + name = "kdbusaddons-5.73.0.tar.xz"; }; }; kdeclarative = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdeclarative-5.71.0.tar.xz"; - sha256 = "ace0e52f561a9cfba1de4b77144a0a68037a1229530fb39070dc837da80ac8f8"; - name = "kdeclarative-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdeclarative-5.73.0.tar.xz"; + sha256 = "713ae2ea41e1bac8f6d47cffa376d62c7805eb3e4cc41c3168c1f1b2ca70a598"; + name = "kdeclarative-5.73.0.tar.xz"; }; }; kded = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kded-5.71.0.tar.xz"; - sha256 = "404c8caae0f4abe2ef85c2e82b5db2b14ae4b607fa30e4f16d15dad53c269fcc"; - name = "kded-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kded-5.73.0.tar.xz"; + sha256 = "f21647a5f35eebaa9bf12b5d5da25c24611c1971f94f27c510d22a48c79b0895"; + name = "kded-5.73.0.tar.xz"; }; }; kdelibs4support = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kdelibs4support-5.71.0.tar.xz"; - sha256 = "1110ed68a29e38059d195817735d58df45e59b57fa9ac48ef2036c1037a23fb7"; - name = "kdelibs4support-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kdelibs4support-5.73.0.tar.xz"; + sha256 = "ca6f58c97b331d130a555b950c36cd7f625ca923fd185b0f73e20ac5b98c5d9b"; + name = "kdelibs4support-5.73.0.tar.xz"; }; }; kdesignerplugin = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kdesignerplugin-5.71.0.tar.xz"; - sha256 = "e77a96c2a6cd518f3040e9366f013f0128200791b6c93c3c5b2310af16fb040b"; - name = "kdesignerplugin-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kdesignerplugin-5.73.0.tar.xz"; + sha256 = "379db9fd0ec135706630dbd54e1b446e51dd3b64189754c281993d761c1d20b2"; + name = "kdesignerplugin-5.73.0.tar.xz"; }; }; kdesu = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdesu-5.71.0.tar.xz"; - sha256 = "b183e67c089b02f984284b5eb3c05f7216d289bef7ae08a9e6c6f991b2a1a23a"; - name = "kdesu-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdesu-5.73.0.tar.xz"; + sha256 = "4dd07697decad6a544025178732bd279ef64766e1929a2135f6de58b1092944d"; + name = "kdesu-5.73.0.tar.xz"; }; }; kdewebkit = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kdewebkit-5.71.0.tar.xz"; - sha256 = "04b8b90734ddf6d5e72ffa69707d473e1d1f8605ba06d4ceca83f4a1d195c65d"; - name = "kdewebkit-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kdewebkit-5.73.0.tar.xz"; + sha256 = "d8208c4f7a98b6749c793649e2e5fbe3939e253289a9f6b74b559f6546b34b0b"; + name = "kdewebkit-5.73.0.tar.xz"; }; }; kdnssd = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdnssd-5.71.0.tar.xz"; - sha256 = "bc269f0a74eee99d6c49550fc608450ced753a599cd03f77ea577af4c2e87958"; - name = "kdnssd-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdnssd-5.73.0.tar.xz"; + sha256 = "bee7f654f704d928b1219b75a289042474c1450e9f8acb02a905a4a177bc5b7d"; + name = "kdnssd-5.73.0.tar.xz"; }; }; kdoctools = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kdoctools-5.71.0.tar.xz"; - sha256 = "1e2fcaa97a014e82f68c0c36591ce84568ead7abd59b66e534789103e162cd09"; - name = "kdoctools-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kdoctools-5.73.0.tar.xz"; + sha256 = "d8dd74776d47e009d4a204d69a78428603ca99317095d7b7edca49c3d93b1b5d"; + name = "kdoctools-5.73.0.tar.xz"; }; }; kemoticons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kemoticons-5.71.0.tar.xz"; - sha256 = "20bcb111971cc2e8c17b38a0c20aff7cf453174f885c4b4bcc5899141113e2fc"; - name = "kemoticons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kemoticons-5.73.0.tar.xz"; + sha256 = "0c0a26b029a8fd3d8db97bac931feb7834912aa2f7680660e98d91e868d10778"; + name = "kemoticons-5.73.0.tar.xz"; }; }; kfilemetadata = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kfilemetadata-5.71.0.tar.xz"; - sha256 = "2e302958065157c1f9ea4a189bbca40b7dbed019767a3380e34e0b6a633c75fe"; - name = "kfilemetadata-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kfilemetadata-5.73.0.tar.xz"; + sha256 = "1ae217aab920741e445211e20b1b60dfcf80f4a6d1864aa63321dac7c3802894"; + name = "kfilemetadata-5.73.0.tar.xz"; }; }; kglobalaccel = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kglobalaccel-5.71.0.tar.xz"; - sha256 = "218d77aa4f6089d57932d627c4a46a8a4a5e964c2bfcee0d1c54338c25c7a06c"; - name = "kglobalaccel-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kglobalaccel-5.73.0.tar.xz"; + sha256 = "0062db9adde4dab0be6b64430010c0a5653355d0d1680abc9ec8e71988ff871f"; + name = "kglobalaccel-5.73.0.tar.xz"; }; }; kguiaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kguiaddons-5.71.0.tar.xz"; - sha256 = "c1f7bf540a689319962275916c0434f47ba5ed8f7d46a78704393163e32eccd2"; - name = "kguiaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kguiaddons-5.73.0.tar.xz"; + sha256 = "45b4c5e0195abd79930635bbf20886b15b1b68b13fe4c56068579b91ef147350"; + name = "kguiaddons-5.73.0.tar.xz"; }; }; kholidays = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kholidays-5.71.0.tar.xz"; - sha256 = "5469718d6ede7edb2ab06bbaff8af01567ba77ffe2160c2c2d47c666cfebf417"; - name = "kholidays-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kholidays-5.73.0.tar.xz"; + sha256 = "b0ae4b77aa7c183959bc18baa09a1a4f7208fcad2a238c1590377bf6cf8b68ab"; + name = "kholidays-5.73.0.tar.xz"; }; }; khtml = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/khtml-5.71.0.tar.xz"; - sha256 = "df8d2a4776f98e1490a21e71e31a2ea7694bc7452da35f88623b19214b6e1c10"; - name = "khtml-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/khtml-5.73.0.tar.xz"; + sha256 = "378a5aaa6c796d313a63b4cf1365cdd980f2bc21e9033354f2f1317d1db9c262"; + name = "khtml-5.73.0.tar.xz"; }; }; ki18n = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/ki18n-5.71.0.tar.xz"; - sha256 = "f2fc8c40c10576da8b74070b7dc8e752fdd04204cb2bfe522f37a0458fbaf881"; - name = "ki18n-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/ki18n-5.73.0.tar.xz"; + sha256 = "97eef22d6cdd65c57edfe54fa9760a69005e15b7d8f4270f6185916c33e14689"; + name = "ki18n-5.73.0.tar.xz"; }; }; kiconthemes = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kiconthemes-5.71.0.tar.xz"; - sha256 = "3fa986207e9d967840bd7a3f1af1e4d0105905012a0e4cf56f7ef1b3740b3496"; - name = "kiconthemes-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kiconthemes-5.73.0.tar.xz"; + sha256 = "4490109a0a42675e4cd3497433e10fd4be24ef644a283edf46b308314d130356"; + name = "kiconthemes-5.73.0.tar.xz"; }; }; kidletime = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kidletime-5.71.0.tar.xz"; - sha256 = "1bcacd6c9ec8d65f93434f51d865723a50609ec074f88da2890a8f37ea8d207d"; - name = "kidletime-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kidletime-5.73.0.tar.xz"; + sha256 = "52a8af3f061101c406a592ec277a2c84846e3910af1d3dbfc3e15beb9cfd24a2"; + name = "kidletime-5.73.0.tar.xz"; }; }; kimageformats = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kimageformats-5.71.0.tar.xz"; - sha256 = "0d6d6a8664e4a01df27e9970ec9ec10a92c1d43a00a3e9ef0471d740b4c93d94"; - name = "kimageformats-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kimageformats-5.73.0.tar.xz"; + sha256 = "473d0f67d5357bbf08aa4f4504ceaceabc720b1f5433b456ddc5f8ad0d7e3b8b"; + name = "kimageformats-5.73.0.tar.xz"; }; }; kinit = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kinit-5.71.0.tar.xz"; - sha256 = "6ea625bced2c19b0f3e5bb504775dd6764358f02412364a16cbad731c5c299b6"; - name = "kinit-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kinit-5.73.0.tar.xz"; + sha256 = "0c61e90f3db83b4dc5f2438cf7880a02b600a5739cb05e5ee372aeff98b8b770"; + name = "kinit-5.73.0.tar.xz"; }; }; kio = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kio-5.71.0.tar.xz"; - sha256 = "b972c8dede50be3e89babb5a536054759db2a87003e6df770c598c7c1c94b8d6"; - name = "kio-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kio-5.73.0.tar.xz"; + sha256 = "05da159e6cf5ef9aa4dd7ede86ce28a5581624a1b3f0b4718c5b7e30c4aa2a66"; + name = "kio-5.73.0.tar.xz"; }; }; kirigami2 = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kirigami2-5.71.0.tar.xz"; - sha256 = "f323efb96a809dc9e572a0e68e04c4f485fc27f9ae65ffa3988830e348151356"; - name = "kirigami2-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kirigami2-5.73.0.tar.xz"; + sha256 = "9b2a097071f77804f6f2f2a478e5db602c8b5fee00de34fc44842f31223401bb"; + name = "kirigami2-5.73.0.tar.xz"; }; }; kitemmodels = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kitemmodels-5.71.0.tar.xz"; - sha256 = "68205f09d63a916f236e2b3b729c0055377d852de48f7cf29fa7174ca97b84e7"; - name = "kitemmodels-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kitemmodels-5.73.0.tar.xz"; + sha256 = "6569e289ac9263d87ef6641fe2f3914b9ace6814832ac9c61825b1c6805ae371"; + name = "kitemmodels-5.73.0.tar.xz"; }; }; kitemviews = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kitemviews-5.71.0.tar.xz"; - sha256 = "2843ef166ff5bf69c1132bbc09545b59ad208313c0acad71d0cd951fde1d33de"; - name = "kitemviews-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kitemviews-5.73.0.tar.xz"; + sha256 = "ec29707d789bee58c47ee538319560a168642f69e96cacb78818825e47177727"; + name = "kitemviews-5.73.0.tar.xz"; }; }; kjobwidgets = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kjobwidgets-5.71.0.tar.xz"; - sha256 = "63f3b2fc1c062b1a485ff543e2d5afa68a9f9a918676bf3a6a5dc8f56f5f30e3"; - name = "kjobwidgets-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kjobwidgets-5.73.0.tar.xz"; + sha256 = "61d105c8f17dcfb85ad6c1e3bd2423ebeb430b9c290d193229bc953ac174f2bf"; + name = "kjobwidgets-5.73.0.tar.xz"; }; }; kjs = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kjs-5.71.0.tar.xz"; - sha256 = "702224482139e500da1ea4e0d2b5132bf762f87f426f294587a0f2f47b9a9734"; - name = "kjs-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kjs-5.73.0.tar.xz"; + sha256 = "97b52557212a33d59a4b3a8c34ea8a94cd5f840fb0798e770164d3cb1e755be5"; + name = "kjs-5.73.0.tar.xz"; }; }; kjsembed = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kjsembed-5.71.0.tar.xz"; - sha256 = "9352a31b5f735d71d6db4b09825ca01adb337e37f2b0cfce48c679e932238486"; - name = "kjsembed-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kjsembed-5.73.0.tar.xz"; + sha256 = "cc9896930c01a6bdbfaddada9516380c9a54e5d719836f1788d8e3a74108e1d3"; + name = "kjsembed-5.73.0.tar.xz"; }; }; kmediaplayer = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kmediaplayer-5.71.0.tar.xz"; - sha256 = "72492a6c877dded4f2333f140c025fdc4a271a68695c635c0dbc09b08d832eca"; - name = "kmediaplayer-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kmediaplayer-5.73.0.tar.xz"; + sha256 = "69aa3bbedfc8b9a0dd9f4ac260cded9d7b5894477bf4b5b09065d0aae8e44ab2"; + name = "kmediaplayer-5.73.0.tar.xz"; }; }; knewstuff = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/knewstuff-5.71.0.tar.xz"; - sha256 = "aba867855d69641f73db30405e787fc9ea22e3386a45be9626ba84cbe208f855"; - name = "knewstuff-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/knewstuff-5.73.0.tar.xz"; + sha256 = "7669e62973f7e228975a07f15bb1c7f716edd81ce82d5f578a80b1f501abda1e"; + name = "knewstuff-5.73.0.tar.xz"; }; }; knotifications = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/knotifications-5.71.0.tar.xz"; - sha256 = "b900146340621d54f6113600e85d287b28225d82515affb8690704433e5d0440"; - name = "knotifications-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/knotifications-5.73.0.tar.xz"; + sha256 = "c8e9f36716db33baca93a0386d3bb6426408eee3843eb5854bdd8ad7579f372c"; + name = "knotifications-5.73.0.tar.xz"; }; }; knotifyconfig = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/knotifyconfig-5.71.0.tar.xz"; - sha256 = "226b7f956f7013027621c4018b4376b76129ea4195df67fc7df4435c54baf50e"; - name = "knotifyconfig-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/knotifyconfig-5.73.0.tar.xz"; + sha256 = "641a167a58856e99036d44b3e7472b44cdfbbf68e5d75b9af988d0b71dc10af4"; + name = "knotifyconfig-5.73.0.tar.xz"; }; }; kpackage = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kpackage-5.71.0.tar.xz"; - sha256 = "c4b924e7c506cb75bdaaf68bd881e79a73999bd6436f29157f56c76f32b48cba"; - name = "kpackage-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kpackage-5.73.0.tar.xz"; + sha256 = "480b1e11733fe272d1a5680afea39bcc940f01bd3d1267be0981e3c92e098c4f"; + name = "kpackage-5.73.0.tar.xz"; }; }; kparts = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kparts-5.71.0.tar.xz"; - sha256 = "d038f97dfdccdd85dbac09c0f64cf852191ec2e535fd7928740e03d4ffe63b90"; - name = "kparts-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kparts-5.73.0.tar.xz"; + sha256 = "5546d2a474c80a601ba013642775682b087d086bd26d0b0d025b68d680c98bf2"; + name = "kparts-5.73.0.tar.xz"; }; }; kpeople = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kpeople-5.71.0.tar.xz"; - sha256 = "d63d5f5cbbedc2e4ef85fa8c2ff4adcd5cb9e05d1d1ee0e7b2c2d151193f5403"; - name = "kpeople-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kpeople-5.73.0.tar.xz"; + sha256 = "9e0d3119c168f7843251c808cc149de15c1fd692062f431972023fdaa84d21c4"; + name = "kpeople-5.73.0.tar.xz"; }; }; kplotting = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kplotting-5.71.0.tar.xz"; - sha256 = "84bacfbd86105e454f3d97f4ac4062e2f992556fca66d2c73806d1d12095bec1"; - name = "kplotting-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kplotting-5.73.0.tar.xz"; + sha256 = "b5055ed9a3149c059623d88875816e9fac8d6d25d29fdfd48e0d8a16dfe01b14"; + name = "kplotting-5.73.0.tar.xz"; }; }; kpty = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kpty-5.71.0.tar.xz"; - sha256 = "7629d35ff783aff8fe801db30eb146efe50620f7500c4f7f1bf7d2619568c6b9"; - name = "kpty-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kpty-5.73.0.tar.xz"; + sha256 = "d3bf99062589dbd1dbe302c8ed2528845f245e7f0f17ca865cdd100f7589ce9c"; + name = "kpty-5.73.0.tar.xz"; }; }; kquickcharts = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kquickcharts-5.71.0.tar.xz"; - sha256 = "a1befe13903676a9779030b02b91da9889540e689e1f6a0afd54ff484109642a"; - name = "kquickcharts-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kquickcharts-5.73.0.tar.xz"; + sha256 = "e37e13a5d907d872679eab38ba8e983b2fb98a11e07a3c15d32cfaad09075cfe"; + name = "kquickcharts-5.73.0.tar.xz"; }; }; kross = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kross-5.71.0.tar.xz"; - sha256 = "ac42ed4ec39ddaea0a4668803271f6f5de513fcdd1243d02b296544ab601bb1c"; - name = "kross-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kross-5.73.0.tar.xz"; + sha256 = "aa27b434da981f64c40985a61ee041417667844c6077c9fb52456635be67546e"; + name = "kross-5.73.0.tar.xz"; }; }; krunner = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/krunner-5.71.0.tar.xz"; - sha256 = "fb3ce4c587a1b114550487b5716f0aba53b775018b6eef2ae48b8d6fdda40952"; - name = "krunner-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/krunner-5.73.0.tar.xz"; + sha256 = "b4e8427083b6546327eeb36b05a7e438e58f922d4cc5ae0c24cd8241924e9e09"; + name = "krunner-5.73.0.tar.xz"; }; }; kservice = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kservice-5.71.0.tar.xz"; - sha256 = "6b7f4784cb514ec966f3cb01d26aa2dbdfd2425919efa57a4efa6117fcafc9ce"; - name = "kservice-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kservice-5.73.0.tar.xz"; + sha256 = "a64bf7543870240f0d8f8c2bcf43759d98962ba94a4ed34bd23232df25bb408b"; + name = "kservice-5.73.0.tar.xz"; }; }; ktexteditor = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/ktexteditor-5.71.0.tar.xz"; - sha256 = "6e50b6669b288f8e624cba11bca53b78748faf6cb978628f02664038cfa294da"; - name = "ktexteditor-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/ktexteditor-5.73.0.tar.xz"; + sha256 = "032b3ac31aa099ed67471f78401d13cf318646b0b9b5e20bb94796ac3ed6cf18"; + name = "ktexteditor-5.73.0.tar.xz"; }; }; ktextwidgets = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/ktextwidgets-5.71.0.tar.xz"; - sha256 = "0a7fae03d8b59ec8a4f7c49a228536ea4121bd3d8f19fb1ff9831ada428509f4"; - name = "ktextwidgets-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/ktextwidgets-5.73.0.tar.xz"; + sha256 = "2a8b086fce8136b5b4af4a28b417343fb66148c1961e5d65bf40ccae2d4386e5"; + name = "ktextwidgets-5.73.0.tar.xz"; }; }; kunitconversion = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kunitconversion-5.71.0.tar.xz"; - sha256 = "65bfba8e88e2cf6de40e06ce24fe5f48948cc92f16ce78eb8538de532dcf36cb"; - name = "kunitconversion-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kunitconversion-5.73.0.tar.xz"; + sha256 = "97d008e8bdb2d1f89d2093294a8be0b13b0e0160658fa7d3de6c99a5fd5e2935"; + name = "kunitconversion-5.73.0.tar.xz"; }; }; kwallet = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwallet-5.71.0.tar.xz"; - sha256 = "d53b5bc4bbe054101b012d63672efc30af6a5aea58f467037cab4735b6ace9b5"; - name = "kwallet-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwallet-5.73.0.tar.xz"; + sha256 = "4a9c8a538054fc51b30679d5180d09bb6d12a833f595a8d6875b6d4c29074de1"; + name = "kwallet-5.73.0.tar.xz"; }; }; kwayland = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwayland-5.71.0.tar.xz"; - sha256 = "369ba54b485214687e719bc9216e3bb50849df3af9a3ec0e95cf5d5687c847c2"; - name = "kwayland-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwayland-5.73.0.tar.xz"; + sha256 = "ee34a490a7bbc5e83eb36a6ac70492a76cb054d3077d0a8db216fd8b07f27bfe"; + name = "kwayland-5.73.0.tar.xz"; }; }; kwidgetsaddons = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwidgetsaddons-5.71.0.tar.xz"; - sha256 = "897077995bcf4125d0f90d2964500e718d2a3fd5f117e1b7906177ad13a5082e"; - name = "kwidgetsaddons-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwidgetsaddons-5.73.0.tar.xz"; + sha256 = "0722d853747b85ca7d46f278dc99c28b872185406b97b811523c1aa9b5e75eb6"; + name = "kwidgetsaddons-5.73.0.tar.xz"; }; }; kwindowsystem = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kwindowsystem-5.71.0.tar.xz"; - sha256 = "a3613aea6fa73ebc53f28c011a6bca31ed157e29f85df767e617c44399360cda"; - name = "kwindowsystem-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kwindowsystem-5.73.0.tar.xz"; + sha256 = "0e27ad2cd5e4699efdc02daec181b4ffb0b9e31ec4c96f0f67899804aebbcde8"; + name = "kwindowsystem-5.73.0.tar.xz"; }; }; kxmlgui = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/kxmlgui-5.71.0.tar.xz"; - sha256 = "2e4b2563daeedf35a54d38002c05d7c39017a36c0b8a19c236ea87324eebf7cc"; - name = "kxmlgui-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/kxmlgui-5.73.0.tar.xz"; + sha256 = "093131f5f51497ec61e99bd3e19de9421643d3f6ddf0099a823a3d624596ebcb"; + name = "kxmlgui-5.73.0.tar.xz"; }; }; kxmlrpcclient = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/portingAids/kxmlrpcclient-5.71.0.tar.xz"; - sha256 = "5947de8ec9cd57d8ccf6ea8a764066733d2633d93e11f94ecfb47a75e1e7a91f"; - name = "kxmlrpcclient-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/portingAids/kxmlrpcclient-5.73.0.tar.xz"; + sha256 = "c0d089c389f59bb7cb6fba629f3e122e70fda19a69f419ff8bd1d9fcee95a047"; + name = "kxmlrpcclient-5.73.0.tar.xz"; }; }; modemmanager-qt = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/modemmanager-qt-5.71.0.tar.xz"; - sha256 = "b2e5e2a8b8fe2e9fb22bb7dc77177a975727991c6c0ee19d5a9b0a2ab513531d"; - name = "modemmanager-qt-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/modemmanager-qt-5.73.0.tar.xz"; + sha256 = "87f3864b2b53b4e309bca1feefa613455f60e4699969a569694f6813447e1fcd"; + name = "modemmanager-qt-5.73.0.tar.xz"; }; }; networkmanager-qt = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/networkmanager-qt-5.71.0.tar.xz"; - sha256 = "7fe6a0c9d9b25c434c6a200de19f722d942165252cc9161f1d8fcddf64147034"; - name = "networkmanager-qt-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/networkmanager-qt-5.73.0.tar.xz"; + sha256 = "b909feafc0a9a18b59744e0f1973c5357f67bbd50b59afa82cf55955dae7d41f"; + name = "networkmanager-qt-5.73.0.tar.xz"; }; }; oxygen-icons5 = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/oxygen-icons5-5.71.0.tar.xz"; - sha256 = "a75a82164e2af5b6f269a386762ff2abba052dbfca18c9aed8d738c9cd958b04"; - name = "oxygen-icons5-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/oxygen-icons5-5.73.0.tar.xz"; + sha256 = "662cd9644e393c69dccb538cdd4280253be812f80704c992ada228c0c32c2bbc"; + name = "oxygen-icons5-5.73.0.tar.xz"; }; }; plasma-framework = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/plasma-framework-5.71.0.tar.xz"; - sha256 = "a54c8603ca261c89609a3009536a9217ce3415a7fd63527ed36f266399613067"; - name = "plasma-framework-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/plasma-framework-5.73.0.tar.xz"; + sha256 = "e5415143f0a08cd75cf758b0692021d2a2febdcb1364e2aa1e5c8fbeee148c93"; + name = "plasma-framework-5.73.0.tar.xz"; }; }; prison = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/prison-5.71.0.tar.xz"; - sha256 = "44762ee7a3993bd7527f0b33ee09bacc1d5a518641b79932e5490a511ac7e87f"; - name = "prison-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/prison-5.73.0.tar.xz"; + sha256 = "a2b135ffdf1af240366f3fb077c02c02094fb1706c6e84fab5186802544a5b87"; + name = "prison-5.73.0.tar.xz"; }; }; purpose = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/purpose-5.71.0.tar.xz"; - sha256 = "de0531a84f671a15fe4a6348220e922a3230178554e26baf392a1f295044e4be"; - name = "purpose-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/purpose-5.73.0.tar.xz"; + sha256 = "6f4d440cb708b636430e3206f879ca5c2e6cdfcf62f92ce173d43e291fbeed32"; + name = "purpose-5.73.0.tar.xz"; }; }; qqc2-desktop-style = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/qqc2-desktop-style-5.71.0.tar.xz"; - sha256 = "b968ce6fc7c1d111aa2c63584dddc0f74e9066a0b4ea26d1194e46e2f7b38700"; - name = "qqc2-desktop-style-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/qqc2-desktop-style-5.73.0.tar.xz"; + sha256 = "290b3637be0c3740e92cdbb1421aef8bf1a8df36218f9d7d120e8422d14c3fdd"; + name = "qqc2-desktop-style-5.73.0.tar.xz"; }; }; solid = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/solid-5.71.0.tar.xz"; - sha256 = "72a7bdd8306ec4cda5f504819e0ff3f8baca6530fa04e33f10b6b89dc010505b"; - name = "solid-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/solid-5.73.0.tar.xz"; + sha256 = "7366b64438a1ca7a42126e67d352e371227b46418ce961321d358f2eb90c0933"; + name = "solid-5.73.0.tar.xz"; }; }; sonnet = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/sonnet-5.71.0.tar.xz"; - sha256 = "cd663b3e1b23aef58d85f72dfdc92aaae33f358b22ad1fc36fde6c66eb7f0e72"; - name = "sonnet-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/sonnet-5.73.0.tar.xz"; + sha256 = "009f76fc4317e407d30c4e162a807d620a95217f5db271a14b1f9fc4339d232c"; + name = "sonnet-5.73.0.tar.xz"; }; }; syndication = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/syndication-5.71.0.tar.xz"; - sha256 = "c515fd48d3736b55c8e7990c72471bfddd55363c4bcb049713be741eaa7b07e0"; - name = "syndication-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/syndication-5.73.0.tar.xz"; + sha256 = "2a65972ef5183edb0bd8b3804dae129ae8f4a4469287711e77fc636e90b8a954"; + name = "syndication-5.73.0.tar.xz"; }; }; syntax-highlighting = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/syntax-highlighting-5.71.0.tar.xz"; - sha256 = "845ae0c7b8523c23c3ad704a6c551260a358d96b0094a5c2b062879e58173f84"; - name = "syntax-highlighting-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/syntax-highlighting-5.73.0.tar.xz"; + sha256 = "51ed4a68ba42d0dc88d91a0c11ac55ada199b7e93b0ff74b80b5e9304fe8901b"; + name = "syntax-highlighting-5.73.0.tar.xz"; }; }; threadweaver = { - version = "5.71.0"; + version = "5.73.0"; src = fetchurl { - url = "${mirror}/stable/frameworks/5.71/threadweaver-5.71.0.tar.xz"; - sha256 = "039e73d70f38af38a63235cfb554111ee0d58a6ac168bff0745f0d029c5c528d"; - name = "threadweaver-5.71.0.tar.xz"; + url = "${mirror}/stable/frameworks/5.73/threadweaver-5.73.0.tar.xz"; + sha256 = "7e1152a1cf73f841c3be5d73cb0d5e6e29ec700be859c94275c5c00e49488d38"; + name = "threadweaver-5.73.0.tar.xz"; }; }; } diff --git a/pkgs/development/libraries/kpmcore/default.nix b/pkgs/development/libraries/kpmcore/default.nix index 52e6264843b..7903fc74639 100644 --- a/pkgs/development/libraries/kpmcore/default.nix +++ b/pkgs/development/libraries/kpmcore/default.nix @@ -3,15 +3,12 @@ , libatasmart, parted , utillinux }: -let +stdenv.mkDerivation rec { pname = "kpmcore"; - -in stdenv.mkDerivation rec { - name = "${pname}-${version}"; version = "3.3.0"; src = fetchurl { - url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; + url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz"; sha256 = "0s6v0jfrhjg31ri5p6h9n4w29jvasf5dj954j3vfpzl91lygmmmq"; }; @@ -24,12 +21,14 @@ in stdenv.mkDerivation rec { utillinux # needs blkid (note that this is not provided by utillinux-compat) ]; + nativeBuildInputs = [ extra-cmake-modules ]; + enableParallelBuilding = true; meta = with stdenv.lib; { maintainers = with lib.maintainers; [ peterhoeg ]; - # The build requires at least Qt 5.12: - broken = lib.versionOlder qtbase.version "5.12.0"; + # The build requires at least Qt 5.14: + broken = lib.versionOlder qtbase.version "5.14"; }; } diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix index 2b3ef8c99c8..d6c90ee172b 100644 --- a/pkgs/development/libraries/libaacs/default.nix +++ b/pkgs/development/libraries/libaacs/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "libaacs"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { url = "http://get.videolan.org/libaacs/${version}/${pname}-${version}.tar.bz2"; - sha256 = "1zhjdcph8sqx7ak35s22kc736icwq135jlypggkp6vqyyygb3xlk"; + sha256 = "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"; }; buildInputs = [ libgcrypt libgpgerror ]; diff --git a/pkgs/development/libraries/libappindicator/default.nix b/pkgs/development/libraries/libappindicator/default.nix index dc0542c2126..7a7ad22756c 100644 --- a/pkgs/development/libraries/libappindicator/default.nix +++ b/pkgs/development/libraries/libappindicator/default.nix @@ -1,11 +1,11 @@ # TODO: Resolve the issues with the Mono bindings. -{ stdenv, fetchurl, fetchpatch, lib +{ stdenv, fetchgit, lib , pkgconfig, autoreconfHook , glib, dbus-glib, gtkVersion ? "3" , gtk2 ? null, libindicator-gtk2 ? null, libdbusmenu-gtk2 ? null , gtk3 ? null, libindicator-gtk3 ? null, libdbusmenu-gtk3 ? null -, vala, gobject-introspection +, gtk-doc, vala, gobject-introspection , monoSupport ? false, mono ? null, gtk-sharp-2_0 ? null }: @@ -15,18 +15,17 @@ with lib; stdenv.mkDerivation rec { name = let postfix = if gtkVersion == "2" && monoSupport then "sharp" else "gtk${gtkVersion}"; in "libappindicator-${postfix}-${version}"; - version = "${versionMajor}.${versionMinor}"; - versionMajor = "12.10"; - versionMinor = "0"; + version = "12.10.1+20.10.20200706.1"; outputs = [ "out" "dev" ]; - src = fetchurl { - url = "${meta.homepage}/${versionMajor}/${version}/+download/libappindicator-${version}.tar.gz"; - sha256 = "17xlqd60v0zllrxp8bgq3k5a1jkj0svkqn8rzllcyjh8k0gpr46m"; + src = fetchgit { + url = "https://git.launchpad.net/ubuntu/+source/libappindicator"; + rev = "fe25e53bc7e39cd59ad6b3270cd7a6a9c78c4f44"; + sha256 = "0xjvbl4gn7ra2fs6gn2g9s787kzb5cg9hv79iqsz949rxh4iw32d"; }; - nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection ]; + nativeBuildInputs = [ pkgconfig autoreconfHook vala gobject-introspection gtk-doc ]; propagatedBuildInputs = if gtkVersion == "2" @@ -39,14 +38,9 @@ stdenv.mkDerivation rec { then [ libindicator-gtk2 ] ++ optionals monoSupport [ mono gtk-sharp-2_0 ] else [ libindicator-gtk3 ]); - patches = [ - # Remove python2 from libappindicator. - (fetchpatch { - name = "no-python.patch"; - url = "https://src.fedoraproject.org/rpms/libappindicator/raw/8508f7a52437679fd95a79b4630373f08315f189/f/nopython.patch"; - sha256 = "18b1xzvwsbhhfpbzf5zragij4g79pa04y1dk6v5ci1wsjvii725s"; - }) - ]; + preAutoreconf = '' + gtkdocize + ''; configureFlags = [ "CFLAGS=-Wno-error" diff --git a/pkgs/development/libraries/libbytesize/default.nix b/pkgs/development/libraries/libbytesize/default.nix index ec14b2a6091..c93a59d462f 100644 --- a/pkgs/development/libraries/libbytesize/default.nix +++ b/pkgs/development/libraries/libbytesize/default.nix @@ -4,7 +4,7 @@ }: let - version = "2.3"; + version = "2.4"; in stdenv.mkDerivation rec { pname = "libbytesize"; inherit version; @@ -13,7 +13,7 @@ in stdenv.mkDerivation rec { owner = "storaged-project"; repo = "libbytesize"; rev = version; - sha256 = "1nrlmn63k0ix1yzn8v4lni5n5b4c0b6w9f33p1ig113ymmdvcc0h"; + sha256 = "1kq0hnw2yxjdmcrwvgp0x4j1arkka23k8vp2l6nqcw9lc15x18fp"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index c769006e0bf..fdd5e20640a 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -2,22 +2,13 @@ stdenv.mkDerivation rec { pname = "libevdev"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz"; - sha256 = "17pb5375njb1r05xmk0r57a2j986ihglh2n5nqcylbag4rj8mqg7"; + sha256 = "1jvsphdrs1i54ccjcn6ll26jy42am7h28lbsvwa6pmxgqm43qq7m"; }; - patches = [ - # Fix libevdev-python tests on aarch64 - # https://gitlab.freedesktop.org/libevdev/libevdev/merge_requests/63 - (fetchpatch { - url = "https://gitlab.freedesktop.org/libevdev/libevdev/commit/66113fe84f62bab3a672a336eb10b255d2aa5ce7.patch"; - sha256 = "gZKr/P+/OqU69IGslP8CQlcGuyzA/ulcm+nGwHdis58="; - }) - ]; - nativeBuildInputs = [ python3 ]; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix index ed9de3aaa4c..5edcb7e410f 100644 --- a/pkgs/development/libraries/libfilezilla/default.nix +++ b/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.23.0"; + version = "0.24.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "0lk84aw5ylrhpy26djdw3byhjbn9qrzx5k98r0i4nwfizckw3smd"; + sha256 = "1372i9f501kn8p1vkqdydaqvvi6lzxsnw2yzyxx5j4syqd4p0qa5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix index 1ff02a8709d..70043d1132d 100644 --- a/pkgs/development/libraries/libgdiplus/default.nix +++ b/pkgs/development/libraries/libgdiplus/default.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optional stdenv.cc.isClang "--host=${stdenv.hostPlatform.system}"; + enableParallelBuilding = true; + buildInputs = [ glib cairo fontconfig libtiff giflib libjpeg libpng libXrender libexif diff --git a/pkgs/development/libraries/libguestfs/default.nix b/pkgs/development/libraries/libguestfs/default.nix index 411ae0a3316..234e1164893 100644 --- a/pkgs/development/libraries/libguestfs/default.nix +++ b/pkgs/development/libraries/libguestfs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, autoreconfHook, makeWrapper , ncurses, cpio, gperf, cdrkit, flex, bison, qemu, pcre, augeas, libxml2 -, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex +, acl, libcap, libcap_ng, libconfig, systemd, fuse, yajl, libvirt, hivex, db , gmp, readline, file, numactl, xen, libapparmor, jansson , getopt, perlPackages, ocamlPackages , appliance ? null @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses cpio gperf jansson cdrkit flex bison qemu pcre augeas libxml2 acl libcap libcap_ng libconfig - systemd fuse yajl libvirt gmp readline file hivex + systemd fuse yajl libvirt gmp readline file hivex db numactl xen libapparmor getopt perlPackages.ModuleBuild ] ++ (with perlPackages; [ perl libintl_perl GetoptLong SysVirt ]) ++ (with ocamlPackages; [ ocaml findlib ocamlbuild ocaml_libvirt gettext-stub ounit ]) diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index cb8009011b6..576a2fec921 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -27,11 +27,11 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.15.6"; + version = "1.16.1"; src = fetchurl { url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "073z61dw46cyq0635a5n1mw7hw4qdgr58gbwwb3ds5v3d8hymvdf"; + sha256 = "e6fRru3RUWi7IdF+nmKKocJ5V5Y6Qjo/6jk4pQF1hTk="; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/development/libraries/libipt/default.nix b/pkgs/development/libraries/libipt/default.nix index cb4db488dc4..79ae927fc24 100644 --- a/pkgs/development/libraries/libipt/default.nix +++ b/pkgs/development/libraries/libipt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libipt"; - version = "2.0.1"; + version = "2.0.2"; src = fetchFromGitHub { owner = "intel"; repo = "libipt"; rev = "v${version}"; - sha256 = "19y1lk5z1rf8xmr08m8zrpjkgr5as83b96xyaxwn67m2wz58mpmh"; + sha256 = "095agnk7r2sq5yas6c1ri8fmsl55n4l5hkl6j5l397p9nxvxvrkc"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix index 16cdf416b24..5d065636a92 100644 --- a/pkgs/development/libraries/libmatroska/default.nix +++ b/pkgs/development/libraries/libmatroska/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libmatroska"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "Matroska-Org"; repo = "libmatroska"; rev = "release-${version}"; - sha256 = "1ws07ldcm5gy8z8p627vknqcb8iw1hxdby24g0xi6hbfy66p6qxs"; + sha256 = "0yhr9hhgljva1fx3b0r4s3wkkypdfgsysbl35a4g3krkbhaa9rsd"; }; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/development/libraries/libmbim/default.nix b/pkgs/development/libraries/libmbim/default.nix index 0cc911fbd01..0e9a3784f38 100644 --- a/pkgs/development/libraries/libmbim/default.nix +++ b/pkgs/development/libraries/libmbim/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "libmbim"; - version = "1.24.0"; + version = "1.24.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libmbim/${pname}-${version}.tar.xz"; - sha256 = "15hi1vq327drgi6h4dsi74lb7wg0sxd7mipa3irh5zgc7gn5qj9x"; + sha256 = "1r41d4yddp8rgccxrkz9vg5lbrj3dr5vy71d8igrr147k44qq69j"; }; outputs = [ "out" "dev" "man" ]; diff --git a/pkgs/development/libraries/libpipeline/default.nix b/pkgs/development/libraries/libpipeline/default.nix index bf80562a0b1..be3ab953c0a 100644 --- a/pkgs/development/libraries/libpipeline/default.nix +++ b/pkgs/development/libraries/libpipeline/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libpipeline-1.5.1"; + name = "libpipeline-1.5.3"; src = fetchurl { url = "mirror://savannah/libpipeline/${name}.tar.gz"; - sha256 = "0bwh5xz5f2czwb7f564jz1mp4znm8pldnvf65fs0hpw4gmmp0cyn"; + sha256 = "1c5dl017xil2ssb6a5vg927bnsbc9vymfgi9ahvqbb8gypx0igsx"; }; patches = stdenv.lib.optionals stdenv.isDarwin [ ./fix-on-osx.patch ]; diff --git a/pkgs/development/libraries/libpwquality/default.nix b/pkgs/development/libraries/libpwquality/default.nix index bd45cb529f1..5d83b137b8e 100644 --- a/pkgs/development/libraries/libpwquality/default.nix +++ b/pkgs/development/libraries/libpwquality/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3 }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, perl, cracklib, python3, fetchpatch }: stdenv.mkDerivation rec { pname = "libpwquality"; @@ -11,8 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0n4pjhm7wfivk0wizggaxq4y4mcxic876wcarjabkp5z9k14y36h"; }; - nativeBuildInputs = [ autoreconfHook perl ]; - buildInputs = [ cracklib python3 ]; + nativeBuildInputs = [ autoreconfHook perl python3 ]; + buildInputs = [ cracklib ]; + + patches = lib.optional stdenv.hostPlatform.isStatic [ + (fetchpatch { + name = "static-build.patch"; + url = "https://github.com/libpwquality/libpwquality/pull/40.patch"; + sha256 = "1ypccq437wxwgddd98cvd330jfm7jscdlzlyxgy05g6yzrr68xyk"; + }) + ]; + + configureFlags = lib.optional stdenv.hostPlatform.isStatic [ + # Python binding generates a shared library which are unavailable with musl build + "--disable-python-bindings" + ]; meta = with lib; { description = "Password quality checking and random password generation library"; diff --git a/pkgs/development/libraries/libqmi/default.nix b/pkgs/development/libraries/libqmi/default.nix index e577b403823..e8db7501534 100644 --- a/pkgs/development/libraries/libqmi/default.nix +++ b/pkgs/development/libraries/libqmi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libqmi"; - version = "1.26.0"; + version = "1.26.2"; src = fetchurl { url = "https://www.freedesktop.org/software/libqmi/${pname}-${version}.tar.xz"; - sha256 = "0h3fzmjlla7ib9wn4rv98bm40y2k28jcl29da4hjwyaqmvh2j13z"; + sha256 = "00vvvfq74awg6mk0si1cdv79f6z6wqx11h47nl78a1h7zsr6fd0k"; }; outputs = [ "out" "dev" "devdoc" ]; diff --git a/pkgs/development/libraries/libraw/default.nix b/pkgs/development/libraries/libraw/default.nix index 69169c7e9af..f20810801d9 100644 --- a/pkgs/development/libraries/libraw/default.nix +++ b/pkgs/development/libraries/libraw/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "libraw"; - version = "0.19.5"; + version = "0.20.0"; src = fetchurl { url = "https://www.libraw.org/data/LibRaw-${version}.tar.gz"; - sha256 = "1x827sh6vl8j3ll2ihkcr234y07f31hi1v7sl08jfw3irkbn58j0"; + sha256 = "18wlsvj6c1rv036ph3695kknpgzc3lk2ikgshy8417yfl8ykh2hz"; }; outputs = [ "out" "lib" "dev" "doc" ]; diff --git a/pkgs/development/libraries/librseq/default.nix b/pkgs/development/libraries/librseq/default.nix index d4619ba4320..4fd8bb7e33a 100644 --- a/pkgs/development/libraries/librseq/default.nix +++ b/pkgs/development/libraries/librseq/default.nix @@ -4,22 +4,29 @@ stdenv.mkDerivation rec { pname = "librseq"; - version = "0.1.0pre54_${builtins.substring 0 7 src.rev}"; + version = "0.1.0pre70_${builtins.substring 0 7 src.rev}"; src = fetchFromGitHub { owner = "compudj"; repo = "librseq"; - rev = "152600188dd214a0b2c6a8c66380e50c6ad27154"; - sha256 = "0mivjmgdkgrr6z2gz3k6q6wgnvyvw9xzy65f6ipvqva68sxhk0mx"; + rev = "d1cdec98d476b16ca5e2d9d7eabcf9f1c97e6111"; + sha256 = "0vgillrxc1knq591gjj99x2ws6q1xpm5dmfrhsxisngfpcnjr10v"; }; - outputs = [ "out" "dev" ]; + outputs = [ "out" "dev" "man" ]; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ linuxHeaders ]; + installTargets = [ "install" "install-man" ]; + + doCheck = true; separateDebugInfo = true; enableParallelBuilding = true; + patchPhase = '' + patchShebangs tests + ''; + # The share/ subdir only contains a doc/ with a README.md that just describes # how to compile the library, which clearly isn't very useful! So just get # rid of it anyway. diff --git a/pkgs/development/libraries/libseccomp/default.nix b/pkgs/development/libraries/libseccomp/default.nix index f3816c2ef0c..ebaf43e7681 100644 --- a/pkgs/development/libraries/libseccomp/default.nix +++ b/pkgs/development/libraries/libseccomp/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, getopt, makeWrapper, utillinux }: +{ stdenv, fetchurl, getopt, makeWrapper, utillinux, gperf }: stdenv.mkDerivation rec { pname = "libseccomp"; - version = "2.4.3"; + version = "2.5.0"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${version}/libseccomp-${version}.tar.gz"; - sha256 = "07crwxqzvl5k2b90a47ii9wgvi09s9hsy5b5jddw9ylp351d25fg"; + sha256 = "1wql62cg8f95cwpy057cl764nni9g4sdn5lqj68x22kjs8w71yhz"; }; outputs = [ "out" "lib" "dev" "man" ]; - buildInputs = [ getopt makeWrapper ]; + buildInputs = [ getopt makeWrapper gperf ]; patchPhase = '' patchShebangs . @@ -25,13 +25,14 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "High level library for the Linux Kernel seccomp filter"; - homepage = "https://github.com/seccomp/libseccomp"; - license = licenses.lgpl21; - platforms = platforms.linux; + homepage = "https://github.com/seccomp/libseccomp"; + license = licenses.lgpl21; + platforms = platforms.linux; badPlatforms = [ "alpha-linux" - "riscv64-linux" "riscv32-linux" - "sparc-linux" "sparc64-linux" + "riscv32-linux" + "sparc-linux" + "sparc64-linux" ]; maintainers = with maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix new file mode 100644 index 00000000000..ed19fab6d99 --- /dev/null +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + version = "1.3.0"; + pname = "libthreadar"; + + src = fetchurl { + url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; + sha256 = "0g2wxykawlsj6ma9slbbk0bxynqvmkwhaln2fiwc21x7nhjvpn9z"; + }; + + outputs = [ "out" "dev" ]; + + configureFlags = [ + "--disable-build-html" + ]; + + postInstall = '' + # Disable html help + rm -r "$out"/share + ''; + + meta = { + homepage = "http://libthreadar.sourceforge.net/"; + description = '' + Libthreadar is a C++ library providing a small set of C++ classes to manipulate + threads in a very simple and efficient way from your C++ code. + ''; + maintainers = with maintainers; [ izorkin ]; + license = licenses.lgpl3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/development/libraries/libunibreak/default.nix b/pkgs/development/libraries/libunibreak/default.nix index 8c6650df3cb..d30c84b52a2 100644 --- a/pkgs/development/libraries/libunibreak/default.nix +++ b/pkgs/development/libraries/libunibreak/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { version = "4.3"; src = let - rev_version = stdenv.lib.replaceStrings ["-"] ["_"] version; + rev_version = stdenv.lib.replaceStrings ["."] ["_"] version; in fetchFromGitHub { owner = "adah1972"; repo = pname; diff --git a/pkgs/development/libraries/libusb/fix-headers.patch b/pkgs/development/libraries/libusb-compat/fix-headers.patch index ea9cbc34978..ea9cbc34978 100644 --- a/pkgs/development/libraries/libusb/fix-headers.patch +++ b/pkgs/development/libraries/libusb-compat/fix-headers.patch diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index aca345e6bbf..cf73a64f675 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { "getaddrinfo_fail" "getaddrinfo_fail_sync" "threadpool_multiple_event_loops" # times out on slow machines "get_passwd" # passed on NixOS but failed on other Linuxes - "tcp_writealot" # times out sometimes + "tcp_writealot" "udp_multicast_join" "udp_multicast_join6" # times out sometimes ] ++ stdenv.lib.optionals stdenv.isDarwin [ # Sometimes: timeout (no output), failed uv_listen. Someone # should report these failures to libuv team. There tests should diff --git a/pkgs/development/libraries/libvmaf/default.nix b/pkgs/development/libraries/libvmaf/default.nix index 6c2b61cf113..9f7e84558f7 100644 --- a/pkgs/development/libraries/libvmaf/default.nix +++ b/pkgs/development/libraries/libvmaf/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, meson, ninja }: +{ stdenv, fetchFromGitHub, meson, ninja, nasm }: stdenv.mkDerivation rec { pname = "libvmaf"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "netflix"; repo = "vmaf"; rev = "v${version}"; - sha256 = "18w0z3w90fdbzsqaa4diwvq0xmvg0aiw4hi3aaa4pq0zgnb8g3mk"; + sha256 = "0x3l3g0hgrrjh3ygmxr1pd3rd5589s07c7id35nvj76ch5b7gy63"; }; sourceRoot = "source/libvmaf"; - nativeBuildInputs = [ meson ninja ]; + nativeBuildInputs = [ meson ninja nasm ]; outputs = [ "out" "dev" ]; doCheck = true; diff --git a/pkgs/development/libraries/linbox/default.nix b/pkgs/development/libraries/linbox/default.nix index 2217996acdb..09bd7e12091 100644 --- a/pkgs/development/libraries/linbox/default.nix +++ b/pkgs/development/libraries/linbox/default.nix @@ -39,18 +39,17 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" - ] ++ stdenv.lib.optionals stdenv.isx86_64 { + ] ++ stdenv.lib.optionals stdenv.isx86_64 [ # disable SIMD instructions (which are enabled *when available* by default) - default = [ "--disable-sse3" "--disable-ssse3" "--disable-sse41" "--disable-sse42" "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - westmere = [ "--disable-avx" "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - sandybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - ivybridge = [ "--disable-avx2" "--disable-fma" "--disable-fma4" ]; - haswell = [ "--disable-fma4" ]; - broadwell = [ "--disable-fma4" ]; - skylake = [ "--disable-fma4" ]; - skylake-avx512 = [ "--disable-fma4" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} - ++ stdenv.lib.optionals withSage [ + "--${if stdenv.hostPlatform.sse3Support then "enable" else "disable"}-sse3" + "--${if stdenv.hostPlatform.ssse3Support then "enable" else "disable"}-ssse3" + "--${if stdenv.hostPlatform.sse4_1Support then "enable" else "disable"}-sse41" + "--${if stdenv.hostPlatform.sse4_2Support then "enable" else "disable"}-sse42" + "--${if stdenv.hostPlatform.avxSupport then "enable" else "disable"}-avx" + "--${if stdenv.hostPlatform.avx2Support then "enable" else "disable"}-avx2" + "--${if stdenv.hostPlatform.fmaSupport then "enable" else "disable"}-fma" + "--${if stdenv.hostPlatform.fma4Support then "enable" else "disable"}-fma4" + ] ++ stdenv.lib.optionals withSage [ "--enable-sage" ]; diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index ee0094b263c..3b0be542976 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -32,7 +32,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.1.4"; + version = "20.1.6"; branch = versions.major version; in @@ -47,7 +47,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "1zlrczmmkcy42w332rfmlicihlnrxmkrnkpb21sl98725cf2f038"; + sha256 = "0g59gxbgr884a9xvg0fls10zkllyhz675zjvr50dcfmh2h0x9gi3"; }; prePatch = "patchShebangs ."; @@ -97,6 +97,12 @@ stdenv.mkDerivation { substituteInPlace meson.build --replace \ "find_program('pkg-config')" \ "find_program('${buildPackages.pkg-config.targetPrefix}pkg-config')" + + # The drirc.d directory cannot be installed to $drivers as that would cause a cyclic dependency: + substituteInPlace src/util/xmlconfig.c --replace \ + 'DATADIR "/drirc.d"' '"${placeholder "out"}/drirc.d"' + substituteInPlace src/util/meson.build --replace \ + "get_option('datadir')" "'${placeholder "out"}'" ''; outputs = [ "out" "dev" "drivers" ] ++ lib.optional enableOSMesa "osmesa"; @@ -104,6 +110,7 @@ stdenv.mkDerivation { # TODO: Figure out how to enable opencl without having a runtime dependency on clang mesonFlags = [ "--sysconfdir=/etc" + "--datadir=${placeholder "drivers"}/share" # Vendor files # Don't build in debug mode # https://gitlab.freedesktop.org/mesa/mesa/blob/master/docs/meson.html#L327 @@ -184,9 +191,6 @@ stdenv.mkDerivation { mv $out/lib/lib*_mesa* $drivers/lib fi - # move vendor files - mv $out/share/ $drivers/ - # Update search path used by glvnd for js in $drivers/share/glvnd/egl_vendor.d/*.json; do substituteInPlace "$js" --replace '"libEGL_' '"'"$drivers/lib/libEGL_" diff --git a/pkgs/development/libraries/mimalloc/default.nix b/pkgs/development/libraries/mimalloc/default.nix index bf6c5b1baf3..997fd2ab634 100644 --- a/pkgs/development/libraries/mimalloc/default.nix +++ b/pkgs/development/libraries/mimalloc/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { pname = "mimalloc"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "microsoft"; repo = pname; rev = "v${version}"; - sha256 = "0hk30adrm0s1g5flfaqfr3lc72y3hlmhqnyrqd7p0y91rsaw86b9"; + sha256 = "0b6ymi2a9is2q6n49dvlnjxknikj0rfff5ygbc4n7894h5mllvvr"; }; nativeBuildInputs = [ cmake ninja ]; diff --git a/pkgs/development/libraries/muparserx/default.nix b/pkgs/development/libraries/muparserx/default.nix new file mode 100644 index 00000000000..2c5bde316b4 --- /dev/null +++ b/pkgs/development/libraries/muparserx/default.nix @@ -0,0 +1,42 @@ +{ stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "muparserx"; + version = "4.0.8"; + + src = fetchFromGitHub { + owner = "beltoforion"; + repo = "muparserx"; + rev = "v${version}"; + sha256 = "097pkdffv0phr0345hy06mjm5pfy259z13plsvbxvcmds80wl48v"; + }; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + ]; + + doCheck = true; + checkPhase = '' + echo "***Muparserx self-test***" + echo "quit" | ./example > test_result.log + cat test_result.log + if grep -Fqi "failed" test_result.log; then + echo ">=1 muparserx tests failed" + exit 1 + else + echo -e "\nmuparserx tests succeeded" + fi + ''; + + meta = with stdenv.lib; { + description = "A C++ Library for Parsing Expressions with Strings, Complex Numbers, Vectors, Matrices and more."; + homepage = "https://beltoforion.de/en/muparserx/"; + license = licenses.bsd2; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix index 3294674e178..c9ccf63f889 100644 --- a/pkgs/development/libraries/nghttp2/default.nix +++ b/pkgs/development/libraries/nghttp2/default.nix @@ -27,11 +27,11 @@ let inherit (stdenv.lib) optional optionals optionalString; in stdenv.mkDerivation rec { pname = "nghttp2"; - version = "1.40.0"; + version = "1.41.0"; src = fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - sha256 = "0kyrgd4s2pq51ps5z385kw1hn62m8qp7c4h6im0g4ibrf89qwxc2"; + sha256 = "0h12wz72paxnj8l9vv2qfgfbmj20c6pz6xbilb7ns9zcwxwa0p34"; }; outputs = [ "bin" "out" "dev" "lib" ] diff --git a/pkgs/development/libraries/notify-sharp/default.nix b/pkgs/development/libraries/notify-sharp/default.nix index 403b0326bb5..58d35767d1e 100644 --- a/pkgs/development/libraries/notify-sharp/default.nix +++ b/pkgs/development/libraries/notify-sharp/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchFromGitHub, pkgconfig, autoreconfHook +{ stdenv, fetchFromGitLab, pkgconfig, autoreconfHook , mono, gtk-sharp-3_0, dbus-sharp-1_0, dbus-sharp-glib-1_0 }: stdenv.mkDerivation rec { pname = "notify-sharp"; version = "3.0.3"; - src = fetchFromGitHub { - owner = "GNOME"; + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "Archive"; repo = "notify-sharp"; rev = version; diff --git a/pkgs/development/libraries/nspr/default.nix b/pkgs/development/libraries/nspr/default.nix index 8a16803fd8b..d9b7ff13d1a 100644 --- a/pkgs/development/libraries/nspr/default.nix +++ b/pkgs/development/libraries/nspr/default.nix @@ -2,7 +2,7 @@ , CoreServices ? null , buildPackages }: -let version = "4.27"; in +let version = "4.28"; in stdenv.mkDerivation { pname = "nspr"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://mozilla/nspr/releases/v${version}/src/nspr-${version}.tar.gz"; - sha256 = "16z82qc1l4cqn66p59ai0dy9ycllywn4jlxhip1a605bns952jbd"; + sha256 = "0miv8ggil1xdywxw2sxaa05kqw7ahjgaimf7zjc6y2x8367grpk3"; }; patches = [ diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix index a504aae6a98..e378cd5554c 100644 --- a/pkgs/development/libraries/nss/default.nix +++ b/pkgs/development/libraries/nss/default.nix @@ -5,7 +5,7 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.55"; + version = "3.56"; underscoreVersion = builtins.replaceStrings ["."] ["_"] version; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; - sha256 = "0100hm7n1xrp144xy665z46s0wf1jpkqkncc6bk2w22snhyjwsgw"; + sha256 = "174f0ki2f8szkgv02jlsg2ci332sl9dabr2vcwnyjp1vxplf0xgq"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index b2beaee0bc9..1fb0f03d305 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "1.6"; + version = "1.6.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "0w2rgr3zgk7a3cql12dpddyhz2isyqqaks4vm8p45y426pd5m64b"; + sha256 = "1rdq2rb4f9xbk2a07fpqgvd9mx1r5gwpm0jr8rra815bzddam8zh"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/openexr/default.nix b/pkgs/development/libraries/openexr/default.nix index a1f5183da90..b33b284f45c 100644 --- a/pkgs/development/libraries/openexr/default.nix +++ b/pkgs/development/libraries/openexr/default.nix @@ -6,51 +6,31 @@ , ilmbase , fetchpatch , cmake -, libtool }: -let - non_glibc_fpstate_patch = - # Fix ilmbase/openexr using glibc-only fpstate. - # Found via https://git.alpinelinux.org/aports/tree/community/openexr/10-musl-_fpstate.patch?id=80d9611b7b8e406a554c6f511137e03ff26acbae, - # TODO Remove when https://github.com/AcademySoftwareFoundation/openexr/pull/798 is merged and available. - # Remove it from `ilmbase` as well then. - (fetchpatch { - name = "ilmbase-musl-_fpstate.patch.patch"; - url = "https://raw.githubusercontent.com/void-linux/void-packages/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch"; - sha256 = "0appzbs9pd6dia5pzxmrs9ww35shlxi329ks6lchwzw4f2a81arz"; - }); -in - stdenv.mkDerivation rec { pname = "openexr"; - version = "2.4.1"; + version = "2.5.3"; + + outputs = [ "bin" "dev" "out" "doc" ]; src = fetchFromGitHub { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "020gyl8zv83ag6gbcchmqiyx9rh2jca7j8n52zx1gk4rck7kwc01"; + sha256 = "xyYdRrwAYdnRZmErIK0tZspguqtrXvixO5+6nMDoOh8="; }; - outputs = [ "bin" "dev" "out" "doc" ]; - nativeBuildInputs = [ cmake libtool ]; - propagatedBuildInputs = [ ilmbase zlib ]; - - postPatch = - if (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.libc != "glibc") - then - '' - patch -p0 < ${non_glibc_fpstate_patch} - '' - else null; # `null` avoids rebuild on glibc - - enableParallelBuilding = true; + patches = [ + # Fix pkg-config paths + (fetchpatch { + url = "https://github.com/AcademySoftwareFoundation/openexr/commit/6442fb71a86c09fb0a8118b6dbd93bcec4883a3c.patch"; + sha256 = "bwD5WTKPT4DjOJDnPXIvT5hJJkH0b71Vo7qupWO9nPA="; + }) + ]; - passthru = { - # So that ilmbase (sharing the same source code) can re-use this patch. - inherit non_glibc_fpstate_patch; - }; + nativeBuildInputs = [ cmake ]; + propagatedBuildInputs = [ ilmbase zlib ]; meta = with stdenv.lib; { description = "A high dynamic-range (HDR) image file format"; diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index b60eb4fbaab..7f9c2dbf3ee 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, cyrus_sasl, db, groff, libtool }: stdenv.mkDerivation rec { - name = "openldap-2.4.50"; + name = "openldap-2.4.51"; src = fetchurl { url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${name}.tgz"; - sha256 = "1f46nlfwmys110j36sifm7ah8m8f3s10c3vaiikmmigmifapvdaw"; + sha256 = "0qmy2jkk6v9iqwrsdsn8s7lwzaplr01a2mgf21r6nl66lig7g47l"; }; # TODO: separate "out" and "bin" diff --git a/pkgs/development/libraries/openxr-loader/default.nix b/pkgs/development/libraries/openxr-loader/default.nix index 6c5f2af3a52..e03752872f9 100644 --- a/pkgs/development/libraries/openxr-loader/default.nix +++ b/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.10"; + version = "1.0.11"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "1igxyji2ab3gki1hlndvws1b2868mk1n3c4c3y5z0h3g713zw9ap"; + sha256 = "0f3x5h0hdjiqgjf5mzzlprbhrbyabxllrjmlzgc9fv5rgqyyphj5"; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/pkgs/development/libraries/p11-kit/default.nix b/pkgs/development/libraries/p11-kit/default.nix index 204de957f3d..3c82944baab 100644 --- a/pkgs/development/libraries/p11-kit/default.nix +++ b/pkgs/development/libraries/p11-kit/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "p11-kit"; - version = "0.23.20"; + version = "0.23.21"; src = fetchFromGitHub { owner = "p11-glue"; repo = pname; rev = version; - sha256 = "00xxhzgd7cpin9nzwrrzykvhjwqg5l45p0cq2gv68y3sxq2p9q6y"; + sha256 = "1w24brn8j3vwfp07p2hldw2ci06pk1cx1dvjk8jjxkccp20fk958"; }; outputs = [ "out" "dev"]; diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index 506c78aca8a..d1c39b42a9d 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -4,13 +4,13 @@ }: stdenv.mkDerivation rec { - name = "pcl-1.11.0"; + name = "pcl-1.11.1"; src = fetchFromGitHub { owner = "PointCloudLibrary"; repo = "pcl"; rev = name; - sha256 = "0nr3j71gh1v8x6wjr7a7xyr0438sw7vf621a5kbw4lmsxbj55k8g"; + sha256 = "1cli2rxqsk6nxp36p5mgvvahjz8hm4fb68yi8cf9nw4ygbcvcwb1"; }; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/pcre2/default.nix b/pkgs/development/libraries/pcre2/default.nix index d39b91355b9..b127eb0a31e 100644 --- a/pkgs/development/libraries/pcre2/default.nix +++ b/pkgs/development/libraries/pcre2/default.nix @@ -11,8 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-pcre2-16" "--enable-pcre2-32" - "--enable-jit" - ]; + ] ++ stdenv.lib.optional (!stdenv.hostPlatform.isRiscV) "--enable-jit"; outputs = [ "bin" "dev" "out" "doc" "man" "devdoc" ]; diff --git a/pkgs/development/libraries/plasma-wayland-protocols/default.nix b/pkgs/development/libraries/plasma-wayland-protocols/default.nix new file mode 100644 index 00000000000..a84c3518c4a --- /dev/null +++ b/pkgs/development/libraries/plasma-wayland-protocols/default.nix @@ -0,0 +1,24 @@ +{ mkDerivation, fetchurl, lib +, extra-cmake-modules +, qtbase +}: + +mkDerivation rec { + pname = "plasma-wayland-protocols"; + version = "1.1.1"; + + src = fetchurl { + url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "sha256-xUkzg9EVFxw0NeqaIbOWaGBjKoRFRP+sj1SJBDalHTg="; + }; + + nativeBuildInputs = [ extra-cmake-modules ]; + + buildInputs = [ qtbase ]; + + meta = { + description = "Plasma Wayland Protocols"; + license = lib.licenses.lgpl21Plus; + platforms = qtbase.meta.platforms; + }; +} diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index cd39e61a0cb..074868251d0 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "poppler-${suffix}-${version}"; - version = "0.90.1"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! + version = "20.08.0"; # beware: updates often break cups-filters build, check texlive and scribusUnstable too! src = fetchurl { url = "${meta.homepage}/poppler-${version}.tar.xz"; - sha256 = "mE2C5y6RQY0oCIUpjIvchVov2SZl/VKhNFsnI14MccQ="; + sha256 = "19gchq6fpa00ic5rn1zmjzxx85cif4hbdrsjcfd2aqxz9gqgwrdf"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/protobuf/3.13.nix b/pkgs/development/libraries/protobuf/3.13.nix new file mode 100644 index 00000000000..3e3740a7c50 --- /dev/null +++ b/pkgs/development/libraries/protobuf/3.13.nix @@ -0,0 +1,6 @@ +{ callPackage, ... }: + +callPackage ./generic-v3.nix { + version = "3.13.0"; + sha256 = "1nqsvi2yfr93kiwlinz8z7c68ilg1j75b2vcpzxzvripxx5h6xhd"; +} diff --git a/pkgs/development/libraries/qca-qt5/default.nix b/pkgs/development/libraries/qca-qt5/default.nix index 77f4e1b9053..06de3f7c569 100644 --- a/pkgs/development/libraries/qca-qt5/default.nix +++ b/pkgs/development/libraries/qca-qt5/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "qca-qt5"; - version = "2.2.1"; + version = "2.3.1"; src = fetchurl { url = "http://download.kde.org/stable/qca/${version}/qca-${version}.tar.xz"; - sha256 = "00kv1vsrc8fp556hm8s6yw3240vx3l4067q6vfxrb3gdwgcd45np"; + sha256 = "sha256-wThREJq+/EYjNwmJ+uOnRb9rGss8KhOolYU5gj6XTks="; }; buildInputs = [ openssl qtbase ]; diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix index e89c0a8b403..fcceb6d6cf2 100644 --- a/pkgs/development/libraries/qt-5/5.12/default.nix +++ b/pkgs/development/libraries/qt-5/5.12/default.nix @@ -101,11 +101,17 @@ let ./qtwebengine-darwin-no-platform-check.patch ./qtwebengine-darwin-fix-failed-static-assertion.patch ]; - qtwebkit = [ ./qtwebkit.patch ] - ++ optionals stdenv.isDarwin [ - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; + qtwebkit = [ + (fetchpatch { + name = "qtwebkit-bison-3.7-build.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; + sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; + }) + ./qtwebkit.patch + ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; qttools = [ ./qttools.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix index 1a90c610a5b..469157a5f72 100644 --- a/pkgs/development/libraries/qt-5/5.14/default.nix +++ b/pkgs/development/libraries/qt-5/5.14/default.nix @@ -72,11 +72,17 @@ let qtserialport = [ ./qtserialport.patch ]; qtwebengine = [ ] ++ optional stdenv.isDarwin ./qtwebengine-darwin-no-platform-check.patch; - qtwebkit = [ ./qtwebkit.patch ] - ++ optionals stdenv.isDarwin [ - ./qtwebkit-darwin-no-readline.patch - ./qtwebkit-darwin-no-qos-classes.patch - ]; + qtwebkit = [ + (fetchpatch { + name = "qtwebkit-bison-3.7-build.patch"; + url = "https://github.com/qtwebkit/qtwebkit/commit/d92b11fea65364fefa700249bd3340e0cd4c5b31.patch"; + sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n"; + }) + ./qtwebkit.patch + ] ++ optionals stdenv.isDarwin [ + ./qtwebkit-darwin-no-readline.patch + ./qtwebkit-darwin-no-qos-classes.patch + ]; qttools = [ ./qttools.patch ]; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index a4c12793abb..3cbcaaacefb 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -8,7 +8,7 @@ darwin, libiconv, dbus, fontconfig, freetype, glib, harfbuzz, icu, libX11, libXcomposite, - libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libtiff, + libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng, libxcb, libxkbcommon, libxml2, libxslt, openssl, pcre16, pcre2, sqlite, udev, xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilrenderutil, xcbutilwm, zlib, @@ -48,7 +48,7 @@ stdenv.mkDerivation { harfbuzz icu # Image formats - libjpeg libpng libtiff + libjpeg libpng (if compareVersion "5.9.0" < 0 then pcre16 else pcre2) ] ++ ( @@ -255,18 +255,18 @@ stdenv.mkDerivation { "-no-warnings-are-errors" ] ++ ( - if (!stdenv.hostPlatform.isx86_64) - then [ "-no-sse2" ] - else lib.optionals (compareVersion "5.9.0" >= 0) { - default = [ "-sse2" "-no-sse3" "-no-ssse3" "-no-sse4.1" "-no-sse4.2" "-no-avx" "-no-avx2" ]; - westmere = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-no-avx" "-no-avx2" ]; - sandybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - ivybridge = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-no-avx2" ]; - haswell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - broadwell = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - skylake = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - skylake-avx512 = [ "-sse2" "-sse3" "-ssse3" "-sse4.1" "-sse4.2" "-avx" "-avx2" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or "default"} + if (!stdenv.hostPlatform.isx86_64) then [ + "-no-sse2" + ] else if (compareVersion "5.9.0" >= 0) then [ + "-sse2" + "${if stdenv.hostPlatform.sse3Support then "" else "-no"}-sse3" + "${if stdenv.hostPlatform.ssse3Support then "" else "-no"}-ssse3" + "${if stdenv.hostPlatform.sse4_1Support then "" else "-no"}-sse4.1" + "${if stdenv.hostPlatform.sse4_2Support then "" else "-no"}-sse4.2" + "${if stdenv.hostPlatform.avxSupport then "" else "-no"}-avx" + "${if stdenv.hostPlatform.avx2Support then "" else "-no"}-avx2" + ] else [ + ] ) ++ [ "-no-mips_dsp" diff --git a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix index 1a7726070be..9c80507b7c7 100644 --- a/pkgs/development/libraries/qt-5/modules/qtimageformats.nix +++ b/pkgs/development/libraries/qt-5/modules/qtimageformats.nix @@ -1,6 +1,7 @@ -{ qtModule, qtbase }: +{ qtModule, qtbase, libtiff }: qtModule { name = "qtimageformats"; qtInputs = [ qtbase ]; + propagatedBuildInputs = [ libtiff ]; } diff --git a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix index c0db5915b94..049b0349a4f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwebengine.nix @@ -15,7 +15,7 @@ , gn , cups, darwin, openbsm, runCommand, xcbuild, writeScriptBin , ffmpeg_3 ? null -, lib, stdenv +, lib, stdenv, fetchpatch }: with stdenv.lib; @@ -38,6 +38,17 @@ qtModule { # which cannot be set at the same time as -Wformat-security hardeningDisable = [ "format" ]; + patches = [ + # Fix build with bison-3.7: https://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?id=1a53f599 + (fetchpatch { + name = "qtwebengine-bison-3.7-build.patch"; + url = "https://code.qt.io/cgit/qt/qtwebengine-chromium.git/patch/?id=1a53f599"; + sha256 = "1nqpyn5fq37q7i9nasag6i14lnz0d7sld5ikqhlm8qwq9d7gbmjy"; + stripLen = 1; + extraPrefix = "src/3rdparty/"; + }) + ]; + postPatch = # Patch Chromium build tools '' @@ -68,7 +79,7 @@ qtModule { '' # Patch library paths in Chromium sources + optionalString (!stdenv.isDarwin) '' - sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${systemd.lib}/lib/\1!' \ + sed -i -e '/lib_loader.*Load/s!"\(libudev\.so\)!"${lib.getLib systemd}/lib/\1!' \ src/3rdparty/chromium/device/udev_linux/udev?_loader.cc sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index 7539d45627f..308fadbdfd8 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rdkafka"; - version = "1.4.2"; + version = "1.4.4"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "05mgrdzacn9kdpr68r5j0cvsvl54s52glnsc1ww9rcxx6p7hq1ly"; + sha256 = "0y4m29wyvhhxb7fap9z07zwgcqlr4ifwynf8a7yp5ldjpzfzxpix"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index 8bf3200e295..6aed49d65e3 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { - name = "readosm-1.1.0"; + name = "readosm-1.1.0a"; src = fetchurl { url = "https://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; - sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; + sha256 = "0igif2bxf4dr82glxz9gyx5mmni0r2dsnx9p9k6pxv3c4lfhaz6v"; }; buildInputs = [ expat zlib geos libspatialite ]; diff --git a/pkgs/development/libraries/redkite/default.nix b/pkgs/development/libraries/redkite/default.nix index 63e5eea25a4..be6bf0d7fa0 100644 --- a/pkgs/development/libraries/redkite/default.nix +++ b/pkgs/development/libraries/redkite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "redkite"; - version = "1.0.1"; + version = "1.0.3"; src = fetchFromGitLab { owner = "iurie-sw"; repo = pname; rev = "v${version}"; - sha256 = "1qd4r7ps0fg2m1vx3j48chfdh2c5909j4f9wip4af59inrid4w6a"; + sha256 = "1m2db7c791fi33snkjwnvlxapmf879g5r8azlkx7sr6vp2s0jq2k"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/science/math/arpack/default.nix b/pkgs/development/libraries/science/math/arpack/default.nix index 0829557d0f3..02d51f0c419 100644 --- a/pkgs/development/libraries/science/math/arpack/default.nix +++ b/pkgs/development/libraries/science/math/arpack/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation { ]; preCheck = if stdenv.isDarwin then '' - export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib + export DYLD_LIBRARY_PATH=$DYLD_LIBRARY_PATH''${DYLD_LIBRARY_PATH:+:}`pwd`/lib:${blas}/lib:${lapack}/lib '' else '' export LD_LIBRARY_PATH=$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}`pwd`/lib '' + '' diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index 765d634a91f..9495366eaaa 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -1,4 +1,4 @@ -{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2 }: +{ callPackage, cudatoolkit_7, cudatoolkit_7_5, cudatoolkit_8, cudatoolkit_9_0, cudatoolkit_9_1, cudatoolkit_9_2, cudatoolkit_10_0, cudatoolkit_10_1, cudatoolkit_10_2, cudatoolkit_11_0 }: let generic = args: callPackage (import ./generic.nix (removeAttrs args ["cudatoolkit"])) { @@ -80,4 +80,13 @@ in rec { }; cudnn_cudatoolkit_10 = cudnn_cudatoolkit_10_1; + + cudnn_cudatoolkit_11_0 = generic rec { + version = "8.0.2"; + cudatoolkit = cudatoolkit_11_0; + srcName = "cudnn-${cudatoolkit.majorVersion}-linux-x64-v8.0.2.39.tgz"; + sha256 = "0ib3v3bgcdxarqapkxngw1nwl0c2a7zz392ns7w9ipcficl4cbv7"; + }; + + cudnn_cudatoolkit_11 = cudnn_cudatoolkit_11_0; } diff --git a/pkgs/development/libraries/science/math/cudnn/generic.nix b/pkgs/development/libraries/science/math/cudnn/generic.nix index 5a17e807bd4..381920682a4 100644 --- a/pkgs/development/libraries/science/math/cudnn/generic.nix +++ b/pkgs/development/libraries/science/math/cudnn/generic.nix @@ -32,6 +32,13 @@ stdenv.mkDerivation { mkdir -p $out cp -a include $out/include cp -a lib64 $out/lib64 + + ${lib.optionalString (lib.versionAtLeast version "8") '' + # patchelf fails on libcudnn_cnn_infer due to it being too big. + # I'm hoping it's not needed for most programs. + # (https://github.com/NixOS/patchelf/issues/222) + rm -f $out/lib64/libcudnn_cnn_infer* + ''} ''; # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found. diff --git a/pkgs/development/libraries/science/math/libtorch/bin.nix b/pkgs/development/libraries/science/math/libtorch/bin.nix new file mode 100644 index 00000000000..3ae46270586 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/bin.nix @@ -0,0 +1,111 @@ +{ callPackage +, stdenv +, fetchzip +, lib + +, addOpenGLRunpath +, patchelf +, fixDarwinDylibNames + +, cudaSupport +, nvidia_x11 +}: + +let + version = "1.6.0"; + device = if cudaSupport then "cuda" else "cpu"; + srcs = import ./binary-hashes.nix; + unavailable = throw "libtorch is not available for this platform"; +in stdenv.mkDerivation { + inherit version; + pname = "libtorch"; + + src = fetchzip srcs."${stdenv.targetPlatform.system}-${device}" or unavailable; + + nativeBuildInputs = + if stdenv.isDarwin then [ fixDarwinDylibNames ] + else [ addOpenGLRunpath patchelf ] + ++ stdenv.lib.optionals cudaSupport [ addOpenGLRunpath ]; + + buildInputs = [ + stdenv.cc.cc + ] ++ lib.optionals cudaSupport [ nvidia_x11 ]; + + dontBuild = true; + dontConfigure = true; + dontStrip = true; + + installPhase = '' + # Copy headers and CMake files. + install -Dm755 -t $dev/lib lib/*.a + cp -r include $dev + cp -r share $dev + + install -Dm755 -t $out/lib lib/*${stdenv.hostPlatform.extensions.sharedLibrary}* + + # We do not care about Java support... + rm -f $out/lib/lib*jni* 2> /dev/null || true + ''; + + postFixup = let + libPaths = [ stdenv.cc.cc.lib ] + ++ stdenv.lib.optionals cudaSupport [ nvidia_x11 ]; + rpath = stdenv.lib.makeLibraryPath libPaths; + in stdenv.lib.optionalString stdenv.isLinux '' + find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + echo "setting rpath for $lib..." + patchelf --set-rpath "${rpath}:$out/lib" "$lib" + ${lib.optionalString cudaSupport '' + addOpenGLRunpath "$lib" + ''} + done + '' + stdenv.lib.optionalString stdenv.isDarwin '' + install_name_tool -change @rpath/libshm.dylib $out/lib/libshm.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libtorch_python.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_python.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libtorch_cpu.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_cpu.dylib + install_name_tool -change @rpath/libtensorpipe.dylib $out/lib/libtensorpipe.dylib $out/lib/libtorch_cpu.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_observers.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_observers.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_module_test_dynamic.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libcaffe2_detectron_ops.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libcaffe2_detectron_ops.dylib + + install_name_tool -change @rpath/libc10.dylib $out/lib/libc10.dylib $out/lib/libshm.dylib + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libshm.dylib + install_name_tool -change @rpath/libtorch.dylib $out/lib/libtorch.dylib $out/lib/libshm.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libshm.dylib + + install_name_tool -change @rpath/libiomp5.dylib $out/lib/libiomp5.dylib $out/lib/libtorch_global_deps.dylib + install_name_tool -change @rpath/libtorch_cpu.dylib $out/lib/libtorch_cpu.dylib $out/lib/libtorch_global_deps.dylib + ''; + + outputs = [ "out" "dev" ]; + + passthru.tests = callPackage ./test { }; + + meta = with stdenv.lib; { + description = "C++ API of the PyTorch machine learning framework"; + homepage = "https://pytorch.org/"; + license = licenses.unfree; # Includes CUDA and Intel MKL. + platforms = with platforms; linux ++ darwin; + }; +} diff --git a/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix new file mode 100644 index 00000000000..92a2e05e0ba --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/binary-hashes.nix @@ -0,0 +1,14 @@ +{ + x86_64-darwin-cpu = { + url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.6.0.zip"; + sha256 = "0d4n7la31qzl4s9pwvm07la7q6lhcwiww0yjpfz3kw6nvx84p22r"; + }; + x86_64-linux-cpu = { + url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.6.0%2Bcpu.zip"; + sha256 = "1975b4zvyihzh89vnwspw0vf9qr05sxj8939vcrlmv3gzvdspcxz"; + }; + x86_64-linux-cuda = { + url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip"; + sha256 = "127qnfyi1faqbm40sbnsyqxjhrqj82bzwqyz7c1hs2bm0zgrrpya"; + }; +} diff --git a/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt b/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt new file mode 100644 index 00000000000..b302449ef77 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/test/CMakeLists.txt @@ -0,0 +1,4 @@ +find_package(Torch REQUIRED) +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TORCH_CXX_FLAGS}") +add_executable(test test.cpp) +target_link_libraries(test "${TORCH_LIBRARIES}") diff --git a/pkgs/development/libraries/science/math/libtorch/test/default.nix b/pkgs/development/libraries/science/math/libtorch/test/default.nix new file mode 100644 index 00000000000..d661ec28db9 --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/test/default.nix @@ -0,0 +1,26 @@ +{ stdenv, cmake, libtorch-bin, symlinkJoin }: + +stdenv.mkDerivation { + pname = "libtorch-test"; + version = libtorch-bin.version; + + src = ./.; + + postPatch = '' + cat CMakeLists.txt + ''; + + makeFlags = [ "VERBOSE=1" ]; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ libtorch-bin ]; + + installPhase = '' + touch $out + ''; + + checkPhase = '' + ./test + ''; +} diff --git a/pkgs/development/libraries/science/math/libtorch/test/test.cpp b/pkgs/development/libraries/science/math/libtorch/test/test.cpp new file mode 100644 index 00000000000..5537724ce5f --- /dev/null +++ b/pkgs/development/libraries/science/math/libtorch/test/test.cpp @@ -0,0 +1,7 @@ +#include <torch/torch.h> +#include <iostream> + +int main() { + torch::Tensor tensor = torch::eye(3); + std::cout << tensor << std::endl; +} diff --git a/pkgs/development/libraries/science/math/magma/default.nix b/pkgs/development/libraries/science/math/magma/default.nix index dbe162c60b3..38700c963bf 100644 --- a/pkgs/development/libraries/science/math/magma/default.nix +++ b/pkgs/development/libraries/science/math/magma/default.nix @@ -1,19 +1,21 @@ -{ stdenv, fetchurl, cmake, gfortran, cudatoolkit, libpthreadstubs, lapack, blas }: +{ stdenv, fetchurl, cmake, gfortran, ninja, cudatoolkit, libpthreadstubs, lapack, blas }: with stdenv.lib; -let version = "2.5.0"; +let version = "2.5.3"; in stdenv.mkDerivation { pname = "magma"; inherit version; src = fetchurl { url = "https://icl.cs.utk.edu/projectsfiles/magma/downloads/magma-${version}.tar.gz"; - sha256 = "0czspk93cv1fy37zyrrc9k306q4yzfxkhy1y4lj937dx8rz5rm2g"; + sha256 = "1xjy3irdx0w1zyhvn4x47zni5fwsh6z97xd4yqldz8zrm5lx40n6"; name = "magma-${version}.tar.gz"; }; - buildInputs = [ gfortran cudatoolkit libpthreadstubs cmake lapack blas ]; + nativeBuildInputs = [ gfortran cmake ninja ]; + + buildInputs = [ cudatoolkit libpthreadstubs lapack blas ]; doCheck = false; @@ -32,7 +34,7 @@ in stdenv.mkDerivation { mkdir -p $out/lib/pkgconfig cp -a ../include/*.h $out/include #cp -a sparse-iter/include/*.h $out/include - cp -a lib/*.a $out/lib + cp -a lib/*.so $out/lib cat ../lib/pkgconfig/magma.pc.in | \ sed -e s:@INSTALL_PREFIX@:"$out": | \ sed -e s:@CFLAGS@:"-I$out/include": | \ diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 5f38d45fc4d..eb194c0e9e4 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "nccl-${version}-cuda-${cudatoolkit.majorVersion}"; - version = "2.4.8-1"; + version = "2.7.8-1"; src = fetchFromGitHub { owner = "NVIDIA"; repo = "nccl"; rev = "v${version}"; - sha256 = "05m66y64rgsdyybvjybhy6clikwv438b1m484ikai78fb2b7mvyq"; + sha256 = "0xxiwaw239dc9g015fka3k1nvm5zyl00dzgxnwzkang61dys9wln"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index e3594d72eda..82a0d063570 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.13.3"; + version = "3.13.4"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "0fhydhws57hvxv7mkldlicm2xmmnb9f4nhd8n16idxg4snck38vz"; + sha256 = "1n2paqw5c0ja392s1qhp7q2ypwav8s5drxxz2w5m2cn31vbspy1c"; }; nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; diff --git a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix index 5244ccdb281..1c910a4f75b 100644 --- a/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix +++ b/pkgs/development/libraries/science/math/suitesparse-graphblas/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "suitesparse-graphblas"; - version = "3.3.0"; + version = "3.3.3"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "DrTimothyAldenDavis"; repo = "GraphBLAS"; rev = "v${version}"; - sha256 = "1fin9741ild3dv7c9gk07kpizsnnx17ar9cv9lny8vl47pms940h"; + sha256 = "1nmygb2yny0mdqp0mc6760gbxklq1jjm0c6s39qkdwzf3n9f8j7p"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/sope/default.nix b/pkgs/development/libraries/sope/default.nix index 9d0b3bf76b3..2c73ff24df2 100644 --- a/pkgs/development/libraries/sope/default.nix +++ b/pkgs/development/libraries/sope/default.nix @@ -1,13 +1,13 @@ { gnustep, lib, fetchFromGitHub , libxml2, openssl_1_1 , openldap, mysql, libmysqlclient, postgresql }: with lib; gnustep.stdenv.mkDerivation rec { pname = "sope"; - version = "4.3.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOPE-${version}"; - sha256 = "0ny1ihx38gd25w8f3dfybyswvyjfljvb2fhfmkajgg6hhjrkfar2"; + sha256 = "sha256-7NM9wcyHDSVmjjqu489Ff3iJgl9VM+UBF3XYWoiHHTg="; }; nativeBuildInputs = [ gnustep.make ]; diff --git a/pkgs/development/libraries/sparsehash/default.nix b/pkgs/development/libraries/sparsehash/default.nix index 6845c616e9c..6007560a11f 100644 --- a/pkgs/development/libraries/sparsehash/default.nix +++ b/pkgs/development/libraries/sparsehash/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "sparsehash-2.0.3"; + name = "sparsehash-2.0.4"; src = fetchFromGitHub { owner = "sparsehash"; repo = "sparsehash"; rev = name; - sha256 = "0m3f0cnpnpf6aak52wn8xbrrdw8p0yhq8csgc8nlvf9zp8c402na"; + sha256 = "1pf1cjvcjdmb9cd6gcazz64x0cd2ndpwh6ql2hqpypjv725xwxy7"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/speechd/default.nix b/pkgs/development/libraries/speechd/default.nix index eab6c1d446c..fbf399cb246 100644 --- a/pkgs/development/libraries/speechd/default.nix +++ b/pkgs/development/libraries/speechd/default.nix @@ -39,11 +39,11 @@ let throw "You need to enable at least one output module."; in stdenv.mkDerivation rec { pname = "speech-dispatcher"; - version = "0.9.1"; + version = "0.10.1"; src = fetchurl { url = "https://github.com/brailcom/speechd/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "16bg52hnkrsrs7kgbzanb34b9zb6fqxwj0a9bmsxmj1skkil1h1p"; + sha256 = "0j2lfzkmbsxrrgjw6arzvnfd4jn5pxab28xsk2djssr2ydb9x309"; }; patches = [ diff --git a/pkgs/development/libraries/sqlite/analyzer.nix b/pkgs/development/libraries/sqlite/analyzer.nix index 5c65c84e54d..d0100edd345 100644 --- a/pkgs/development/libraries/sqlite/analyzer.nix +++ b/pkgs/development/libraries/sqlite/analyzer.nix @@ -6,11 +6,11 @@ in stdenv.mkDerivation rec { pname = "sqlite-analyzer"; - version = "3.32.3"; + version = "3.33.0"; src = assert version == sqlite.version; fetchurl { url = "https://sqlite.org/2020/sqlite-src-${archiveVersion version}.zip"; - sha256 = "1fgmslzf013ry3a7g2vms7zyg24gs53gfj308r6ki4inbn3g04lk"; + sha256 = "1f09srlrmcab1sf8j2d89s2kvknlbxk7mbsiwpndw9mall27dgwh"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index cd0042e722a..3647516c803 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -10,12 +10,12 @@ in stdenv.mkDerivation rec { pname = "sqlite"; - version = "3.32.3"; + version = "3.33.0"; # NB! Make sure to update analyzer.nix src (in the same directory). src = fetchurl { url = "https://sqlite.org/2020/sqlite-autoconf-${archiveVersion version}.tar.gz"; - sha256 = "0rlbaq177gcgk5dswd3akbhv2nvvzljrbhgy18hklbhw7h90f5d3"; + sha256 = "05dvdfaxd552gj5p7k0i72sfam7lykaw1g2pfn52jnppqx42qshh"; }; outputs = [ "bin" "dev" "out" ]; diff --git a/pkgs/development/libraries/tk/generic.nix b/pkgs/development/libraries/tk/generic.nix index 745be0be922..1cbf4026cb8 100644 --- a/pkgs/development/libraries/tk/generic.nix +++ b/pkgs/development/libraries/tk/generic.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { postInstall = '' ln -s $out/bin/wish* $out/bin/wish cp ../{unix,generic}/*.h $out/include - ln -s $out/lib/libtk${tcl.release}.so $out/lib/libtk.so + ln -s $out/lib/libtk${tcl.release}${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libtk${stdenv.hostPlatform.extensions.sharedLibrary} '' + stdenv.lib.optionalString (stdenv.isDarwin) '' cp ../macosx/*.h $out/include diff --git a/pkgs/development/libraries/utf8proc/default.nix b/pkgs/development/libraries/utf8proc/default.nix index 00c09179f1f..e08aea2e1ee 100644 --- a/pkgs/development/libraries/utf8proc/default.nix +++ b/pkgs/development/libraries/utf8proc/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { "-DBUILD_SHARED_LIBS=ON" ]; + # the pkg-config file is not created in the cmake installation + # process, so we use the Makefile and install it manually + # see https://github.com/JuliaStrings/utf8proc/issues/198 + preConfigure = "make libutf8proc.pc prefix=$out"; + postInstall = "install -Dm644 ../libutf8proc.pc -t $out/lib/pkgconfig/"; + meta = with stdenv.lib; { description = "A clean C library for processing UTF-8 Unicode data"; homepage = "https://juliastrings.github.io/utf8proc/"; diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix index e22396f8aa3..2921719e755 100644 --- a/pkgs/development/libraries/vid-stab/default.nix +++ b/pkgs/development/libraries/vid-stab/default.nix @@ -1,22 +1,25 @@ -{ stdenv, fetchurl, cmake }: +{ stdenv, fetchFromGitHub, cmake, openmp }: stdenv.mkDerivation rec { - pname = "vid-stab"; - version = "0.98b"; - - src = fetchurl { - url = "https://github.com/georgmartius/vid.stab/archive/release-${version}.tar.gz"; - sha256 = "09fh6xbd1f5xp3il3dpvr87skmnp2mm2hfmg4s9rvj4y8zvhn3sk"; + pname = "vid.stab"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "georgmartius"; + repo = pname; + rev = "v${version}"; + sha256 = "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38"; }; nativeBuildInputs = [ cmake ]; - + + buildInputs = stdenv.lib.optionals stdenv.cc.isClang [ openmp ]; + meta = with stdenv.lib; { description = "Video stabilization library"; - homepage = "http://public.hronopik.de/vid.stab/"; - license = licenses.gpl2; + homepage = "http://public.hronopik.de/vid.stab/"; + license = licenses.gpl2Plus; maintainers = with maintainers; [ codyopel ]; - platforms = platforms.all; + platforms = platforms.all; }; } - diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix index d13cdaff8c6..2b3414df1a4 100644 --- a/pkgs/development/libraries/wcslib/default.nix +++ b/pkgs/development/libraries/wcslib/default.nix @@ -1,14 +1,14 @@ { fetchurl, stdenv, flex }: stdenv.mkDerivation rec { - version = "7.3"; + version = "7.3.1"; pname = "wcslib"; buildInputs = [ flex ]; src = fetchurl { url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${pname}-${version}.tar.bz2"; - sha256 ="0q99k61l2zh6irzkd5195aama37mlm0nivamz6j6r8l2ad1cy0ab"; + sha256 ="0p0bp3jll9v2094a8908vk82m7j7qkjqzkngm1r9qj1v6l6j5z6c"; }; prePatch = '' diff --git a/pkgs/development/libraries/webkit2-sharp/default.nix b/pkgs/development/libraries/webkit2-sharp/default.nix new file mode 100644 index 00000000000..b8a476b3b33 --- /dev/null +++ b/pkgs/development/libraries/webkit2-sharp/default.nix @@ -0,0 +1,49 @@ +{ + stdenv, + autoreconfHook, + fetchFromGitHub, + gtk-sharp-3_0, + lib, + libxslt, + mono, + pkg-config, + webkitgtk, +}: + +stdenv.mkDerivation rec { + pname = "webkit2-sharp"; + version = "a59fd76dd730432c76b12ee6347ea66567107ab9"; + + src = fetchFromGitHub { + owner = "hbons"; + repo = "webkit2-sharp"; + rev = version; + sha256 = "sha256:0a7vx81zvzn2wq4q2mqrxvlps1mqk28lm1gpfndqryxm4iiw28vc"; + }; + + nativeBuildInputs = [ + autoreconfHook + libxslt + mono + pkg-config + ]; + + buildInputs = [ + gtk-sharp-3_0 + webkitgtk + ]; + + ac_cv_path_MONODOCER = "no"; + installFlagsArray = ["GAPIXMLDIR=/tmp/gapixml"]; + + passthru = { + inherit webkitgtk; + }; + + meta = { + description = "C# bindings for WebKit 2 with GTK+ 3"; + homepage = "https://github.com/hbons/webkit2-sharp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kevincox ]; + }; +} diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix index 2815520f517..30fc90ec8c0 100644 --- a/pkgs/development/libraries/wolfssl/default.nix +++ b/pkgs/development/libraries/wolfssl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "wolfssl"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "wolfSSL"; repo = "wolfssl"; rev = "v${version}-stable"; - sha256 = "1bgkxqgxwa5dvi7fkna64wpcs552f3yxvs6fh6d32v7vg88vpfx9"; + sha256 = "138ppnwkqkfi7nnqpd0b93dqaph72ma65m9286bz2qzlis1x8r0v"; }; configureFlags = [ "--enable-all" ]; diff --git a/pkgs/development/libraries/wxsqlite3/default.nix b/pkgs/development/libraries/wxsqlite3/default.nix index 9bea7f5e848..9d80e5de449 100644 --- a/pkgs/development/libraries/wxsqlite3/default.nix +++ b/pkgs/development/libraries/wxsqlite3/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "wxsqlite3"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "utelle"; repo = "wxsqlite3"; rev = "v${version}"; - sha256 = "0090f7r3blks18vifkna4l890fwaya58ajh9qblbw9065zj5hrm3"; + sha256 = "0snsysfrr5h66mybls8r8k781v732dlfn4jdnmk348jgvny275fj"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 98cf0d58479..deb7d19c0de 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, gstreamer, gst-plugins-base, GConf, libX11, cairo +, libX11, cairo , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sha256 = "1l1w4i113csv3bd5r8ybyj0qpxdq83lj6jrc5p7cc10mkwyiagqz"; }; - buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer gst-plugins-base GConf libX11 cairo ] + buildInputs = [ gtk2 libXinerama libSM libXxf86vm xorgproto libX11 cairo ] ++ optional withMesa libGLU; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 3812c81a519..5db7cfc26ba 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xorgproto -, gstreamer, gst-plugins-base, GConf, setfile +, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , libGLU ? null, libGL ? null @@ -32,8 +32,7 @@ stdenv.mkDerivation { ]; buildInputs = - [ gtk2 libXinerama libSM libXxf86vm xorgproto gstreamer - gst-plugins-base GConf ] + [ gtk2 libXinerama libSM libXxf86vm xorgproto ] ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; @@ -42,7 +41,7 @@ stdenv.mkDerivation { propagatedBuildInputs = optional stdenv.isDarwin AGL; configureFlags = - [ "--enable-gtk2" "--disable-precomp-headers" "--enable-mediactrl" + [ "--enable-gtk2" "--disable-precomp-headers" (if compat24 then "--enable-compat24" else "--disable-compat24") (if compat26 then "--enable-compat26" else "--disable-compat26") ] ++ optional unicode "--enable-unicode" diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index f125ac9dca0..df90342a972 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm -, gtk2, GConf ? null, gtk3 +, gtk2, gtk3 , xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = [ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 GConf ] + ] ++ optionals withGtk2 [ gtk2 ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk diff --git a/pkgs/development/libraries/wxwidgets/3.1/default.nix b/pkgs/development/libraries/wxwidgets/3.1/default.nix index 0f30deb6c52..44e6fe49b48 100644 --- a/pkgs/development/libraries/wxwidgets/3.1/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.1/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, fetchurl, pkgconfig , libXinerama, libSM, libXxf86vm -, gtk2, GConf ? null, gtk3 +, gtk2, gtk3 , xorgproto, gst_all_1, setfile , libGLSupported ? stdenv.lib.elem stdenv.hostPlatform.system stdenv.lib.platforms.mesaPlatforms , withMesa ? libGLSupported, libGLU ? null, libGL ? null @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 GConf ] + ] ++ optionals withGtk2 [ gtk2 ] ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix index cfa19e5419f..48ed6cf4680 100644 --- a/pkgs/development/libraries/x265/default.nix +++ b/pkgs/development/libraries/x265/default.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, fetchpatch, cmake, nasm, numactl , numaSupport ? stdenv.hostPlatform.isLinux && (stdenv.hostPlatform.isx86 || stdenv.hostPlatform.isAarch64) # Enabled by default on NUMA platforms , debugSupport ? false # Run-time sanity checks (debugging) -, highbitdepthSupport ? false # false=8bits per channel, true=10/12bits per channel , werrorSupport ? false # Warnings as errors , ppaSupport ? false # PPA profiling instrumentation , vtuneSupport ? false # Vtune profiling instrumentation @@ -13,10 +12,17 @@ let mkFlag = optSet: flag: if optSet then "-D${flag}=ON" else "-D${flag}=OFF"; inherit (stdenv) is64bit; -in -stdenv.mkDerivation rec { - pname = "x265"; + cmakeFlagsAll = [ + "-DSTATIC_LINK_CRT=OFF" + (mkFlag debugSupport "CHECKED_BUILD") + (mkFlag ppaSupport "ENABLE_PPA") + (mkFlag vtuneSupport "ENABLE_VTUNE") + (mkFlag custatsSupport "DETAILED_CU_STATS") + (mkFlag unittestsSupport "ENABLE_TESTS") + (mkFlag werrorSupport "WARNINGS_AS_ERRORS") + ]; + version = "3.2"; src = fetchurl { @@ -27,8 +33,6 @@ stdenv.mkDerivation rec { sha256 = "0fqkhfhr22gzavxn60cpnj3agwdf5afivszxf3haj5k1sny7jk9n"; }; - enableParallelBuilding = true; - patches = [ # Fix build on ARM (#406) (fetchpatch { @@ -37,22 +41,56 @@ stdenv.mkDerivation rec { }) ]; + buildLib = has12Bit: stdenv.mkDerivation rec { + name = "libx265-${if has12Bit then "12" else "10"}-${version}"; + inherit src patches; + enableParallelBuilding = true; + + postPatch = '' + sed -i 's/unknown/${version}/g' source/cmake/version.cmake + ''; + + cmakeLibFlags = [ + "-DENABLE_CLI=OFF" + "-DENABLE_SHARED=OFF" + "-DENABLE_HDR10_PLUS=ON" + "-DEXPORT_C_API=OFF" + "-DHIGH_BIT_DEPTH=ON" + ]; + cmakeFlags = [(mkFlag has12Bit "MAIN12")] ++ cmakeLibFlags ++ cmakeFlagsAll; + + preConfigure = '' + cd source + ''; + + nativeBuildInputs = [cmake nasm] ++ stdenv.lib.optional numaSupport numactl; + }; + + libx265-10 = buildLib false; + libx265-12 = buildLib true; +in + +stdenv.mkDerivation rec { + pname = "x265"; + inherit version src patches; + + enableParallelBuilding = true; + postPatch = '' sed -i 's/unknown/${version}/g' source/cmake/version.cmake ''; cmakeFlags = [ - (mkFlag debugSupport "CHECKED_BUILD") - "-DSTATIC_LINK_CRT=OFF" - (mkFlag (highbitdepthSupport && is64bit) "HIGH_BIT_DEPTH") - (mkFlag werrorSupport "WARNINGS_AS_ERRORS") - (mkFlag ppaSupport "ENABLE_PPA") - (mkFlag vtuneSupport "ENABLE_VTUNE") - (mkFlag custatsSupport "DETAILED_CU_STATS") "-DENABLE_SHARED=ON" + "-DHIGH_BIT_DEPTH=OFF" + "-DENABLE_HDR10_PLUS=OFF" + ] ++ stdenv.lib.optionals is64bit [ + "-DEXTRA_LIB=${libx265-10}/lib/libx265.a;${libx265-12}/lib/libx265.a" + "-DLINKED_10BIT=ON" + "-DLINKED_12BIT=ON" + ] ++ [ (mkFlag cliSupport "ENABLE_CLI") - (mkFlag unittestsSupport "ENABLE_TESTS") - ]; + ] ++ cmakeFlagsAll; preConfigure = '' cd source diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 33a4fb93cba..195aea5c2f1 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -38,5 +38,5 @@ let }; }; in { - xapian_1_4 = generic "1.4.16" "4937f2f49ff27e39a42150e928c8b45877b0bf456510f0785f50159a5cb6bf70"; + xapian_1_4 = generic "1.4.17" "0bjpaavdckl4viznr8gbq476fvg648sj4rks2vacmc51vrb8bsxm"; } diff --git a/pkgs/development/libraries/yder/default.nix b/pkgs/development/libraries/yder/default.nix index 11eda01a76a..b6f60ede98c 100644 --- a/pkgs/development/libraries/yder/default.nix +++ b/pkgs/development/libraries/yder/default.nix @@ -4,13 +4,13 @@ assert withSystemd -> systemd != null; stdenv.mkDerivation rec { pname = "yder"; - version = "1.4.10"; + version = "1.4.11"; src = fetchFromGitHub { owner = "babelouest"; repo = pname; rev = "v${version}"; - sha256 = "1m1aw4im1vvddkl7mknq0h0nj0x2zpql3r17lxhw4mmib05zbdgj"; + sha256 = "0gm6l9y4jkxbq6vskdv1ivlq795ic28nhiyq21mzk3mx6j8klwip"; }; patches = [ diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index bb14f562d70..f9c91c3a8a6 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -691,6 +691,74 @@ lua-messagepack = buildLuarocksPackage { license.fullName = "MIT/X11"; }; }; +lua-resty-http = buildLuarocksPackage { + pname = "lua-resty-http"; + version = "0.15-0"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-http-0.15-0.src.rock; + sha256 = "1121abcz9y8kis2wdg7i1m75y8lplk3k49v02y804bywbl2km4fz"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/ledgetech/lua-resty-http"; + description = "Lua HTTP client cosocket driver for OpenResty / ngx_lua."; + license.fullName = "2-clause BSD"; + }; +}; +lua-resty-jwt = buildLuarocksPackage { + pname = "lua-resty-jwt"; + version = "0.2.2-0"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-jwt-0.2.2-0.src.rock; + sha256 = "1a4wwiwcjwgr59g2940a2h0i6n1c7xjy2px5bls3x5br4shwhswa"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/cdbattags/lua-resty-jwt"; + description = "JWT for ngx_lua and LuaJIT."; + license.fullName = "Apache License Version 2"; + }; +}; +lua-resty-openidc = buildLuarocksPackage { + pname = "lua-resty-openidc"; + version = "1.7.2-1"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-openidc-1.7.2-1.src.rock; + sha256 = "01mya69r4fncfrpqh5pn2acg18q3slds8zm976qgkjby0pzwzzw7"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua lua-resty-http lua-resty-session lua-resty-jwt ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/zmartzone/lua-resty-openidc"; + description = "A library for NGINX implementing the OpenID Connect Relying Party (RP) and the OAuth 2.0 Resource Server (RS) functionality"; + license.fullName = "Apache 2.0"; + }; +}; +lua-resty-session = buildLuarocksPackage { + pname = "lua-resty-session"; + version = "3.6-1"; + + src = fetchurl { + url = mirror://luarocks/lua-resty-session-3.6-1.src.rock; + sha256 = "1r5626x247d1vi5bzqfk11bl4d5c39h1iqj6mgndnwpnz43cag5i"; + }; + disabled = (luaOlder "5.1"); + propagatedBuildInputs = [ lua ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/bungle/lua-resty-session"; + description = "Session Library for OpenResty – Flexible and Secure"; + license.fullName = "BSD"; + }; +}; lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix index f98547011bd..1786aebae83 100644 --- a/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -14,7 +14,7 @@ , lldbVersions ? [ ] , cmakeVersions ? [ ] , includeNDK ? false -, ndkVersion ? "18.1.5063045" +, ndkVersion ? "21.0.6113669" , useGoogleAPIs ? false , useGoogleTVAddOns ? false , includeExtras ? [] diff --git a/pkgs/development/mobile/androidenv/generated/addons.nix b/pkgs/development/mobile/androidenv/generated/addons.nix index 23a55595cce..231e5b8ea22 100644 --- a/pkgs/development/mobile/androidenv/generated/addons.nix +++ b/pkgs/development/mobile/androidenv/generated/addons.nix @@ -672,70 +672,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout-solver:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha4.zip"; - sha1 = "2aa2aceecc6ba172742d0af0b43f11d03924eeb8"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; - revision = "1"; - displayName = "Solver for ConstraintLayout 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-solver-1.0.0-alpha8.zip"; - sha1 = "cd13d16a8f0198c1d6040ec8b1d0d4e5bb7feb6a"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-solver-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout-solver/1.0.0-alpha8"; @@ -896,70 +832,6 @@ }; - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha4" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha4"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha4"; - revision = "1"; - displayName = "com.android.support.constraint:constraint-layout:1.0.0-alpha4"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha4.zip"; - sha1 = "645a9be1f0c1177301e71cd0ddccf1dd67c554fe"; - }; - - }; - }; - - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { - name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; - path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; - revision = "1"; - displayName = "ConstraintLayout for Android 1.0.0-alpha8"; - archives = { - - all = fetchurl { - url = "https://dl.google.com/android/repository/com.android.support.constraint-constraint-layout-1.0.0-alpha8.zip"; - sha1 = "7912ba03b04831f918f523648f118c4ee4da7604"; - }; - - }; - }; - - "extras;m2repository;com;android;support;constraint;constraint-layout;1.0.0-alpha8" = { name = "extras-m2repository-com-android-support-constraint-constraint-layout-1.0.0-alpha8"; path = "extras/m2repository/com/android/support/constraint/constraint-layout/1.0.0-alpha8"; diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index b81fab1ed76..6bdb7181590 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -7,12 +7,14 @@ deployAndroidPackage { inherit package os; buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ] ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ]; - patchInstructions = lib.optionalString (os == "linux") '' + patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . + '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' patch -p1 \ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + '' + '' # TODO: allow this stuff rm -rf docs tests @@ -46,6 +48,6 @@ deployAndroidPackage { do ln -sf ../libexec/android-sdk/ndk-bundle/$i $out/bin/$i done - ''; + ''); noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script } diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index babc8fbb1c8..69a61caae15 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -122,6 +122,7 @@ , "mocha" , "multi-file-swagger" , "neovim" +, "netlify-cli" , "nijs" , "node-gyp" , "node-gyp-build" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index bd4c3cdb5cc..23bc954c5e7 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -22,76 +22,103 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1000.5" = { + "@analytics/cookie-utils-0.2.3" = { + name = "_at_analytics_slash_cookie-utils"; + packageName = "@analytics/cookie-utils"; + version = "0.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@analytics/cookie-utils/-/cookie-utils-0.2.3.tgz"; + sha512 = "RiMAVpSluRbWb2hlT9wMJ0r2l+MUZzScYjY+w2iWRzjOr9Zzzs4tYzJT6Sd94PDz3LzCuf4aGOwS6pkKXTEBLw=="; + }; + }; + "@analytics/core-0.6.2" = { + name = "_at_analytics_slash_core"; + packageName = "@analytics/core"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@analytics/core/-/core-0.6.2.tgz"; + sha512 = "qXBfef5/HK5RZkGlkVqRKnjFQuPZejU6NLqnzx/DH3EU28w7a7IgUN+qZ2VSWFr3aMtNJ0qVybfHDxcJBtrLtQ=="; + }; + }; + "@analytics/storage-utils-0.2.4" = { + name = "_at_analytics_slash_storage-utils"; + packageName = "@analytics/storage-utils"; + version = "0.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@analytics/storage-utils/-/storage-utils-0.2.4.tgz"; + sha512 = "VHRggJbRY8vHIADWVwbq9cZux0L9LdmlN31XA3daVAI4gMkKdQEocxB7KqGDt6SfIJ3NYi/qh1nRJGooYmTBiA=="; + }; + }; + "@angular-devkit/architect-0.1000.8" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1000.5"; + version = "0.1000.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.5.tgz"; - sha512 = "BhNqB7fmmrDQwxoJ3zdw5FslFD+nYGgMTiC48ERVYJVuN3BK6xtt2OGA7vho3eJ13OE5cPGUi8crQDRROgxxQg=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1000.8.tgz"; + sha512 = "2AqPbiEugtPxNz4MGhLh+imUVelhW9h1cdJs2AbxZosIxftPb5DNDQUSAwVmRGp4CtcXVrlvcDwc0f4Fw1aiIA=="; }; }; - "@angular-devkit/core-10.0.5" = { + "@angular-devkit/core-10.0.7" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.0.5"; + version = "10.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.5.tgz"; - sha512 = "ZaF1EYniIo+yRLvvaKnLrjYCdKeg2U3YtbA932M2AIfjgfFv/9mnAbH4jmZsBZhCstxZPz+ItwJesdR20h4Z1Q=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.7.tgz"; + sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-9.1.7" = { + "@angular-devkit/core-10.0.8" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.7"; + version = "10.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.7.tgz"; - sha512 = "guvolu9Cl+qYMTtedLZD9wCqustJjdqzJ2psD2C1Sr1LrX9T0mprmDldR/YnhsitThveJEb6sM/0EvqWxoSvKw=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.0.8.tgz"; + sha512 = "d9S8VQuqaYg0c/Y2kl/MtICtZ+UKlH5bLm8y2fb2WfSL4A5XIqMGdEVxzFSiR0b1Bnt4NAoQMcBec1blHAqMSQ=="; }; }; - "@angular-devkit/core-9.1.9" = { + "@angular-devkit/core-9.1.12" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "9.1.9"; + version = "9.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.9.tgz"; - sha512 = "SWgBh4an/Vezjw2BZ5S+bKvuK5lH6gOtR8d5YjN9vxpJSZ0GimrGjfnLlWOkwWAsU8jfn4JzofECUHwX/7EW6Q=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz"; + sha512 = "D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA=="; }; }; - "@angular-devkit/schematics-10.0.5" = { + "@angular-devkit/schematics-10.0.7" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.0.5"; + version = "10.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.5.tgz"; - sha512 = "UeeV8O0IydxCKj2oejygs80oIAQXPYrJHo0PQ/fa0RH6rtV3wZwirdy+yqq/BDGhtV/5VQSVCvu6uyAtGGMgNg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.7.tgz"; + sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-9.1.7" = { + "@angular-devkit/schematics-10.0.8" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.7"; + version = "10.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.7.tgz"; - sha512 = "oeHPJePBcPp/bd94jHQeFUnft93PGF5iJiKV9szxqS8WWC5OMZ5eK7icRY0PwvLyfenspAZxdZcNaqJqPMul5A=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.0.8.tgz"; + sha512 = "p2PjvrExuzOe/azyOEcBeIgwZIk4D6VeLkJf/KVjhXOVu13pjIXHX7/qWl+IYnbtj3NZGHqXM5Cr8nxsJNIMpw=="; }; }; - "@angular-devkit/schematics-9.1.9" = { + "@angular-devkit/schematics-9.1.12" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "9.1.9"; + version = "9.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.9.tgz"; - sha512 = "aKuMmS3wshOTl9+01jiB50ml09fRN1WfOOtoNqwvKTEi87DrT6Mn3l0eVQo8PJK/bIq/FBmPgsIl2nsETiBSxg=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.12.tgz"; + sha512 = "+GYnUzmIy1/QpYitCC8mI7jcrViGHTtOKvvDPEFjU2nggjNEQaMmsHcdIsjrqggEc23ZZyebNAIewT8CMkJyrQ=="; }; }; - "@angular-devkit/schematics-cli-0.901.9" = { + "@angular-devkit/schematics-cli-0.1000.7" = { name = "_at_angular-devkit_slash_schematics-cli"; packageName = "@angular-devkit/schematics-cli"; - version = "0.901.9"; + version = "0.1000.7"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.901.9.tgz"; - sha512 = "mkbN30u7/GvFOIOjj20w5OWi+vEOc/mdnpSrm3AxXvmha4AG56VL6uzF/kKHw9vyhfv8wLMt11OK/iSms9hSWw=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics-cli/-/schematics-cli-0.1000.7.tgz"; + sha512 = "5zXO0WfyRySZudv2/EEC/UVfG75y7TGrdMfVZNc1WP0SB54psA0U3Z3jT+6Y9VjdjmXdxjVfybhuOzZ4I1fs0Q=="; }; }; "@antora/asciidoc-loader-2.3.3" = { @@ -211,13 +238,13 @@ let sha512 = "8cd8ftHgqaseDTN7RJrROT6FT1xy8RV2Qb9BGhhqPVMHqf08GtidBqQTk6hv1UDR0qu/TRZA6J4Kh7oXeMrPQg=="; }; }; - "@apollo/protobufjs-1.0.4" = { + "@apollo/protobufjs-1.0.5" = { name = "_at_apollo_slash_protobufjs"; packageName = "@apollo/protobufjs"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.0.4.tgz"; - sha512 = "EE3zx+/D/wur/JiLp6VCiw1iYdyy1lCJMf8CGPkLeDt5QJrN4N8tKFx33Ah4V30AUQzMk7Uz4IXKZ1LOj124gA=="; + url = "https://registry.npmjs.org/@apollo/protobufjs/-/protobufjs-1.0.5.tgz"; + sha512 = "ZtyaBH1icCgqwIGb3zrtopV2D5Q8yxibkJzlaViM08eOhTQc7rACdYu0pfORFfhllvdMZ3aq69vifYHszY4gNA=="; }; }; "@apollographql/apollo-tools-0.4.8" = { @@ -328,13 +355,13 @@ let sha512 = "TPSvJfv73ng0pfnEOh17bYMPQbI95+nGWc71Ss4vZdRBHTDqmM9Z8ZV4rYz8Ks7sfzc95n30k6ODIq5UGnXcYQ=="; }; }; - "@babel/core-7.11.1" = { + "@babel/core-7.11.4" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.11.1"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.11.1.tgz"; - sha512 = "XqF7F6FWQdKGGWAzGELL+aCO1p+lRY5Tj5/tbT3St1G8NaH70jhhDIKknIZaDans0OQBG5wRAldROLHSt44BgQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.11.4.tgz"; + sha512 = "5deljj5HlqRXN+5oJTY7Zs37iH3z3b++KjiKtIsJy1NrjOOVSEaJHEetLBhyu0aQOSNNZ/0IuEAan9GzRuDXHg=="; }; }; "@babel/generator-7.11.0" = { @@ -346,6 +373,15 @@ let sha512 = "fEm3Uzw7Mc9Xi//qU20cBKatTfs2aOtKqmvy/Vm7RkJEGFQ4xc9myCfbXxqK//ZS8MR/ciOHw6meGASJuKmDfQ=="; }; }; + "@babel/generator-7.11.4" = { + name = "_at_babel_slash_generator"; + packageName = "@babel/generator"; + version = "7.11.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.11.4.tgz"; + sha512 = "Rn26vueFx0eOoz7iifCN2UHT6rGtnkSGWSoDRIy8jZN3B91PzeSULbswfLoOWuTuAcNwpG/mxy+uCTDnZ9Mp1g=="; + }; + }; "@babel/helper-annotate-as-pure-7.10.4" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; @@ -418,13 +454,13 @@ let sha512 = "fMw4kgFB720aQFXSVaXr79pjjcW5puTCM16+rECJ/plGS+zByelE8l9nCpV1GibxTnFVmUuYG9U8wYfQHdzOEQ=="; }; }; - "@babel/helper-explode-assignable-expression-7.10.4" = { + "@babel/helper-explode-assignable-expression-7.11.4" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.10.4.tgz"; - sha512 = "4K71RyRQNPRrR85sr5QY4X3VwG4wtVoXZB9+L3r1Gp38DhELyHCtovqydRi7c1Ovb17eRGiQ/FD5s8JdU0Uy5A=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; + sha512 = "ux9hm3zR4WV1Y3xXxXkdG/0gxF9nvI0YVmKVhvK9AfMoaQkemL3sJpXw+Xbz65azo8qJiEz2XVDUpK3KYhH3ZQ=="; }; }; "@babel/helper-function-name-7.10.4" = { @@ -508,13 +544,13 @@ let sha512 = "68kdUAzDrljqBrio7DYAEgCoJHxppJOERHOgOrDN7WjOzP0ZQ1LsSDRXcemzVZaLvjaJsJEESb6qt+znNuENDg=="; }; }; - "@babel/helper-remap-async-to-generator-7.10.4" = { + "@babel/helper-remap-async-to-generator-7.11.4" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.10.4"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.10.4.tgz"; - sha512 = "86Lsr6NNw3qTNl+TBcF1oRZMaVzJtbWTyTko+CQL/tvNvcGYEFKbLXDPxtW0HKk3McNOk4KzY55itGWCAGK5tg=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; + sha512 = "tR5vJ/vBa9wFy3m5LLv2faapJLnDFxNWff2SAYkSE4rLUdbp7CdObYFgI7wK4T/Mj4UzpjPwzR8Pzmr5m7MHGA=="; }; }; "@babel/helper-replace-supers-7.10.4" = { @@ -589,13 +625,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.11.1" = { + "@babel/parser-7.11.4" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.11.1"; + version = "7.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.1.tgz"; - sha512 = "u9QMIRdKVF7hfEkb3nu2LgZDIzCQPv+yHD9Eg6ruoJLjkrQ9fFz4IBSlF/9XwoNri9+2F1IY+dYuOfZrXq8t3w=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.11.4.tgz"; + sha512 = "MggwidiH+E9j5Sh8pbrX5sJvMcsqS5o+7iB42M9/k0CD63MjYbdP4nhSh7uB5wnv2/RVzTZFTxzF/kIa5mrCqA=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -1273,13 +1309,13 @@ let sha512 = "otddXKhdNn7d0ptoFRHtMLa8LqDxLYwTjB4nYgM1yy5N6gU/MUf8zqyyLltCH3yAVitBzmwK4us+DD0l/MauAg=="; }; }; - "@babel/runtime-7.11.1" = { + "@babel/runtime-7.11.2" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.11.1"; + version = "7.11.2"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.1.tgz"; - sha512 = "nH5y8fLvVl3HAb+ezbgcgwrH8QbClWo8xzkOu7+oyqngo3EVorwpWJQaqXPjGRpfj7mQvsJCl/S8knkfkPWqrw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.11.2.tgz"; + sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; "@babel/template-7.10.4" = { @@ -1318,6 +1354,60 @@ let sha512 = "O53yME4ZZI0jO1EVGtF1ePGl0LHirG4P1ibcD80XyzZcKhcMFeCXmh4Xb1ifGBIV233Qg12x4rBfQgA+tmOukA=="; }; }; + "@bugsnag/browser-7.3.3" = { + name = "_at_bugsnag_slash_browser"; + packageName = "@bugsnag/browser"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.3.3.tgz"; + sha512 = "P3oQU/abDsDqSuuxVFDBp3XNIYeGLsbtGWwCM+iEg1ZGAUk/yP7NfRLqotMheZ0uC8a+4PSIS+U3+slZF7LCJw=="; + }; + }; + "@bugsnag/core-7.3.3" = { + name = "_at_bugsnag_slash_core"; + packageName = "@bugsnag/core"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/core/-/core-7.3.3.tgz"; + sha512 = "DjAwzxQtyKgQxPGLmM+cZZZVkVsecUDowliguvcGojHHmdeIEDIBpu5LrZBQtLNk83SjM1RIyAEPdzaiHGWbzg=="; + }; + }; + "@bugsnag/cuid-3.0.0" = { + name = "_at_bugsnag_slash_cuid"; + packageName = "@bugsnag/cuid"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/cuid/-/cuid-3.0.0.tgz"; + sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; + }; + }; + "@bugsnag/js-7.3.3" = { + name = "_at_bugsnag_slash_js"; + packageName = "@bugsnag/js"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.3.3.tgz"; + sha512 = "4++QE1cebYVI87smjc9IsyIJWtNjL5WG4jp7htd+HEtT0QkhbokIbRH2b4MpN6+l4Y7GzyzMBNDOr1qDdBluBw=="; + }; + }; + "@bugsnag/node-7.3.3" = { + name = "_at_bugsnag_slash_node"; + packageName = "@bugsnag/node"; + version = "7.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/node/-/node-7.3.3.tgz"; + sha512 = "quyJXiqcMDVMdDqO0kW1277K3osdI/XgHKtY0K/4EcN2u4Qlg0crBNw5dQo+DCL4yllDQcWRfeuFv718QW4xlQ=="; + }; + }; + "@bugsnag/safe-json-stringify-6.0.0" = { + name = "_at_bugsnag_slash_safe-json-stringify"; + packageName = "@bugsnag/safe-json-stringify"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@bugsnag/safe-json-stringify/-/safe-json-stringify-6.0.0.tgz"; + sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; + }; + }; "@chemzqm/neovim-5.1.9" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; @@ -1444,24 +1534,6 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; - "@emotion/babel-utils-0.6.10" = { - name = "_at_emotion_slash_babel-utils"; - packageName = "@emotion/babel-utils"; - version = "0.6.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/babel-utils/-/babel-utils-0.6.10.tgz"; - sha512 = "/fnkM/LTEp3jKe++T0KyTszVGWNKPNOUJfjNKLO17BzQ6QPxgbg3whayom1Qr2oLFH3V92tDymU+dT5q676uow=="; - }; - }; - "@emotion/hash-0.6.6" = { - name = "_at_emotion_slash_hash"; - packageName = "@emotion/hash"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/hash/-/hash-0.6.6.tgz"; - sha512 = "ojhgxzUHZ7am3D2jHkMzPpsBAiB005GF5YU4ea+8DNPybMk01JJUM9V9YRlF/GE95tcOm8DxQvWA2jq19bGalQ=="; - }; - }; "@emotion/is-prop-valid-0.8.8" = { name = "_at_emotion_slash_is-prop-valid"; packageName = "@emotion/is-prop-valid"; @@ -1471,15 +1543,6 @@ let sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="; }; }; - "@emotion/memoize-0.6.6" = { - name = "_at_emotion_slash_memoize"; - packageName = "@emotion/memoize"; - version = "0.6.6"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/memoize/-/memoize-0.6.6.tgz"; - sha512 = "h4t4jFjtm1YV7UirAFuSuFGyLa+NNxjdkq6DpFLANNQY5rHueFZHVY+8Cu1HYVP6DrheB0kv4m5xPjo7eKT7yQ=="; - }; - }; "@emotion/memoize-0.7.4" = { name = "_at_emotion_slash_memoize"; packageName = "@emotion/memoize"; @@ -1489,24 +1552,6 @@ let sha512 = "Ja/Vfqe3HpuzRsG1oBtWTHk2PGZ7GR+2Vz5iYGelAw8dx32K0y7PjVuxK6z1nMpZOqAFsRUPCkK1YjJ56qJlgw=="; }; }; - "@emotion/serialize-0.9.1" = { - name = "_at_emotion_slash_serialize"; - packageName = "@emotion/serialize"; - version = "0.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/serialize/-/serialize-0.9.1.tgz"; - sha512 = "zTuAFtyPvCctHBEL8KZ5lJuwBanGSutFEncqLn/m9T1a6a93smBStK+bZzcNPgj4QS8Rkw9VTwJGhRIUVO8zsQ=="; - }; - }; - "@emotion/stylis-0.7.1" = { - name = "_at_emotion_slash_stylis"; - packageName = "@emotion/stylis"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/stylis/-/stylis-0.7.1.tgz"; - sha512 = "/SLmSIkN13M//53TtNxgxo57mcJk/UJIDFRKwOiLIBEyBHEcipgR6hNMQ/59Sl4VjCJ0Z/3zeAZyvnSLPG/1HQ=="; - }; - }; "@emotion/stylis-0.8.5" = { name = "_at_emotion_slash_stylis"; packageName = "@emotion/stylis"; @@ -1516,15 +1561,6 @@ let sha512 = "h6KtPihKFn3T9fuIrwvXXUOwlx3rfUvfZIcP5a6rh8Y7zjE3O06hT5Ss4S/YI1AYhuZ1kjaE/5EaOOI2NqSylQ=="; }; }; - "@emotion/unitless-0.6.7" = { - name = "_at_emotion_slash_unitless"; - packageName = "@emotion/unitless"; - version = "0.6.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/unitless/-/unitless-0.6.7.tgz"; - sha512 = "Arj1hncvEVqQ2p7Ega08uHLr1JuRYBuO5cIvcA+WWEQ5+VmkOE3ZXzl04NbQxeQpWX78G7u6MqxKuNX3wvYZxg=="; - }; - }; "@emotion/unitless-0.7.5" = { name = "_at_emotion_slash_unitless"; packageName = "@emotion/unitless"; @@ -1534,15 +1570,6 @@ let sha512 = "OWORNpfjMsSSUBVrRBVGECkhWcULOAJz9ZW8uK9qgxD+87M7jHRcvh/A96XXNhXTLmKcoYSQtBEX7lHMO7YRwg=="; }; }; - "@emotion/utils-0.8.2" = { - name = "_at_emotion_slash_utils"; - packageName = "@emotion/utils"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@emotion/utils/-/utils-0.8.2.tgz"; - sha512 = "rLu3wcBWH4P5q1CGoSSH/i9hrXs7SlbRLkoq9IGuoPYNGQvDJ3pt/wmOM+XgYjIDRMVIdkUWt0RsfzF50JfnCw=="; - }; - }; "@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" = { name = "_at_endemolshinegroup_slash_cosmiconfig-typescript-loader"; packageName = "@endemolshinegroup/cosmiconfig-typescript-loader"; @@ -1588,49 +1615,58 @@ let sha512 = "EI552lf0aG2nOV8NnZpTxNo2PcXKPmDbF9K8eCBFQdIZwHNGN/mi815fxtmUMa2wTa1yndotICIDt/V0vpEx2w=="; }; }; - "@fluentui/date-time-utilities-7.3.1" = { + "@fluentui/date-time-utilities-7.6.0" = { name = "_at_fluentui_slash_date-time-utilities"; packageName = "@fluentui/date-time-utilities"; - version = "7.3.1"; + version = "7.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.3.1.tgz"; - sha512 = "nC0ghnbJj8/9jM5Jn/Hg9RKKPn6ORS4sHrQk8iK/8R9A0EbYfPJS4wYlIrAhlgAbgkUTNcBgIM7M0q8dKfRTfw=="; + url = "https://registry.npmjs.org/@fluentui/date-time-utilities/-/date-time-utilities-7.6.0.tgz"; + sha512 = "lp8BjSF9FW8mpVrfcuVbldVOVZ/lxWzH9xzBG67rkdjIMYwtV0/mFgB6MrKsGvzqDIlvXcoptrcUQNl0/3QA7Q=="; }; }; - "@fluentui/keyboard-key-0.2.8" = { + "@fluentui/keyboard-key-0.2.11" = { name = "_at_fluentui_slash_keyboard-key"; packageName = "@fluentui/keyboard-key"; - version = "0.2.8"; + version = "0.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.8.tgz"; - sha512 = "GJW3NjDdigTddYuxoOuBGhOs5Egweqs6iPTDSUN+oAtXI/poYHVtgjxaFQx1OeAzD8wLXofGneAe/03ZW+TESA=="; + url = "https://registry.npmjs.org/@fluentui/keyboard-key/-/keyboard-key-0.2.11.tgz"; + sha512 = "4iG5vNlRD3PrLaMfDTimHNOP1x6V3Dad0fXOwtvBBMsfdySPE9zlY+G+0aqCFcgjymOriFOk0ANZVBpK7XrnTg=="; }; }; - "@fluentui/react-7.124.2" = { + "@fluentui/react-7.132.0" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.124.2"; + version = "7.132.0"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.124.2.tgz"; - sha512 = "NFl5nHC68s3sDZMdjSnlasRR02Vb2KOTmtsLi8VX10T2jpt1G7VW3fcK5hh+lTO2jBN+GwF6DX/EIVF/wBLpMA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.132.0.tgz"; + sha512 = "k2ZMkhUJt+wmJPEZUyWi6oiM3NlXT5zWfF0yEEKJlGeFm55Q1OGr5XdflR5Crd9CYE+zoUN7PoYe3NGebdsIUA=="; }; }; - "@fluentui/react-focus-7.12.27" = { + "@fluentui/react-focus-7.13.3" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.12.27"; + version = "7.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.12.27.tgz"; - sha512 = "YIyqcoWhQ275STcrseqJ7vjlvYdLlMlaWpziMgqtidS7/yaMrCyCnB5zPzuKaePH8N8z2wtsqq10algj3UtwRw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.13.3.tgz"; + sha512 = "P7iptQRBgyAuxLUq7yusVI0FL92wjo5jdzofatkoONxVHAzrTbGsboiu00PbeYbXxEKjA1+v2y2OfbgGRpglZw=="; }; }; - "@fluentui/react-icons-0.1.42" = { + "@fluentui/react-icons-0.2.2" = { name = "_at_fluentui_slash_react-icons"; packageName = "@fluentui/react-icons"; - version = "0.1.42"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.2.2.tgz"; + sha512 = "pofZsHgbBVcyVr3I/LlbrX3P06NZnToxlH7cS9xy3LFcyrj629S5+iEXFdVk4O496MJ6qd4/FyxI/3Ru9UNlDg=="; + }; + }; + "@fluentui/theme-0.1.2" = { + name = "_at_fluentui_slash_theme"; + packageName = "@fluentui/theme"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-icons/-/react-icons-0.1.42.tgz"; - sha512 = "/VHMiEl/MeEuRBqrYn9+zdpU5ay7qwpRZiGmXc6WecY9Olh/mV+Pfvf2lntOFf5IACWOhGY6EVaiV3pE5Uf5zg=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-0.1.2.tgz"; + sha512 = "hjLowlMEH6vVrE+6dNgrZ8vWXK3a750959aWC5Ss0cWMZPtL3oNxCSwsLD6I65HwErhfDIEXw1HIqNEN9XbiAw=="; }; }; "@graphql-cli/common-4.0.0" = { @@ -1651,112 +1687,94 @@ let sha512 = "oJZb4PScX25ZGObpw9n7/bJBE7R0oF6hJ4ABe+WvMqSCI3kxaReMTgJJNIrxpmbXscxWM8U1ndLefP5IjPcU7Q=="; }; }; - "@graphql-tools/delegate-6.0.16" = { + "@graphql-tools/delegate-6.1.0" = { name = "_at_graphql-tools_slash_delegate"; packageName = "@graphql-tools/delegate"; - version = "6.0.16"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.0.16.tgz"; - sha512 = "mq/vTHaBGOWxqKqjkj8KJpH+hg6Y096nZYTLpUZcPf6eX1OhxEIkdw5NDN99ii2/NGAyw7ApoY7BWFEEneiiTg=="; + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.1.0.tgz"; + sha512 = "LBulO9tEx+4TvRIY3yCivCYdtI18BpDX/qlSs+K7AuTgCH8eJ/S/FinFRTpTK/9bQwXnBh/d9WjiiRekUCiW6g=="; }; }; - "@graphql-tools/graphql-file-loader-6.0.16" = { + "@graphql-tools/graphql-file-loader-6.1.0" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.0.16"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.0.16.tgz"; - sha512 = "qgYplQhnY90CnQiRZpM2svCzyZ7FAXaca+liZ6hqA9jfWUWh4N9Tnmy//BqrTmULGVeanPM/m8MyhZEWvvRNIg=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.1.0.tgz"; + sha512 = "UZsCx/JJPlkCPYoKJhOcMpDYRx0RagBJ/0gVjgUyiykGJyl8QqTUz34QZhRFg5WGPWcEyT8z18w5WocPCXwK+g=="; }; }; - "@graphql-tools/import-6.0.16" = { + "@graphql-tools/import-6.1.0" = { name = "_at_graphql-tools_slash_import"; packageName = "@graphql-tools/import"; - version = "6.0.16"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.0.16.tgz"; - sha512 = "zZRxJwAtUsyIckjfiscteFwpaIuEh3EjuhXEaNviMuwhOSrYT0oWmelcPgp/VHT6N4NZD1/y5jxQ4KHK4MrAfg=="; + url = "https://registry.npmjs.org/@graphql-tools/import/-/import-6.1.0.tgz"; + sha512 = "MuW9v8w8hc6GvsWQH41NnOAr1f7bkV4E6AWMYpndAHPcuwwGHiLHizLCEjbNovzdoA8N9h3sMenhQyRpCAiEzg=="; }; }; - "@graphql-tools/json-file-loader-6.0.16" = { + "@graphql-tools/json-file-loader-6.1.0" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.0.16"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.0.16.tgz"; - sha512 = "djkzPmGvVpD3YRypibYRNTgVUUfkae0JXcEWP/gn/8Y8+mnwyE2EiBfGZoW6Ejw5xTKQ7PgmOyWUIJgdEVMCJg=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.1.0.tgz"; + sha512 = "U5+aU4Bi9Se2+rFE0lwARHii1TyKtVG+WPNtBM1YJdgQ800/jrgjSCBl2Js/bd2YkICMLz++lCehyQSgrLpIsg=="; }; }; - "@graphql-tools/load-6.0.16" = { + "@graphql-tools/load-6.1.0" = { name = "_at_graphql-tools_slash_load"; packageName = "@graphql-tools/load"; - version = "6.0.16"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.0.16.tgz"; - sha512 = "7nJUrQqou8lQG5x6tJQAl0N/ONP2oYEgSmN0QwjSxv8iz0aRDoK/nHzGlVk6/Sot58iogF0E+qx/vDKNJh2piw=="; + url = "https://registry.npmjs.org/@graphql-tools/load/-/load-6.1.0.tgz"; + sha512 = "4puWwWPvLKskTtabMXlYW4fdm5yaAgHNwJeUhs3/ftX9mrJOa8HnfIxULZOES9XEbaRoaVQ0wPRBjJKcTBJ7CQ=="; }; }; - "@graphql-tools/merge-6.0.16" = { + "@graphql-tools/merge-6.1.0" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.0.16"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.0.16.tgz"; - sha512 = "QWeTru5IAON9ruTqs48X3WndRjz4pamTfA90M/RICkgog1LsFbIFhHM2QF+hogoMqxhlhmjgfMjQl7xXtDT+9Q=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.1.0.tgz"; + sha512 = "dD7J/LELhy87+5V8pko5EhSx2leoRIT02V5coa6S19PTiNrVqCJU/fMMKdWC1FmHSWUYOf+wZhItsilUxPr7XQ=="; }; }; - "@graphql-tools/schema-6.0.16" = { + "@graphql-tools/schema-6.1.0" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.0.16"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.0.16.tgz"; - sha512 = "e5jqE13L5eywCc0Uqlf2ThgScj1KgrCQmwvm+giVK0Dh9goMbwLZt/ciEJSr/LYn/vsH5sec9Qu5Jml6IX7zLA=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.1.0.tgz"; + sha512 = "AZflTf9HU3Uy8UgUwxwFXN9Lf+9D36LBoDRIxPRhsj6EtawbwCqsd3UFwNek0OgiwNi3BL2b+D+6QEcw2IOsDA=="; }; }; - "@graphql-tools/url-loader-6.0.16" = { + "@graphql-tools/url-loader-6.1.0" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.0.16"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.0.16.tgz"; - sha512 = "b+dwCDTcWIGOCYNYUKr6nbkAi8uOmgYHCf1wXsG09gV8uchU74tL8ebxBoaIEU8C9GSqterK2Y7mNjWyw3UdQQ=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.1.0.tgz"; + sha512 = "AzTDZPQqHv2jrTrKhPgLbeWBhEjwFMAFnRKPsaGnSxkZWAeTeA4XevbWS4wl9jho0klTtSRBbKnNBp+dxbpmwA=="; }; }; - "@graphql-tools/utils-6.0.16" = { + "@graphql-tools/utils-6.1.0" = { name = "_at_graphql-tools_slash_utils"; packageName = "@graphql-tools/utils"; - version = "6.0.16"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.0.16.tgz"; - sha512 = "WSYVqiIpda0CzXgHuKBJkqE0zZs4aruoVxn5KVMmqDoZbPVJ4f/pATVgKYyelOlBlx5gOfs8PCFpWcQhDB39LA=="; + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-6.1.0.tgz"; + sha512 = "YcyslZ/8rk5nQOGnkEDp/xi6Xphu0mgjh5LTZ1qUio5P+d95/9MW44cPdmi3Feg4kO8u+1GcPC+685hFpJlZJw=="; }; }; - "@graphql-tools/wrap-6.0.16" = { + "@graphql-tools/wrap-6.1.0" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.0.16"; - src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.0.16.tgz"; - sha512 = "Q1VECNmmRygX1qdlGEF6dimAiuX9rauqalJif2zL9Fa4uORSvPr3VxOA8A0+4ypz2QYL+PjqQ88rCATUZxpY9g=="; - }; - }; - "@gulp-sourcemaps/identity-map-1.0.2" = { - name = "_at_gulp-sourcemaps_slash_identity-map"; - packageName = "@gulp-sourcemaps/identity-map"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@gulp-sourcemaps/identity-map/-/identity-map-1.0.2.tgz"; - sha512 = "ciiioYMLdo16ShmfHBXJBOFm3xPC4AuwO4xeRpFeHz7WK9PYsWCmigagG2XyzZpubK4a3qNKoUBDhbzHfa50LQ=="; - }; - }; - "@gulp-sourcemaps/map-sources-1.0.0" = { - name = "_at_gulp-sourcemaps_slash_map-sources"; - packageName = "@gulp-sourcemaps/map-sources"; - version = "1.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@gulp-sourcemaps/map-sources/-/map-sources-1.0.0.tgz"; - sha1 = "890ae7c5d8c877f6d384860215ace9d7ec945bda"; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.1.0.tgz"; + sha512 = "sJ4ePvgQ2AKWGQ75hockh1k+0BhPbr7SZqe4T/HKNMCuATNiRi0m78FoxHTp/JODMKRPfhadunD74CXrxupy6A=="; }; }; "@hapi/address-2.1.4" = { @@ -1939,6 +1957,15 @@ let sha512 = "Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg=="; }; }; + "@jest/types-24.9.0" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-24.9.0.tgz"; + sha512 = "XKK7ze1apu5JWQ5eZjHITP66AX+QsLlbaJRBGYr8pNzwcAE2JVkwnf0yqjHTsDRcjR0mujy/NmZMXw5kl+kGBw=="; + }; + }; "@jest/types-25.5.0" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; @@ -2497,13 +2524,13 @@ let sha512 = "RibeMnDPvlL8bFYW5C8cs4mbI3AHfQef73tnJCQ/SgrXZHehmHnsyWUiE7qDQCAo+B1RfTapvSyFF69iPj326A=="; }; }; - "@microsoft/load-themed-styles-1.10.65" = { + "@microsoft/load-themed-styles-1.10.79" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.65"; + version = "1.10.79"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.65.tgz"; - sha512 = "4sLbMM9aywtSMRHebh912/6n4/lC/go6QlTbbQfIBBtfy0oQJdDOW1KtfZfSGPggoPiNEzA7xnVsFCFyMnZyEg=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.79.tgz"; + sha512 = "p4Ym7B2d8HT1K0VHAQkUw1SRmXQrko59lmqg/cr8ORClXIhoqc6Zt3m6I53olz4af2pXzpiI0ynHu6KmYYLOfQ=="; }; }; "@mrmlnc/readdir-enhanced-2.2.1" = { @@ -2524,13 +2551,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@nestjs/schematics-7.0.1" = { + "@nestjs/schematics-7.1.1" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "7.0.1"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.0.1.tgz"; - sha512 = "MOnJPqKPpuwBHDdw96gHoshd/QEYrUlLPF92xQFXm6uIOo1EGISg8OOSoji2isEtp2gHpO+bL8p/h4oPG10Fqw=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.1.1.tgz"; + sha512 = "W7FW8GwIwh3bI1BCmr3jF15zEPPd7noHlOWZ9PlSOJMydGynKA3UG1SFohCkeik447N0ZvLEGHJFLRg7SUXfmg=="; }; }; "@netflix/nerror-1.1.3" = { @@ -2542,58 +2569,139 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@node-red/editor-api-1.1.2" = { + "@netlify/build-3.3.2" = { + name = "_at_netlify_slash_build"; + packageName = "@netlify/build"; + version = "3.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/build/-/build-3.3.2.tgz"; + sha512 = "nIjjJyKJP+6hAMAfNeNUfMMNvXm8qtAtIv/i+Va7PvapPNO37p5H15o0dlke7xLIQuxuDvd6UE3bilj/c1KvdQ=="; + }; + }; + "@netlify/cache-utils-1.0.1" = { + name = "_at_netlify_slash_cache-utils"; + packageName = "@netlify/cache-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.1.tgz"; + sha512 = "wJBHxOWrqGiwgdgd/PxzJC6tVltODDYsqb5Dqs2pJi4LoIXFlAoW+scAWIIURHYs8zodte50pAcMg5cnLLUKPw=="; + }; + }; + "@netlify/config-0.11.11" = { + name = "_at_netlify_slash_config"; + packageName = "@netlify/config"; + version = "0.11.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/config/-/config-0.11.11.tgz"; + sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; + }; + }; + "@netlify/config-2.1.2" = { + name = "_at_netlify_slash_config"; + packageName = "@netlify/config"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/config/-/config-2.1.2.tgz"; + sha512 = "2DvK5rw4DIrQ+Vla4A/C7euFtP43dCdW8Df2sPAiPvOWZLiV941N7flHRB8IJqOQcV/MaG4+qg+lMlR2KDC/Qg=="; + }; + }; + "@netlify/functions-utils-1.2.8" = { + name = "_at_netlify_slash_functions-utils"; + packageName = "@netlify/functions-utils"; + version = "1.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.8.tgz"; + sha512 = "Pi0IJ4REgr7AWu6dbOjlTMHB3v5s5ZXQboyCrgf9eYe7lVZRKtNrMjYtk3XMGAyL0MFmJFGeO8vIbp5ToQppsQ=="; + }; + }; + "@netlify/git-utils-1.0.1" = { + name = "_at_netlify_slash_git-utils"; + packageName = "@netlify/git-utils"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.1.tgz"; + sha512 = "HiKpGyEHOW5ajkU/sQ8mSRIZvznC8GK1AAZWIeBmVRwZIzTykgmZM+HVjPUhfeFH+RK5bWQB4vg7dod2UttI8A=="; + }; + }; + "@netlify/open-api-0.16.0" = { + name = "_at_netlify_slash_open-api"; + packageName = "@netlify/open-api"; + version = "0.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/open-api/-/open-api-0.16.0.tgz"; + sha512 = "o3QI9hAe6lspQysWrB8CygMO4h+7B4qtPDkacitZ4VPBR26rX2TASq0/x1TNa4TnFG2lNgzkuBWhtXAmd/9tdw=="; + }; + }; + "@netlify/run-utils-1.0.0" = { + name = "_at_netlify_slash_run-utils"; + packageName = "@netlify/run-utils"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.0.tgz"; + sha512 = "TcdVJZ3J4iu+WYV9sLMBOr1jW2+XgLtIt1LfGYqsH+yqfkWoWavV27y5ttznM1BODFYQb9fMJG/xO2wAeXCzMw=="; + }; + }; + "@netlify/zip-it-and-ship-it-1.3.11" = { + name = "_at_netlify_slash_zip-it-and-ship-it"; + packageName = "@netlify/zip-it-and-ship-it"; + version = "1.3.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.3.11.tgz"; + sha512 = "j+DSEwSztqoAMPSvx3PnfHqpR3aCW4B/piLbrRLq+Bp8UElq9UZZN3wzEvTL8NS+2VNb5HvwDYDPev208+Fz8g=="; + }; + }; + "@node-red/editor-api-1.1.3" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.1.2.tgz"; - sha512 = "yvA7sO9kqpnojwtnO+K03CsRfU9XBIVYTnPHJYcA94IhxF/sm+iCL1VlZPEMXTEt4VvMfTRKY9U1bHIVAKBtLA=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.1.3.tgz"; + sha512 = "NejrCeQSPwvIaxxEiwOnU25Ylnu4ZEtumIIy2mWLd0IojE6HXDBGhAqfxtksIyg6TnrqKsID/JxK0mLgTs/npQ=="; }; }; - "@node-red/editor-client-1.1.2" = { + "@node-red/editor-client-1.1.3" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.1.2.tgz"; - sha512 = "cHsRxs/0QWqSO8LtTlwIsbEdTADjy3N5KOB2V1E3pNhz4zPy3+6472bnDF93HmywRen1wOWVXxBQTAf5aOHfaQ=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.1.3.tgz"; + sha512 = "oMVij+p/+RyRVOBSfvv2nt4pmurOOGH+KQglWVN3jiWs2D4mUXgsBfg/mbHn4wtvEBYtKFOQacXL7N22WES02g=="; }; }; - "@node-red/nodes-1.1.2" = { + "@node-red/nodes-1.1.3" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.1.2.tgz"; - sha512 = "sVwwrkCpT/padCcPMIQH4Yro4+qOYBBCkn85FnTY+7KlGLUPLhFQr4A30mWoJX5Wk+zTpe3nXqr9R0ccGrhWYg=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.1.3.tgz"; + sha512 = "XAMSiQrBPqpG7/XZqquZ5V1F/ibaDr/e96BrforFfkVGdzeb/5I+/MI2bSl3s/pJiuj4CuKSkQ7gWKbNwa4mvQ=="; }; }; - "@node-red/registry-1.1.2" = { + "@node-red/registry-1.1.3" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.1.2.tgz"; - sha512 = "ApbQviP0q77zI1BREFhbMbNzP972RB4BtZHUOFbXGbcSLaQpX7QLt7+gNTkwTEg5VwHt1nQPNWbAVdP+Aq3RiA=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.1.3.tgz"; + sha512 = "ULvrgC7fpClTHluiQcc4EptaYRPEoKdqfozSxL6XJW5x1BRNU9Iv7+5txhKoumcy7a54bavol32VA7/JRyewjg=="; }; }; - "@node-red/runtime-1.1.2" = { + "@node-red/runtime-1.1.3" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.1.2.tgz"; - sha512 = "szt7L6/wWZax84VsgER8uZB3rnBHofjb2b1qQzRm4yG02O8YZ8elw1kKi0b6B6D+Xo5h3z29h/oJyYdBS8/9sA=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.1.3.tgz"; + sha512 = "tJWPDPCFmp2sB+YZaLtPHOuuwNXQdQ15tizz1vL9i0S+0VVXE8SX2WhBzbsBxSitpNxQ6zTfq8bK28Zh75HCVg=="; }; }; - "@node-red/util-1.1.2" = { + "@node-red/util-1.1.3" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.1.2.tgz"; - sha512 = "9G45g4W7HcCJ9IpIF76sCbDuqHWHmkAHI+lNE02TC8yvGzEOyb6VMvU0vph5JT499752WSlNQwk/g823VrqYLw=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.1.3.tgz"; + sha512 = "Wa/L2bFRK9dR8K1zGlhp3Z9tqZgHsKaSK329YQGRIvAApbH5G//58V1oJdj3+9Gg8xza5YXx4Cw9hHs2m1du6A=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -2677,13 +2785,13 @@ let sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow=="; }; }; - "@npmcli/run-script-1.4.0" = { + "@npmcli/run-script-1.5.0" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.4.0"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.4.0.tgz"; - sha512 = "evlD0Ur2ILGyTP7FfMYi90x80bto9+nEbGjoWzdF+gmIX3HuA1nW0Ghj91JFaTJAHiXnDEEduZS24oAve/aeOA=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.5.0.tgz"; + sha512 = "z7AzLmsMtVntMRJt35M5VAjb/jH6yH37Q8Ku011JVR7rEoy+p2a6/NkwqChCRZORlJaS9rwjXmZKM6UmwXLkqA=="; }; }; "@oclif/color-0.1.2" = { @@ -2704,6 +2812,15 @@ let sha512 = "TkknFtWcZI8te0E8sW+ohiblExrLx73rIcV4KdIzDX01u+oTZWZaap51F6TSGFnR/Gey0WctaDvJhZlt4xgKdA=="; }; }; + "@oclif/command-1.8.0" = { + name = "_at_oclif_slash_command"; + packageName = "@oclif/command"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/command/-/command-1.8.0.tgz"; + sha512 = "5vwpq6kbvwkQwKqAoOU3L72GZ3Ta8RRrewKj9OJRolx28KLJJ8Dg9Rf7obRwt5jQA9bkYd8gqzMTrI7H3xLfaw=="; + }; + }; "@oclif/config-1.16.0" = { name = "_at_oclif_slash_config"; packageName = "@oclif/config"; @@ -2713,6 +2830,15 @@ let sha512 = "vOnMPQcHokC03WBCuLipTxksTwgZcmDOnH2H0UHqndfKKN9GVDzpZTH6zaFVQBdjTME5VtRzg9A2UaNmq6OXWw=="; }; }; + "@oclif/config-1.17.0" = { + name = "_at_oclif_slash_config"; + packageName = "@oclif/config"; + version = "1.17.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/config/-/config-1.17.0.tgz"; + sha512 = "Lmfuf6ubjQ4ifC/9bz1fSCHc6F6E653oyaRXxg+lgT4+bYf9bk+nqrUpAbrXyABkCqgIBiFr3J4zR/kiFdE1PA=="; + }; + }; "@oclif/errors-1.3.3" = { name = "_at_oclif_slash_errors"; packageName = "@oclif/errors"; @@ -2902,13 +3028,13 @@ let sha512 = "O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q=="; }; }; - "@octokit/types-5.2.1" = { + "@octokit/types-5.4.1" = { name = "_at_octokit_slash_types"; packageName = "@octokit/types"; - version = "5.2.1"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/types/-/types-5.2.1.tgz"; - sha512 = "PugtgEw8u++zAyBpDpSkR8K1OsT2l8QWp3ECL6bZHFoq9PfHDoKeGFWSuX2Z+Ghy93k1fkKf8tsmqNBv+8dEfQ=="; + url = "https://registry.npmjs.org/@octokit/types/-/types-5.4.1.tgz"; + sha512 = "OlMlSySBJoJ6uozkr/i03nO5dlYQyE05vmQNZhAh9MyO4DPBP88QlwsDVLmVjIMFssvIZB6WO0ctIGMRG+xsJQ=="; }; }; "@parcel/fs-1.11.0" = { @@ -2956,6 +3082,15 @@ let sha512 = "USSjRAAQYsZFlv43FUPdD+jEGML5/8oLF0rUzPQTtK4q9kvaXr49F5ZplyLz5lox78cLZ0TxN2bIDQ1xhOkulQ=="; }; }; + "@prettier/plugin-pug-1.5.1" = { + name = "_at_prettier_slash_plugin-pug"; + packageName = "@prettier/plugin-pug"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.5.1.tgz"; + sha512 = "LUuXiILPURVCF8u4gnE6SWQZ/+1kVnRatXK6SmQyk+ed8F4uDyNCGuIu3/W7jYQB+k7kD6eQZqINuPWvbPTzYQ=="; + }; + }; "@primer/octicons-10.0.0" = { name = "_at_primer_slash_octicons"; packageName = "@primer/octicons"; @@ -3091,40 +3226,40 @@ let sha512 = "YXJqp9gdHcZKAmBY/WnwFpPtNQp2huD/ME2YMurH2YHJvxrVzYsmpKw/pb7yINArRpp8E++fwbQd3ajYXGA45Q=="; }; }; - "@samverschueren/stream-to-observable-0.3.0" = { + "@samverschueren/stream-to-observable-0.3.1" = { name = "_at_samverschueren_slash_stream-to-observable"; packageName = "@samverschueren/stream-to-observable"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz"; - sha512 = "MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg=="; + url = "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.1.tgz"; + sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.0.5" = { + "@schematics/angular-10.0.8" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.0.5"; + version = "10.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.5.tgz"; - sha512 = "zg8QxgW3uLva/MSKMRYfV7dzj00SUki4nxYN4j1rw42VlwNPnFrPtzFVEilL6N7wFgoHP/6cZRgm4bfXYvLBvg=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.0.8.tgz"; + sha512 = "KNO61UGtiKMQSG+NbusqLtwLbxId0y+xpXJt9PKFwi+vaViOO+YzOPREfiFCuQ7q6X8SmNlrMj6sZ34E2YN1pQ=="; }; }; - "@schematics/schematics-0.901.9" = { + "@schematics/schematics-0.1000.7" = { name = "_at_schematics_slash_schematics"; packageName = "@schematics/schematics"; - version = "0.901.9"; + version = "0.1000.7"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.901.9.tgz"; - sha512 = "Nca8Ig/mFFnhLmosbdWysX4N2HiwVOzA4gQj2TZnMCJ98Cftdebs388LstjsJwGtJyvAa2v4yoaPaUMIGVgQ9w=="; + url = "https://registry.npmjs.org/@schematics/schematics/-/schematics-0.1000.7.tgz"; + sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1000.5" = { + "@schematics/update-0.1000.8" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1000.5"; + version = "0.1000.8"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.5.tgz"; - sha512 = "xodvq3X4B90u8myMEp9ESPnD2aC4YtNXj1FOcJ+BnguRA7q9rq9EL9Xqdef8sx3PObbSiKC0OFLyxgw76WuC3Q=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1000.8.tgz"; + sha512 = "xHuj6ME3PNTsVUrpftd98LF3WHPM0NU25GcT/n0E/j0/52yDTiaPS3wUnYSK8ZSv4Et4hcyGx7f/LEXAoOKJXw=="; }; }; "@serverless/cli-1.5.2" = { @@ -3145,13 +3280,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-2.34.1" = { + "@serverless/components-2.34.7" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "2.34.1"; + version = "2.34.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-2.34.1.tgz"; - sha512 = "AmbGbeOufF0ZQN3yVbzh2MKxItdLgEaGhUNEKgw59xohMhwkzDHSW/FXulFQfunEEcCKCFnPE/Lzr/1GHnhVUQ=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-2.34.7.tgz"; + sha512 = "zQ5S/DjqYKgcUUA/FJGr09m5cQ59eXWMXUoKanZAAmpaAfpvD5uaLbGGlgdIli6JZTks5hLqtjfcar87r94/qg=="; }; }; "@serverless/core-1.1.2" = { @@ -3163,13 +3298,13 @@ let sha512 = "PY7gH+7aQ+MltcUD7SRDuQODJ9Sav9HhFJsgOiyf8IVo7XVD6FxZIsSnpMI6paSkptOB7n+0Jz03gNlEkKetQQ=="; }; }; - "@serverless/enterprise-plugin-3.7.0" = { + "@serverless/enterprise-plugin-3.7.1" = { name = "_at_serverless_slash_enterprise-plugin"; packageName = "@serverless/enterprise-plugin"; - version = "3.7.0"; + version = "3.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.7.0.tgz"; - sha512 = "KAGj1HO0zAoBN4thsD+8S18fnvCLyHXnNFBfNiJsgGAzDIOwtwKqkMUR3z2LeQjAKuFeNJ8+3erexK75j50iBw=="; + url = "https://registry.npmjs.org/@serverless/enterprise-plugin/-/enterprise-plugin-3.7.1.tgz"; + sha512 = "+9/gtrSRCXrO/5gLlFO9hZlxl90ctjsDx8dwKHnO9mVMXJ7RQmUWUj+5h2kSrD6bs2F1RmhLgQhwj7DCGEEAQg=="; }; }; "@serverless/event-mocks-1.1.1" = { @@ -3190,22 +3325,22 @@ let sha512 = "2c5A6HSWwXluknPNJ2s+Z4WfBwP7Kn6kgsEKD+5xlXpDpBFsRku/xJyO9eqRCwxTM41stgHNC6TRsZ03+wH/rw=="; }; }; - "@serverless/platform-client-1.1.1" = { + "@serverless/platform-client-1.1.7" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "1.1.1"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.1.tgz"; - sha512 = "vvS8Mn/nKaAIcP4r5wagsU7YoDQ6u5V3DuSOYx6e7fJiZ9vUKPpUbdUovUDxIoANC+Jo4SzuRxfL6MrK8qfZDw=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-1.1.7.tgz"; + sha512 = "520U/OZN/IV1UnqVPGGMnoPM4TsflxffcyNSbs8Nr7G/9eGr1rcHw2vMAU5Z+4M7DoMDi7FogLNCrr51PLGxaQ=="; }; }; - "@serverless/platform-client-china-1.0.32" = { + "@serverless/platform-client-china-1.0.34" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "1.0.32"; + version = "1.0.34"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.32.tgz"; - sha512 = "fZDmBNcT1w4rUTd4w6Nt0ONeQAfpUni37/v3SEMFWV5hCmjdh2LUIaaF1OC/sZA4KeYzcLTViJezymYkHXBHIA=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-1.0.34.tgz"; + sha512 = "pEMq9hsPYIzMxEZY/tBscOiUDpGQ17yN7ORAdS/mLNjuoouyOJfTiYtehYoY+wNBm25BIcZnkX81+X+IpyF5ng=="; }; }; "@serverless/platform-sdk-2.3.1" = { @@ -3235,13 +3370,13 @@ let sha512 = "aI/cpGVUhWbJUR8QDMtPue28EU4ViG/L4/XKuZDfAN2uNQv3NRjwEFIBi/cxyfQnMTYVtMLe9wDjuwzOT4ENzA=="; }; }; - "@serverless/utils-china-0.1.22" = { + "@serverless/utils-china-0.1.27" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "0.1.22"; + version = "0.1.27"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.22.tgz"; - sha512 = "TYI1khc2Is3ESNwR2QrQx0fo8PfJto0IlDV3qgvfZ5ovCjPG6Ql1ziO8BpzDs5DgAO4TeNuwo28LJOUw/ANiKg=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-0.1.27.tgz"; + sha512 = "ZQDTtmFBD2xl23YFFMVOTmqsgqtcxk9WKBGdixZ3ZY2MxAjrNJvBE0vPCRsYrQCs0I+TzdPDRIPSrOUJh7cpiw=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -3271,13 +3406,31 @@ let sha512 = "/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg=="; }; }; - "@sindresorhus/is-3.1.0" = { + "@sindresorhus/is-3.1.2" = { name = "_at_sindresorhus_slash_is"; packageName = "@sindresorhus/is"; - version = "3.1.0"; + version = "3.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.2.tgz"; + sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; + }; + }; + "@sindresorhus/slugify-1.1.0" = { + name = "_at_sindresorhus_slash_slugify"; + packageName = "@sindresorhus/slugify"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/slugify/-/slugify-1.1.0.tgz"; + sha512 = "ujZRbmmizX26yS/HnB3P9QNlNa4+UvHh+rIse3RbOXLp8yl6n1TxB4t7NHggtVgS8QmmOtzXo48kCxZGACpkPw=="; + }; + }; + "@sindresorhus/transliterate-0.1.1" = { + name = "_at_sindresorhus_slash_transliterate"; + packageName = "@sindresorhus/transliterate"; + version = "0.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/@sindresorhus/is/-/is-3.1.0.tgz"; - sha512 = "n4J+zu52VdY43kdi/XdI9DzuMr1Mur8zFL5ZRG2opCans9aiFwkPxHYFEb5Xgy7n1Z4K6WfI4FpqUqsh3E8BPQ=="; + url = "https://registry.npmjs.org/@sindresorhus/transliterate/-/transliterate-0.1.1.tgz"; + sha512 = "QSdIQ5keUFAZ3KLbfbsntW39ox0Ym8183RqTwBq/ZEFoN3NQAtGV+qWaNdzKpIDHgj9J2CQ2iNDRVU11Zyr7MQ=="; }; }; "@slack/client-3.16.0" = { @@ -3289,22 +3442,22 @@ let sha512 = "CWr7a3rTVrN5Vs8GYReRAvTourbXHOqB1zglcskj05ICH4GZL5BOAza2ARai+qc3Nz0nY08Bozi1x0014KOqlg=="; }; }; - "@snyk/cli-interface-1.5.0" = { + "@snyk/cli-interface-2.3.2" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "1.5.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-1.5.0.tgz"; - sha512 = "+Qo+IO3YOXWgazlo+CKxOuWFLQQdaNCJ9cSfhFQd687/FuesaIxWdInaAdfpsLScq0c6M1ieZslXgiZELSzxbg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; + sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; }; }; - "@snyk/cli-interface-2.3.2" = { + "@snyk/cli-interface-2.6.1" = { name = "_at_snyk_slash_cli-interface"; packageName = "@snyk/cli-interface"; - version = "2.3.2"; + version = "2.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.3.2.tgz"; - sha512 = "jmZyxVHqzYU1GfdnWCGdd68WY/lAzpPVyqalHazPj4tFJehrSfEFc82RMTYAMgXEJuvFRFIwhsvXh3sWUhIQmg=="; + url = "https://registry.npmjs.org/@snyk/cli-interface/-/cli-interface-2.6.1.tgz"; + sha512 = "3X+OwwwT9j0r2ObqxYIiAgdaHsTW71b92PN3wawGAxl4YgPRrRVw8Fouhe41I4WJsn7OlKUNedylZguvpYg9qw=="; }; }; "@snyk/cli-interface-2.8.0" = { @@ -3325,13 +3478,13 @@ let sha512 = "pALcfgoY0hAavy/pBlDIqEu+FFC5m+D4bMnCwlQ26mObL/zzxp2+Ohx+HykCIom62u2J94SzAtRLFdm/2TgoOw=="; }; }; - "@snyk/cocoapods-lockfile-parser-3.4.0" = { + "@snyk/cocoapods-lockfile-parser-3.5.1" = { name = "_at_snyk_slash_cocoapods-lockfile-parser"; packageName = "@snyk/cocoapods-lockfile-parser"; - version = "3.4.0"; + version = "3.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.4.0.tgz"; - sha512 = "mAWgKIHFv0QEGpRvocVMxLAdJx7BmXtVOyQN/VtsGBoGFKqhO0jbtKUUVJC4b0jyKfVmEF2puo94i+1Uqz5q6A=="; + url = "https://registry.npmjs.org/@snyk/cocoapods-lockfile-parser/-/cocoapods-lockfile-parser-3.5.1.tgz"; + sha512 = "0bzajH/HdP3k5cOZKUmT/xqmHZFuWN124c/lrqh+U6Q1Z9Bt7TLOB2ifLKL+1I4rq+IgOesGWJYG1KhxBy3RLw=="; }; }; "@snyk/composer-lockfile-parser-1.4.0" = { @@ -3343,24 +3496,6 @@ let sha512 = "ga4YTRjJUuP0Ufr+t1IucwVjEFAv66JSBB/zVHP2zy/jmfA3l3ZjlGQSjsRC6Me9P2Z0esQ83AYNZvmIf9pq2w=="; }; }; - "@snyk/dep-graph-1.18.3" = { - name = "_at_snyk_slash_dep-graph"; - packageName = "@snyk/dep-graph"; - version = "1.18.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.18.3.tgz"; - sha512 = "7qWRTIJdZuc5VzDjdV2+03AHElyAZmhq7eV9BRu+jqrYjo9ohWBGEZgYslrTdvfqfJ8rkdrG3j0/0Aa25IxJcg=="; - }; - }; - "@snyk/dep-graph-1.18.4" = { - name = "_at_snyk_slash_dep-graph"; - packageName = "@snyk/dep-graph"; - version = "1.18.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.18.4.tgz"; - sha512 = "SePWsDyD7qrLxFifIieEl4GqyOODfOnP0hmUweTG5YcMroAV5nARGAUcjxREGzbXMcUpPfZhAaqFjYgzUDH8dQ=="; - }; - }; "@snyk/dep-graph-1.19.0" = { name = "_at_snyk_slash_dep-graph"; packageName = "@snyk/dep-graph"; @@ -3424,13 +3559,13 @@ let sha512 = "IUq5bHRL0vtVKtfvd4GOccAIaLYHbcertug2UVZzk5+yY6R/CxfYsnFUTho1h4BdkfNdin2tPjE/5jRF4SKSrw=="; }; }; - "@snyk/java-call-graph-builder-1.12.3" = { + "@snyk/java-call-graph-builder-1.13.1" = { name = "_at_snyk_slash_java-call-graph-builder"; packageName = "@snyk/java-call-graph-builder"; - version = "1.12.3"; + version = "1.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.12.3.tgz"; - sha512 = "eN32RcCq5J0Veo5NIbDUSb2KRNiVsZMt1w94bFYKxFt6F1tIoiv1CraXdTHSlgQosZ7tw93e8qdOKmQXOtK88Q=="; + url = "https://registry.npmjs.org/@snyk/java-call-graph-builder/-/java-call-graph-builder-1.13.1.tgz"; + sha512 = "oOCSIyOMplV73a1agcXKXlFYQftK5esUUaFRTf90GOxQwKy8R9tZtKdP+CdutlgvjRP286DQ+7GlvKYsGGZbWg=="; }; }; "@snyk/lodash-4.17.15-patch" = { @@ -3460,13 +3595,22 @@ let sha512 = "FqUayoVjcyCsQFYPm3DcaCKdFR4xmapUkCGY+bcNBs3jqCUw687PoP9CPQ1Jvtaw5YpfBNl/62jyntsWCeciuA=="; }; }; - "@snyk/snyk-cocoapods-plugin-2.3.0" = { + "@snyk/ruby-semver-3.0.0" = { + name = "_at_snyk_slash_ruby-semver"; + packageName = "@snyk/ruby-semver"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/ruby-semver/-/ruby-semver-3.0.0.tgz"; + sha512 = "GoSRcwNuJ/mK3Q+tqelRJlylPh8K3RZRWh3ZpkOKm1gQPdG+z0wt+LipSIHxGR8yBDl5bQjwTrPLkL49/N1V6Q=="; + }; + }; + "@snyk/snyk-cocoapods-plugin-2.5.0" = { name = "_at_snyk_slash_snyk-cocoapods-plugin"; packageName = "@snyk/snyk-cocoapods-plugin"; - version = "2.3.0"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.3.0.tgz"; - sha512 = "4V1xJMqsK6J3jHu9UufKySorzA8O1vNLRIK1JgJf5KcXQCP44SJI5dk9Xr9iFGXXtGo8iI9gmokQcHlGpkPSJg=="; + url = "https://registry.npmjs.org/@snyk/snyk-cocoapods-plugin/-/snyk-cocoapods-plugin-2.5.0.tgz"; + sha512 = "arK4VHzNh/D9vCFQFeAiSP+rMRXwLbzaRoIKucodf8Q/3KftIo/byeDmoc2Cc7awR1HPo5E391bwBNH5ra8UqA=="; }; }; "@snyk/snyk-docker-pull-3.2.0" = { @@ -3478,13 +3622,13 @@ let sha512 = "uWKtjh29I/d0mfmfBN7w6RwwNBQxQVKrauF5ND/gqb0PVsKV22GIpkI+viWjI7KNKso6/B0tMmsv7TX2tsNcLQ=="; }; }; - "@sorg/log-2.1.0" = { + "@sorg/log-2.2.0" = { name = "_at_sorg_slash_log"; packageName = "@sorg/log"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@sorg/log/-/log-2.1.0.tgz"; - sha512 = "weyuceH7eLZGlQLwA9+c2vxCWtWLe0vt4ma9qHzvB7aIbEZkAUXsONytEza6vNq2hIeL3/lRFRoGeiuBbnFfaA=="; + url = "https://registry.npmjs.org/@sorg/log/-/log-2.2.0.tgz"; + sha512 = "w5aH2k4caUWxO3dzJ0+GUJJGSqsg0gT6myhypQumlJXsKzYqzsZGZRWA2s/0zQIx6+B2wDvdweVogiWMAAbaKw=="; }; }; "@starptech/expression-parser-0.10.0" = { @@ -3919,6 +4063,33 @@ let sha512 = "Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ=="; }; }; + "@types/decompress-4.2.3" = { + name = "_at_types_slash_decompress"; + packageName = "@types/decompress"; + version = "4.2.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/decompress/-/decompress-4.2.3.tgz"; + sha512 = "W24e3Ycz1UZPgr1ZEDHlK4XnvOr+CpJH3qNsFeqXwwlW/9END9gxn3oJSsp7gYdiQxrXUHwUUd3xuzVz37MrZQ=="; + }; + }; + "@types/download-6.2.4" = { + name = "_at_types_slash_download"; + packageName = "@types/download"; + version = "6.2.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/download/-/download-6.2.4.tgz"; + sha512 = "Lo5dy3ai6LNnbL663sgdzqL1eib11u1yKH6w3v3IXEOO4kRfQpMn1qWUTaumcHLACjFp1RcBx9tUXEvJoR3vcA=="; + }; + }; + "@types/ejs-2.7.0" = { + name = "_at_types_slash_ejs"; + packageName = "@types/ejs"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/ejs/-/ejs-2.7.0.tgz"; + sha512 = "kM2g9Fdk/du24fKuuQhA/LBleFR4Z4JP2MVKpLxQQSzofF1uJ06D+c05zfLDAkkDO55aEeNwJih0gHrE/Ci20A=="; + }; + }; "@types/emscripten-1.39.4" = { name = "_at_types_slash_emscripten"; packageName = "@types/emscripten"; @@ -3991,6 +4162,15 @@ let sha512 = "SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w=="; }; }; + "@types/got-8.3.5" = { + name = "_at_types_slash_got"; + packageName = "@types/got"; + version = "8.3.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/got/-/got-8.3.5.tgz"; + sha512 = "AaXSrIF99SjjtPVNmCmYb388HML+PKEJb/xmj4SbL2ZO0hHuETZZzyDIKfOqaEoAHZEuX4sC+FRFrHYJoIby6A=="; + }; + }; "@types/graceful-fs-4.1.3" = { name = "_at_types_slash_graceful-fs"; packageName = "@types/graceful-fs"; @@ -4036,6 +4216,33 @@ let sha512 = "c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="; }; }; + "@types/http-errors-1.8.0" = { + name = "_at_types_slash_http-errors"; + packageName = "@types/http-errors"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-1.8.0.tgz"; + sha512 = "2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA=="; + }; + }; + "@types/http-proxy-1.17.4" = { + name = "_at_types_slash_http-proxy"; + packageName = "@types/http-proxy"; + version = "1.17.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.4.tgz"; + sha512 = "IrSHl2u6AWXduUaDLqYpt45tLVCtYv7o4Z0s1KghBCDgIIS9oW5K1H8mZG/A2CfeLdEa7rTd1ACOiHBc1EMT2Q=="; + }; + }; + "@types/inquirer-6.5.0" = { + name = "_at_types_slash_inquirer"; + packageName = "@types/inquirer"; + version = "6.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-6.5.0.tgz"; + sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw=="; + }; + }; "@types/istanbul-lib-coverage-2.0.3" = { name = "_at_types_slash_istanbul-lib-coverage"; packageName = "@types/istanbul-lib-coverage"; @@ -4081,6 +4288,15 @@ let sha512 = "JCcp6J0GV66Y4ZMDAQCXot4xprYB+Zfd3meK9+INSJeVZwJmHAW30BBEEkPzXswMXuiyReUGOP3GxrADc9wPww=="; }; }; + "@types/jscodeshift-0.7.1" = { + name = "_at_types_slash_jscodeshift"; + packageName = "@types/jscodeshift"; + version = "0.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/jscodeshift/-/jscodeshift-0.7.1.tgz"; + sha512 = "4jkASx74qGl2OUK8NNFEq10QP0MXriOIqeBeNb1IdevHP8k8VDqS5Uv6nIixAA6ZUjjF6/SwOvecrjXkbcaFzw=="; + }; + }; "@types/json-schema-7.0.5" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -4117,13 +4333,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.11.3" = { + "@types/koa-2.11.4" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.3"; + version = "2.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.3.tgz"; - sha512 = "ABxVkrNWa4O/Jp24EYI/hRNqEVRlhB9g09p48neQp4m3xL1TJtdWk2NyNQSMCU45ejeELMQZBYyfstyVvO2H3Q=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.4.tgz"; + sha512 = "Etqs0kdqbuAsNr5k6mlZQelpZKVwMu9WPRHVVTLnceZlhr0pYmblRNJbCgoCMzKWWePldydU0AYEOX4Q9fnGUQ=="; }; }; "@types/koa-compose-3.2.5" = { @@ -4135,13 +4351,13 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.158" = { + "@types/lodash-4.14.160" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.158"; + version = "4.14.160"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.158.tgz"; - sha512 = "InCEXJNTv/59yO4VSfuvNrZHt7eeNtWQEgnieIA+mIC+MOWM9arOWG2eQ8Vhk6NbOre6/BidiXhkZYeDY9U35w=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.160.tgz"; + sha512 = "aP03BShJoO+WVndoVj/WNcB/YBPt+CIU1mvaao2GRAHy2yg4pT/XS4XnVHEQBjPJGycWf/9seKEO9vopTJGkvA=="; }; }; "@types/long-4.0.1" = { @@ -4180,6 +4396,15 @@ let sha1 = "69a23a3ad29caf0097f06eda59b361ee2f0639f6"; }; }; + "@types/mkdirp-0.5.2" = { + name = "_at_types_slash_mkdirp"; + packageName = "@types/mkdirp"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/mkdirp/-/mkdirp-0.5.2.tgz"; + sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; + }; + }; "@types/mocha-7.0.2" = { name = "_at_types_slash_mocha"; packageName = "@types/mocha"; @@ -4216,13 +4441,13 @@ let sha512 = "kwbcs0jySLxzLsa2nWUAGOd/s21WU1jebrEdtzhsj1D4Yps1EOuyI1Qcu+FD56dL7NRNIJtDDjcqIG22NwkgLw=="; }; }; - "@types/node-14.0.27" = { + "@types/node-14.6.0" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.27"; + version = "14.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.27.tgz"; - sha512 = "kVrqXhbclHNHGu9ztnAwSncIgJv/FaxmzXJvGXNdcCpV1b8u1/Mi6z6m0vwy0LzKeXFTPLH0NzwmoJ3fNCIq0g=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.6.0.tgz"; + sha512 = "mikldZQitV94akrc4sCcSjtJfsTKt4p+e/s0AGscVA6XArQ9kFclP+ZiYUMnq987rc6QlYxXv/EivqlfSLxpKA=="; }; }; "@types/node-6.14.10" = { @@ -4270,6 +4495,15 @@ let sha512 = "//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="; }; }; + "@types/parse5-5.0.3" = { + name = "_at_types_slash_parse5"; + packageName = "@types/parse5"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/parse5/-/parse5-5.0.3.tgz"; + sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; + }; + }; "@types/q-1.5.4" = { name = "_at_types_slash_q"; packageName = "@types/q"; @@ -4396,6 +4630,15 @@ let sha512 = "W+bw9ds02rAQaMvaLYxAbJ6cvguW/iJXNT6lTssS1ps6QdrMKttqEAMEG/b5CR8TZl3/L7/lH0ZV5nNR1LXikA=="; }; }; + "@types/through-0.0.30" = { + name = "_at_types_slash_through"; + packageName = "@types/through"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/through/-/through-0.0.30.tgz"; + sha512 = "FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg=="; + }; + }; "@types/tough-cookie-4.0.0" = { name = "_at_types_slash_tough-cookie"; packageName = "@types/tough-cookie"; @@ -4441,22 +4684,22 @@ let sha512 = "GpTIuDpb9u4zIO165fUy9+fXcULdD8HFRNli04GehoMVbeNq7D6OBnqSmg3lxZnC+UvgUhEWKxdKiwYUkGltIw=="; }; }; - "@types/vscode-1.47.0" = { + "@types/vscode-1.48.0" = { name = "_at_types_slash_vscode"; packageName = "@types/vscode"; - version = "1.47.0"; + version = "1.48.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.47.0.tgz"; - sha512 = "nJA37ykkz9FYA0ZOQUSc3OZnhuzEW2vUhUEo4MiduUo82jGwwcLfyvmgd/Q7b0WrZAAceojGhZybg319L24bTA=="; + url = "https://registry.npmjs.org/@types/vscode/-/vscode-1.48.0.tgz"; + sha512 = "sZJKzsJz1gSoFXcOJWw3fnKl2sseUgZmvB4AJZS+Fea+bC/jfGPVhmFL/FfQHld/TKtukVONsmoD3Pkyx9iadg=="; }; }; - "@types/webpack-4.41.17" = { + "@types/webpack-4.41.21" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.17"; + version = "4.41.21"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.17.tgz"; - sha512 = "6FfeCidTSHozwKI67gIVQQ5Mp0g4X96c2IXxX75hYEQJwST/i6NyZexP//zzMOBb+wG9jJ7oO8fk9yObP2HWAw=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.21.tgz"; + sha512 = "2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA=="; }; }; "@types/webpack-sources-1.4.2" = { @@ -4495,6 +4738,15 @@ let sha512 = "yohU3zMn0fkhlape1nxXG2bLEGZRc1FeqF80RoHaYXJN7uibaauXfhzhOJr1Xh36sn+/tx21QAOf07b/xYVk1w=="; }; }; + "@types/yargs-13.0.10" = { + name = "_at_types_slash_yargs"; + packageName = "@types/yargs"; + version = "13.0.10"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs/-/yargs-13.0.10.tgz"; + sha512 = "MU10TSgzNABgdzKvQVW1nuuT+sgBMWeXNc3XOs5YXV5SDAK+PPja2eUuBNB9iqElu03xyEDqlnGw0jgl4nbqGQ=="; + }; + }; "@types/yargs-15.0.5" = { name = "_at_types_slash_yargs"; packageName = "@types/yargs"; @@ -4531,184 +4783,238 @@ let sha512 = "te5lMAWii1uEJ4FwLjzdlbw3+n0FZNOvFXHxQDKeT0dilh7HOzdMzV2TrJVUzq8ep7J4Na8OUYPRLSQkJHAlrg=="; }; }; - "@typescript-eslint/eslint-plugin-3.8.0" = { + "@typescript-eslint/eslint-plugin-3.10.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.8.0.tgz"; - sha512 = "lFb4VCDleFSR+eo4Ew+HvrJ37ZH1Y9ZyE+qyP7EiwBpcCVxwmUc5PAqhShCQ8N8U5vqYydm74nss+a0wrrCErw=="; - }; - }; - "@typescript-eslint/experimental-utils-1.13.0" = { - name = "_at_typescript-eslint_slash_experimental-utils"; - packageName = "@typescript-eslint/experimental-utils"; - version = "1.13.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-1.13.0.tgz"; - sha512 = "zmpS6SyqG4ZF64ffaJ6uah6tWWWgZ8m+c54XXgwFtUv0jNz8aJAVx8chMCvnk7yl6xwn8d+d96+tWp7fXzTuDg=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz"; + sha512 = "PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ=="; }; }; - "@typescript-eslint/experimental-utils-3.8.0" = { + "@typescript-eslint/experimental-utils-3.10.1" = { name = "_at_typescript-eslint_slash_experimental-utils"; packageName = "@typescript-eslint/experimental-utils"; - version = "3.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.8.0.tgz"; - sha512 = "o8T1blo1lAJE0QDsW7nSyvZHbiDzQDjINJKyB44Z3sSL39qBy5L10ScI/XwDtaiunoyKGLiY9bzRk4YjsUZl8w=="; - }; - }; - "@typescript-eslint/parser-1.13.0" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "1.13.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-1.13.0.tgz"; - sha512 = "ITMBs52PCPgLb2nGPoeT4iU3HdQZHcPaZVw+7CsFagRJHUhyeTgorEwHXhFf3e7Evzi8oujKNpHc8TONth8AdQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz"; + sha512 = "DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw=="; }; }; - "@typescript-eslint/parser-3.8.0" = { + "@typescript-eslint/parser-3.10.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "3.8.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.8.0.tgz"; - sha512 = "u5vjOBaCsnMVQOvkKCXAmmOhyyMmFFf5dbkM3TIbg3MZ2pyv5peE4gj81UAbTHwTOXEwf7eCQTUMKrDl/+qGnA=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz"; + sha512 = "Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw=="; }; }; - "@typescript-eslint/types-3.8.0" = { + "@typescript-eslint/types-3.10.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "3.8.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.8.0.tgz"; - sha512 = "8kROmEQkv6ss9kdQ44vCN1dTrgu4Qxrd2kXr10kz2NP5T8/7JnEfYNxCpPkArbLIhhkGLZV3aVMplH1RXQRF7Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz"; + sha512 = "+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ=="; }; }; - "@typescript-eslint/typescript-estree-1.13.0" = { + "@typescript-eslint/typescript-estree-2.34.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "1.13.0"; + version = "2.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-1.13.0.tgz"; - sha512 = "b5rCmd2e6DCC6tCTN9GSUAuxdYwCM/k/2wdjHGrIRGPSJotWMCe/dGpi66u42bhuh8q3QBzqM4TMA1GUUCJvdw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz"; + sha512 = "OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg=="; }; }; - "@typescript-eslint/typescript-estree-3.8.0" = { + "@typescript-eslint/typescript-estree-3.10.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "3.8.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.8.0.tgz"; - sha512 = "MTv9nPDhlKfclwnplRNDL44mP2SY96YmPGxmMbMy6x12I+pERcxpIUht7DXZaj4mOKKtet53wYYXU0ABaiXrLw=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz"; + sha512 = "QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w=="; }; }; - "@typescript-eslint/visitor-keys-3.8.0" = { + "@typescript-eslint/visitor-keys-3.10.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "3.8.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.8.0.tgz"; - sha512 = "gfqQWyVPpT9NpLREXNR820AYwgz+Kr1GuF3nf1wxpHD6hdxI62tq03ToomFnDxY0m3pUB39IF7sil7D5TQexLA=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz"; + sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.7.41" = { + "@uifabric/foundation-7.8.3" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.7.41"; + version = "7.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.7.41.tgz"; - sha512 = "Ts1yg58oMxCLT+hmJ9vfUpQm0zkj6lJUw+X9BhwL88DT8cUUEm43jqlnfC/d+3/gDaBV+YK6EalUrrB0EHrkDQ=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.8.3.tgz"; + sha512 = "8b5gFeZlBb039iqx0iDZLMV4Pya1l10xJzCteg/C0B66GaKuJuW0sMv8GuFSsqXHnqMuzoakKqyq8zsRIN96Uw=="; }; }; - "@uifabric/icons-7.3.67" = { + "@uifabric/icons-7.4.3" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.3.67"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.3.67.tgz"; - sha512 = "wN31oh/5aq72uhCErrykXhOOe1AKrqkDbApnOcYSG/5xaCh3BPfwhynjHg2y1cLxM/CQRckMfsu5lZ7OKZCYIA=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.4.3.tgz"; + sha512 = "/3+JxAXOGKeJAIQlLDFfiQaw7RSnLNWU3BnXbOCWRIzBAJme6XbvU3Oiy6Sgq79CEuSx1gwe8EifYvM8OFMYNA=="; }; }; - "@uifabric/merge-styles-7.16.4" = { + "@uifabric/merge-styles-7.17.0" = { name = "_at_uifabric_slash_merge-styles"; packageName = "@uifabric/merge-styles"; - version = "7.16.4"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.16.4.tgz"; - sha512 = "OhOEtwYD74AARf4VZQJPan97QEvtTYcxBGVQfdE7YxFnvR1VdfMxOsV+9CAjAIFM+Xu5ibeKkEE/ZmJYnHkqsQ=="; + url = "https://registry.npmjs.org/@uifabric/merge-styles/-/merge-styles-7.17.0.tgz"; + sha512 = "UFG0pKqjz6iGcYhDFDSb2br5TEOys90mCaXeXPln8QrIc5NTJG1gWeO4znG6r65e23Ab/hBz+lmoyfYxgr3fZw=="; }; }; - "@uifabric/react-hooks-7.7.0" = { + "@uifabric/react-hooks-7.10.0" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.7.0"; + version = "7.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.7.0.tgz"; - sha512 = "33iFd2mcS/XVGSQYyjBO5KKwFVq1WvG7KCio6vZXB/q2Rj9TWdkjLtsrM0C3YUDTS+vlKYSp1RuE/+tH00+8jQ=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.10.0.tgz"; + sha512 = "zbxsFrXexfj5bPDBDh4BNFZj8vs8Jf6jmvZYRk+r/ZtvfceDyjuWcF+fYc2fjCon6pDfL5N8/S5Bc4NRw6sfvw=="; }; }; - "@uifabric/set-version-7.0.19" = { + "@uifabric/set-version-7.0.22" = { name = "_at_uifabric_slash_set-version"; packageName = "@uifabric/set-version"; - version = "7.0.19"; + version = "7.0.22"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.19.tgz"; - sha512 = "p52z9Z5Kfl0kAU3DiPNPg+0vCdSAxlkRZEtEa+RwM6fh9XSo91n4C56FFdKDW7HJVuhGjMK7UEXuU6ELY1W7fg=="; + url = "https://registry.npmjs.org/@uifabric/set-version/-/set-version-7.0.22.tgz"; + sha512 = "IG35UNJNxqI7NC2eYuobGTD+v4W0VHQcC3bYd5Na9EgoC9jVgguS8n6EXUtP/lC1vJEYEyPEZdVwhPxKw4F4Sw=="; }; }; - "@uifabric/styling-7.14.7" = { + "@uifabric/styling-7.15.3" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.14.7"; + version = "7.15.3"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.14.7.tgz"; - sha512 = "J4nYc9QM4eCW+jGgRBW6C+1CsbdLfP9RanPn121YRKWYgg4SHdflCwJDfnNAPHSlvpPkQweVfbFVyHeTNCwIbw=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.15.3.tgz"; + sha512 = "P8xHumpnr2De6AyiHhi0GBUf6HpV2R/wS8c5fSEhMpMomXjWQrnVeq7OS+896Qw/qCgvT/brjXAI2EzqEPwuvg=="; }; }; - "@uifabric/utilities-7.25.0" = { + "@uifabric/utilities-7.30.0" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.25.0"; + version = "7.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.25.0.tgz"; - sha512 = "11QJq2dyYojVRxT/QvocI1m5tqqyeoX5K9HmqSGaAq5AIJBqdAUeFAIUuXAn7Gze7X+aLTFVF4Yxthh/ebVthw=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.30.0.tgz"; + sha512 = "NO+XkCBsaxVzOA+JytgSGAK3ihPDG5XLPQQhFbAXSEc5eC6qzcSY6JswRPy3hC1DIWicTUh+iTrDbb+x2vZ8Wg=="; }; }; - "@vue/cli-shared-utils-4.5.0" = { + "@vue/cli-shared-utils-4.5.4" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; - version = "4.5.0"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.0.tgz"; - sha512 = "sVIq0PvWW7W/CGuEm8LC+Ehod9yreaGaDva+oqVglTqE7lf0CtsAMRytFf37DgIwcM9TiMgdx8DCqdmotkhY9g=="; + url = "https://registry.npmjs.org/@vue/cli-shared-utils/-/cli-shared-utils-4.5.4.tgz"; + sha512 = "7ZwAvGxl5szGuaJCc4jdPy/2Lb7oJvG847MDF+7pZ7FVl6bURwbUJjiUwL6DTxvpC4vch6B4tXfVvZFjzVP/bw=="; }; }; - "@vue/cli-ui-4.5.0" = { + "@vue/cli-ui-4.5.4" = { name = "_at_vue_slash_cli-ui"; packageName = "@vue/cli-ui"; - version = "4.5.0"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.0.tgz"; - sha512 = "N0Dc/KUFzXCSAWlTAq4wHIlE1RFIpf1kVh8kyO2ADippLbr+EpnhuSt725mk7twjRKqJLnu4j7AqDC55Tc735A=="; + url = "https://registry.npmjs.org/@vue/cli-ui/-/cli-ui-4.5.4.tgz"; + sha512 = "1FXRes+Xl/018OdF8pSZKxQzT+NwUpBm5/DbKkNxcxJOSgEE/sIUGmQjyQPWyYyFs6hugbIsNpEJgdYumUUjbQ=="; }; }; - "@vue/cli-ui-addon-webpack-4.5.0" = { + "@vue/cli-ui-addon-webpack-4.5.4" = { name = "_at_vue_slash_cli-ui-addon-webpack"; packageName = "@vue/cli-ui-addon-webpack"; - version = "4.5.0"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.0.tgz"; - sha512 = "XGn9TtFI8leqNR0jSNeJMtkf81vNJn14RXHUQEDjF3jc2jQTiXbzy4I4YLBcq52vLv1qa0ucTY8HAb5sPf86Rg=="; + url = "https://registry.npmjs.org/@vue/cli-ui-addon-webpack/-/cli-ui-addon-webpack-4.5.4.tgz"; + sha512 = "J5yYNdrcBvDboYwX+I9KEpv2QdV39X+YoZl2x+mYAgc4d+Forf2mmGipBarnAOgR58d/yapFRrtQLK1dUNpk9A=="; }; }; - "@vue/cli-ui-addon-widgets-4.5.0" = { + "@vue/cli-ui-addon-widgets-4.5.4" = { name = "_at_vue_slash_cli-ui-addon-widgets"; packageName = "@vue/cli-ui-addon-widgets"; - version = "4.5.0"; + version = "4.5.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.4.tgz"; + sha512 = "/7R3dMrv/tEP4AM22hBDPfXPF24OE/2ddR3cTF1c1fSoHT/LcUvqrlHIb8SlVgl3S7WvF9Prrunp+KzkHW9bSA=="; + }; + }; + "@vue/compiler-core-3.0.0-rc.9" = { + name = "_at_vue_slash_compiler-core"; + packageName = "@vue/compiler-core"; + version = "3.0.0-rc.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.0-rc.9.tgz"; + sha512 = "/Ns7KGT5P0wh4JTM91drBmNIiBlKrCFUqIE2vk8dmaVvqEJf1mqympz1CDZpikghCQC6hKu3tYKxA7qtcMRazw=="; + }; + }; + "@vue/compiler-dom-3.0.0-rc.9" = { + name = "_at_vue_slash_compiler-dom"; + packageName = "@vue/compiler-dom"; + version = "3.0.0-rc.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.0-rc.9.tgz"; + sha512 = "0hCnrIxwp0TKVXKnGYFztM4LMUvFpfXW7YoEglvHqIfZsGkyKcnCYDx4FPk1frDM21xnrr5HgcHt42rlz8lDBA=="; + }; + }; + "@vue/compiler-sfc-3.0.0-rc.9" = { + name = "_at_vue_slash_compiler-sfc"; + packageName = "@vue/compiler-sfc"; + version = "3.0.0-rc.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.0-rc.9.tgz"; + sha512 = "kmjGzcyp93Q+ZKfvxC3GtI9bEXCa9TxsuO+Q9WtiyvOWBLxZkklQc1n5DFn6vtAUIjjlIE5GZoKawvn9LfKejA=="; + }; + }; + "@vue/compiler-ssr-3.0.0-rc.9" = { + name = "_at_vue_slash_compiler-ssr"; + packageName = "@vue/compiler-ssr"; + version = "3.0.0-rc.9"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli-ui-addon-widgets/-/cli-ui-addon-widgets-4.5.0.tgz"; - sha512 = "8DDCGXQPHa6405/Qv0VXT17fhzhnm6XOpBVCJhKWWIP+uBhiEh+lg2hcNHC9ilW8R+N3jHzRSCoeUnjUKwSC1g=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.0-rc.9.tgz"; + sha512 = "lpbnkJrhkI5QgprLPXcB1Uq402QiibPFKRUQZ5vu3zeAvUeMYuQUtZS/Dslurcvqd1dbBC/HM0gCpLtjEQ+2qA=="; + }; + }; + "@vue/reactivity-3.0.0-rc.9" = { + name = "_at_vue_slash_reactivity"; + packageName = "@vue/reactivity"; + version = "3.0.0-rc.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.0-rc.9.tgz"; + sha512 = "1fJSt4zZ/icZUNsN3Te5BeVChmQ7Ner2xUYy9ALtShLSj2RwxRVhtysjXxLE16TbwLkHjsOHjA8tQWrdBfQG0A=="; + }; + }; + "@vue/runtime-core-3.0.0-rc.9" = { + name = "_at_vue_slash_runtime-core"; + packageName = "@vue/runtime-core"; + version = "3.0.0-rc.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.0-rc.9.tgz"; + sha512 = "5tViEzPl8K1moMjCQJXqvTa/RjR/h8cZ9dUDgKfKWvZhxAmXHtmYlBWrvEeFTGWiEuZj0XlZkNxMNjuHLVF0Vg=="; + }; + }; + "@vue/runtime-dom-3.0.0-rc.9" = { + name = "_at_vue_slash_runtime-dom"; + packageName = "@vue/runtime-dom"; + version = "3.0.0-rc.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.0-rc.9.tgz"; + sha512 = "OUKFLOaoshmQPaW7iaYuxl9ip3v08g8cXYr0bu68/0r94PF2/xO/b0GhoUoyeqp/pu1VzZ1TxulJ94JOXsuYjg=="; + }; + }; + "@vue/shared-3.0.0-rc.9" = { + name = "_at_vue_slash_shared"; + packageName = "@vue/shared"; + version = "3.0.0-rc.9"; + src = fetchurl { + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.0-rc.9.tgz"; + sha512 = "SHD7qwziiG6208nKrs0qqbWbYckvBiCBCLwlRjUb6NEDUMN0TOVyzyaTvdnHND9ion/ZMdwEKMtWWtgJJkHDdw=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -5278,15 +5584,6 @@ let sha1 = "c22822f87e1c939f579887504d9c109c4173829d"; }; }; - "abstract-leveldown-0.12.4" = { - name = "abstract-leveldown"; - packageName = "abstract-leveldown"; - version = "0.12.4"; - src = fetchurl { - url = "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz"; - sha1 = "29e18e632e60e4e221d5810247852a63d7b2e410"; - }; - }; "abstract-leveldown-6.0.3" = { name = "abstract-leveldown"; packageName = "abstract-leveldown"; @@ -5314,13 +5611,13 @@ let sha512 = "TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ=="; }; }; - "abstract-logging-1.0.0" = { + "abstract-logging-2.0.0" = { name = "abstract-logging"; packageName = "abstract-logging"; - version = "1.0.0"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-1.0.0.tgz"; - sha1 = "8b7deafd310559bc28f77724dd1bb30177278c1b"; + url = "https://registry.npmjs.org/abstract-logging/-/abstract-logging-2.0.0.tgz"; + sha512 = "/oA9z7JszpIioo6J6dB79LVUgJ3eD3cxkAmdCkvWWS+Y9tPtALs1rLqOekLUXUbYqM2fB9TTK0ibAyZJJOP/CA=="; }; }; "abstract-random-access-1.1.2" = { @@ -5341,15 +5638,6 @@ let sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; }; }; - "accord-0.28.0" = { - name = "accord"; - packageName = "accord"; - version = "0.28.0"; - src = fetchurl { - url = "https://registry.npmjs.org/accord/-/accord-0.28.0.tgz"; - sha512 = "sPF34gqHegaCSryKf5wHJ8wREK1dTZnHmC9hsB7D8xjntRdd30DXDPKf0YVIcSvnXJmcYu5SCvZRz28H++kFhQ=="; - }; - }; "ace.improved-0.2.1" = { name = "ace.improved"; packageName = "ace.improved"; @@ -5665,13 +5953,13 @@ let sha512 = "wn8fw19xKZwdGPO47jivonaHRTd+nGOMP1z11sgGeQzDy2xd5FG0R67dIMcKHDE2cJ5y+YXV30XVGUBPRSY7Hg=="; }; }; - "aggregate-error-3.0.1" = { + "aggregate-error-3.1.0" = { name = "aggregate-error"; packageName = "aggregate-error"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz"; - sha512 = "quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA=="; + url = "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha512 = "4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA=="; }; }; "airplay-js-0.2.16" = { @@ -5728,22 +6016,22 @@ let sha1 = "73b5eeca3fab653e3d3f9422b341ad42205dc965"; }; }; - "ajv-6.12.0" = { + "ajv-6.12.3" = { name = "ajv"; packageName = "ajv"; - version = "6.12.0"; + version = "6.12.3"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.0.tgz"; - sha512 = "D6gFiFA0RRLyUbvijN74DWAjXSFxWKaWP7mldxkVhyhAV3+SWA9HEJPHQ2c9soIeTFJqcSdFDGFgdqs1iUU2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz"; + sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="; }; }; - "ajv-6.12.3" = { + "ajv-6.12.4" = { name = "ajv"; packageName = "ajv"; - version = "6.12.3"; + version = "6.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz"; - sha512 = "4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz"; + sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ=="; }; }; "ajv-6.5.3" = { @@ -5800,13 +6088,13 @@ let sha512 = "0mAYXMSauA8RZ7r+B4+EAOYcZEcO9OK5EiQCR7W7Cv4E44pJj56ZnkKLJ9/PAcOc0dT+LlV9fdDcq2TxVJfOYw=="; }; }; - "alex-8.2.0" = { + "alex-9.0.1" = { name = "alex"; packageName = "alex"; - version = "8.2.0"; + version = "9.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/alex/-/alex-8.2.0.tgz"; - sha512 = "aJX/ZkyGruiXKr26NJkbrYd+Quc8i0cP7B7b9TIX2AoLxHsV+0SJ0ca+26h8sw63LyrWQMkT7lZQlvMMOBKxqA=="; + url = "https://registry.npmjs.org/alex/-/alex-9.0.1.tgz"; + sha512 = "q560b+fVMXvu3WVkvoYBUGRHRXo9K9P/Fnt6Xcq1VhZow9MNqoQ5x7OJTYzSStAElaGxaJ7djTef9pJrM3GBXg=="; }; }; "align-text-0.1.4" = { @@ -5827,15 +6115,6 @@ let sha512 = "2Sy0hWhifVb8ycNFJgicL8fDPL2Ct1r62XOVxXnykn36z22MPZwnQlCmB2viQlY/lwfuO67GaQjUZ0rJgdVP7Q=="; }; }; - "almond-0.3.3" = { - name = "almond"; - packageName = "almond"; - version = "0.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/almond/-/almond-0.3.3.tgz"; - sha1 = "a0e7c95ac7624d6417b4494b1e68bff693168a20"; - }; - }; "alphanum-sort-1.0.2" = { name = "alphanum-sort"; packageName = "alphanum-sort"; @@ -5854,6 +6133,24 @@ let sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; }; }; + "analytics-0.5.5" = { + name = "analytics"; + packageName = "analytics"; + version = "0.5.5"; + src = fetchurl { + url = "https://registry.npmjs.org/analytics/-/analytics-0.5.5.tgz"; + sha512 = "43JBzud8n1OoN5TUehHpsp38rDyDteFgS9ZPWLyuj5JGc7JgjLAQNN1BCwyM9js4U7LIRxhEyWXPkifndMsOeA=="; + }; + }; + "analytics-utils-0.2.2" = { + name = "analytics-utils"; + packageName = "analytics-utils"; + version = "0.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/analytics-utils/-/analytics-utils-0.2.2.tgz"; + sha512 = "fdbc+MeoNrkwCAbGD/qgedyvRbPnImmWiInAgZ51KpINmKITpdtWV+6riHVA1YBSrb8IyYlfxn98IeWyN9a0+Q=="; + }; + }; "ansi-0.3.1" = { name = "ansi"; packageName = "ansi"; @@ -5917,15 +6214,6 @@ let sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; }; }; - "ansi-cyan-0.1.1" = { - name = "ansi-cyan"; - packageName = "ansi-cyan"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz"; - sha1 = "538ae528af8982f28ae30d86f2f17456d2609873"; - }; - }; "ansi-diff-1.1.1" = { name = "ansi-diff"; packageName = "ansi-diff"; @@ -6736,15 +7024,6 @@ let sha512 = "fvDR4iYpZkbMqMbTfKynPGfpXDhFTxzZWSS7C3c70xQ8ElmFkjwVrg/NLcEA+R3s4Jz6mVrz/1vOLEAI+ycrSQ=="; }; }; - "arr-diff-1.1.0" = { - name = "arr-diff"; - packageName = "arr-diff"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz"; - sha1 = "687c32758163588fef7de7b36fabe495eb1a399a"; - }; - }; "arr-diff-2.0.0" = { name = "arr-diff"; packageName = "arr-diff"; @@ -6790,15 +7069,6 @@ let sha1 = "3a77345ffc1cf35e2a91825601f9e58f2e24cac4"; }; }; - "arr-union-2.1.0" = { - name = "arr-union"; - packageName = "arr-union"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz"; - sha1 = "20f9eab5ec70f5c7d215b1077b1c39161d292c7d"; - }; - }; "arr-union-3.1.0" = { name = "arr-union"; packageName = "arr-union"; @@ -6907,6 +7177,15 @@ let sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; }; }; + "array-flat-polyfill-1.0.1" = { + name = "array-flat-polyfill"; + packageName = "array-flat-polyfill"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flat-polyfill/-/array-flat-polyfill-1.0.1.tgz"; + sha512 = "hfJmKupmQN0lwi0xG6FQ5U8Rd97RnIERplymOv/qpq8AoNKPPAnxJadjFA23FNWm88wykh9HmpLJUUwUtNU/iw=="; + }; + }; "array-flatten-1.1.1" = { name = "array-flatten"; packageName = "array-flatten"; @@ -7033,15 +7312,6 @@ let sha1 = "7ea4882a356b4bca5f545e0b6e52eaf6d971557a"; }; }; - "array-slice-0.2.3" = { - name = "array-slice"; - packageName = "array-slice"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz"; - sha1 = "dd3cfb80ed7973a75117cdac69b0b99ec86186f5"; - }; - }; "array-slice-1.1.0" = { name = "array-slice"; packageName = "array-slice"; @@ -7195,6 +7465,15 @@ let sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; }; }; + "ascii-table-0.0.9" = { + name = "ascii-table"; + packageName = "ascii-table"; + version = "0.0.9"; + src = fetchurl { + url = "https://registry.npmjs.org/ascii-table/-/ascii-table-0.0.9.tgz"; + sha1 = "06a6604d6a55d4bf41a9a47d9872d7a78da31e73"; + }; + }; "asciidoctor.js-1.5.9" = { name = "asciidoctor.js"; packageName = "asciidoctor.js"; @@ -7240,15 +7519,6 @@ let sha512 = "jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg=="; }; }; - "asn1.js-4.10.1" = { - name = "asn1.js"; - packageName = "asn1.js"; - version = "4.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz"; - sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw=="; - }; - }; "asn1.js-5.4.1" = { name = "asn1.js"; packageName = "asn1.js"; @@ -7321,6 +7591,24 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; + "ast-module-types-2.6.0" = { + name = "ast-module-types"; + packageName = "ast-module-types"; + version = "2.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.6.0.tgz"; + sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA=="; + }; + }; + "ast-types-0.12.1" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.12.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.12.1.tgz"; + sha512 = "H2izJAyT2xwew4TxShpmxe6f9R5hHgJQy1QloLiUC2yrJMtyraBWNJL7903rpeCY9keNUipORR/zIUC2XcYKng=="; + }; + }; "ast-types-0.13.3" = { name = "ast-types"; packageName = "ast-types"; @@ -7330,6 +7618,24 @@ let sha512 = "XTZ7xGML849LkQP86sWdQzfhwbt3YwIO6MqbX9mUNYY98VKaaVZP7YNNm70IpwecbkkxmfC5IYAzOQ/2p29zRA=="; }; }; + "ast-types-0.13.4" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.13.4"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz"; + sha512 = "x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w=="; + }; + }; + "ast-types-0.14.1" = { + name = "ast-types"; + packageName = "ast-types"; + version = "0.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ast-types/-/ast-types-0.14.1.tgz"; + sha512 = "pfSiukbt23P1qMhNnsozLzhMLBs7EEeXqPyvPmnuZM+RMfwfqwDbSVKYflgGuVI7/VehR4oMks0igzdNAg4VeQ=="; + }; + }; "ast-types-0.9.6" = { name = "ast-types"; packageName = "ast-types"; @@ -7591,13 +7897,13 @@ let sha512 = "TG+5YFiaKQ6CZiSQsosGMJ/IJzwMZ4V/rSdEXlD6+DwKyv8OyeUcprq34kp4yuS6bfQYXhxBC2Vm8PWo+iKBGQ=="; }; }; - "atomic-file-2.0.1" = { + "atomic-file-2.1.1" = { name = "atomic-file"; packageName = "atomic-file"; - version = "2.0.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/atomic-file/-/atomic-file-2.0.1.tgz"; - sha512 = "9JCWojeLDF8UhEv2UJlLlPGsLEs+EBnfB+kOhsvmFI2QilVrnIsAwr7YnF8lLEVuxB+HxFhvGK+ax0Y8Eh/BKA=="; + url = "https://registry.npmjs.org/atomic-file/-/atomic-file-2.1.1.tgz"; + sha512 = "Eh6pW+fRC2/1RxPq3hO8+PkZKv+wujzKky2MP/n69eC8yMkbNFfuEb/riZHqf13M7gr6Hvglpk/kISgBSBb6bQ=="; }; }; "atomic-sleep-1.0.0" = { @@ -7609,6 +7915,15 @@ let sha512 = "kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ=="; }; }; + "atomically-1.3.2" = { + name = "atomically"; + packageName = "atomically"; + version = "1.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/atomically/-/atomically-1.3.2.tgz"; + sha512 = "MAiqx5ir1nOoMeG2vLXJnj4oFROJYB1hMqa2aAo6GQVIkPdkIcrq9W9SR0OaRtvEowO7Y2bsXqKFuDMTO4iOAQ=="; + }; + }; "attach-ware-1.1.1" = { name = "attach-ware"; packageName = "attach-ware"; @@ -7690,13 +8005,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.726.0" = { + "aws-sdk-2.740.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.726.0"; + version = "2.740.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.726.0.tgz"; - sha512 = "QRQ7MaW5dprdr/T3vCTC+J8TeUfpM45yWsBuATPcCV/oO8afFHVySwygvGLY4oJuo5Mf4mJn3+JYTquo6CqiaA=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.740.0.tgz"; + sha512 = "cSedIe7g5/S5o23jHvm9+vWhcYysmuKrmbML1Z0pO9KxlqOA9s4Z5f6Il7ZmvAktfmrxu1SyQu4YEoP5DL4/zw=="; }; }; "aws-sign2-0.6.0" = { @@ -7717,13 +8032,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.0" = { + "aws4-1.10.1" = { name = "aws4"; packageName = "aws4"; - version = "1.10.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.0.tgz"; - sha512 = "3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"; + sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; }; }; "axios-0.18.1" = { @@ -7870,15 +8185,6 @@ let sha512 = "jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ=="; }; }; - "babel-plugin-emotion-9.2.11" = { - name = "babel-plugin-emotion"; - packageName = "babel-plugin-emotion"; - version = "9.2.11"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-emotion/-/babel-plugin-emotion-9.2.11.tgz"; - sha512 = "dgCImifnOPPSeXod2znAmgc64NhaaOjGEHROR/M+lmStb3841yK1sgaDYAYMnlvWNz8GnpwIPN0VmNpbWYZ+VQ=="; - }; - }; "babel-plugin-istanbul-6.0.0" = { name = "babel-plugin-istanbul"; packageName = "babel-plugin-istanbul"; @@ -7897,15 +8203,6 @@ let sha512 = "u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g=="; }; }; - "babel-plugin-macros-2.8.0" = { - name = "babel-plugin-macros"; - packageName = "babel-plugin-macros"; - version = "2.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-2.8.0.tgz"; - sha512 = "SEP5kJpfGYqYKpBrj5XU3ahw5p5GOHJ0U5ssOSQ/WBVdwkD2Dzlce95exQTs3jOVWPPKLBN2rlEWkCK7dSmLvg=="; - }; - }; "babel-plugin-minify-builtins-0.5.0" = { name = "babel-plugin-minify-builtins"; packageName = "babel-plugin-minify-builtins"; @@ -8761,15 +9058,6 @@ let sha512 = "5LhLQeGxdVFumJTbveJS16Rc+Vzh/nbC6o80UMj6ZRvSkiVkk+4L782OMYI0VG1JTfUxiRFP4f+CZBFyuclLBg=="; }; }; - "bl-0.8.2" = { - name = "bl"; - packageName = "bl"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz"; - sha1 = "c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e"; - }; - }; "bl-1.2.2" = { name = "bl"; packageName = "bl"; @@ -8779,13 +9067,13 @@ let sha512 = "e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA=="; }; }; - "bl-4.0.2" = { + "bl-4.0.3" = { name = "bl"; packageName = "bl"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz"; - sha512 = "j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ=="; + url = "https://registry.npmjs.org/bl/-/bl-4.0.3.tgz"; + sha512 = "fs4G6/Hu4/EE+F75J8DuN/0IpQqNjAdC7aEQv7Qt8MHGUH7Ckv2MwTEEeN9QehD0pfIDkMI1bkHYkKy7xHyKIg=="; }; }; "blake2b-2.1.3" = { @@ -8941,13 +9229,13 @@ let sha512 = "E6QoYqCKZfgatHTdHzs1RRKP7ip4vvm+EyRUeE2RF0NblwVvb0p6jSVeNTOFxPn26QXN2o6SMfNxKp6kU8zQaw=="; }; }; - "bn.js-5.1.2" = { + "bn.js-5.1.3" = { name = "bn.js"; packageName = "bn.js"; - version = "5.1.2"; + version = "5.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.2.tgz"; - sha512 = "40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA=="; + url = "https://registry.npmjs.org/bn.js/-/bn.js-5.1.3.tgz"; + sha512 = "GkTiFpjFtUzU9CbMeJ5iazkCzGL3jrhzerzZIuqLABjbwRaFt33I9tUdSNryIptM+RxDet6OKm2WnLXzW51KsQ=="; }; }; "bncode-0.2.3" = { @@ -9382,13 +9670,13 @@ let sha512 = "yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA=="; }; }; - "browserslist-4.13.0" = { + "browserslist-4.14.0" = { name = "browserslist"; packageName = "browserslist"; - version = "4.13.0"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.13.0.tgz"; - sha512 = "MINatJ5ZNrLnQ6blGvePd/QOz9Xtu+Ne+x29iQSCHfkU5BugKVJwZKn/iiL8UbpIpa3JhviKjz+XxMo0m2caFQ=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.0.tgz"; + sha512 = "pUsXKAF2lVwhmtpeA3LJrZ76jXuusrNyhduuQs7CDFf9foT4Y38aQOserd2lMe5DSSrjf3fx34oHwryuvxAUgQ=="; }; }; "bser-2.1.1" = { @@ -9832,24 +10120,6 @@ let sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; }; }; - "bytewise-1.1.0" = { - name = "bytewise"; - packageName = "bytewise"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytewise/-/bytewise-1.1.0.tgz"; - sha1 = "1d13cbff717ae7158094aa881b35d081b387253e"; - }; - }; - "bytewise-core-1.2.3" = { - name = "bytewise-core"; - packageName = "bytewise-core"; - version = "1.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/bytewise-core/-/bytewise-core-1.2.3.tgz"; - sha1 = "3fb410c7e91558eb1ab22a82834577aa6bd61d42"; - }; - }; "cacache-12.0.4" = { name = "cacache"; packageName = "cacache"; @@ -9886,15 +10156,6 @@ let sha512 = "7YKEapH+2Uikde8hySyfobXBqPKULDyHNl/lhKm7cKf/GJFdG/tU/WpLrOg2y9aUrQrWUilYqawFIiGJPS6gDA=="; }; }; - "cacheable-lookup-2.0.1" = { - name = "cacheable-lookup"; - packageName = "cacheable-lookup"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-2.0.1.tgz"; - sha512 = "EMMbsiOTcdngM/K6gV/OxF2x0t07+vMOWxZNSCRQMjO2MY2nhZQ6OYhOOpyQrbhqsgtvKGI7hcq6xjnA92USjg=="; - }; - }; "cacheable-lookup-5.0.3" = { name = "cacheable-lookup"; packageName = "cacheable-lookup"; @@ -10156,13 +10417,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001111" = { + "caniuse-lite-1.0.30001118" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001111"; + version = "1.0.30001118"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001111.tgz"; - sha512 = "xnDje2wchd/8mlJu8sXvWxOGvMgv+uT3iZ3bkIAynKOzToCssWCmkz/ZIkQBs/2pUB4uwnJKVORWQ31UkbVjOg=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001118.tgz"; + sha512 = "RNKPLojZo74a0cP7jFMidQI7nvLER40HgNfgKQEJ2PFm225L0ectUungNQoK3Xk3StQcFbpBPNEvoWD59436Hg=="; }; }; "capital-case-1.0.3" = { @@ -10579,13 +10840,13 @@ let sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074"; }; }; - "chloride-2.2.14" = { + "chloride-2.3.0" = { name = "chloride"; packageName = "chloride"; - version = "2.2.14"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/chloride/-/chloride-2.2.14.tgz"; - sha512 = "Jp3kpDIO4MlcJCFi4jER9P7k3sAVvIwbe4QJtM9Nkp43e/GQ/98HU1wJS6NdU6cbzfGrKWmMdRB+VNRrCynzfw=="; + url = "https://registry.npmjs.org/chloride/-/chloride-2.3.0.tgz"; + sha512 = "9jcavUx9ZNW9hxkG24rS9QddHpOqLAZqcb5SRbABRa8NKcplBKKcZfNM5LMa3DQ/VfXBQzcLDjgSo3uHA1ibZg=="; }; }; "chloride-test-1.2.4" = { @@ -10633,31 +10894,13 @@ let sha512 = "c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA=="; }; }; - "chokidar-3.3.1" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.3.1.tgz"; - sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg=="; - }; - }; - "chokidar-3.4.0" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"; - sha512 = "aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="; - }; - }; - "chokidar-3.4.1" = { + "chokidar-3.4.2" = { name = "chokidar"; packageName = "chokidar"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.1.tgz"; - sha512 = "TQTJyr2stihpC4Sya9hs2Xh+O2wf+igjL36Y75xx2WdHuiICcn/XJza46Jwt0eT5hVpQOzo3FpY3cj3RVYLX0g=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.4.2.tgz"; + sha512 = "IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A=="; }; }; "chownr-0.0.2" = { @@ -10894,15 +11137,6 @@ let sha1 = "bf1945e82fc808f55695e6ddeaec01400efd03ff"; }; }; - "clean-css-4.2.1" = { - name = "clean-css"; - packageName = "clean-css"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.1.tgz"; - sha512 = "4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g=="; - }; - }; "clean-css-4.2.3" = { name = "clean-css"; packageName = "clean-css"; @@ -10912,6 +11146,15 @@ let sha512 = "VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA=="; }; }; + "clean-deep-3.4.0" = { + name = "clean-deep"; + packageName = "clean-deep"; + version = "3.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/clean-deep/-/clean-deep-3.4.0.tgz"; + sha512 = "Lo78NV5ItJL/jl+B5w0BycAisaieJGXK1qYi/9m4SjR8zbqmrUtO7Yhro40wEShGmmxs/aJLI/A+jNhdkXK8mw=="; + }; + }; "clean-git-ref-2.0.1" = { name = "clean-git-ref"; packageName = "clean-git-ref"; @@ -11119,6 +11362,15 @@ let sha512 = "/1owvF0SZ5Gn54cgrikJ0QskgTzeg30HGjkmjFoaHDJzAqFpuX1DBpFR8aLvsE1J5s9MgeYRENQK4BFwOag5VA=="; }; }; + "cli-ux-5.4.10" = { + name = "cli-ux"; + packageName = "cli-ux"; + version = "5.4.10"; + src = fetchurl { + url = "https://registry.npmjs.org/cli-ux/-/cli-ux-5.4.10.tgz"; + sha512 = "s48Efw04VtGyQEwXDrERobMc2DF2DyYQ+2nmNsM7clxOVDtbRI9OjbXRwPeS6G2aFuHy0bB8GUq5MzkmkYt7yw=="; + }; + }; "cli-ux-5.4.9" = { name = "cli-ux"; packageName = "cli-ux"; @@ -11317,15 +11569,6 @@ let sha1 = "4af2296d4a23a64168c2f5fb0a2aa65e80517000"; }; }; - "clone-0.2.0" = { - name = "clone"; - packageName = "clone"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; - sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; - }; - }; "clone-1.0.4" = { name = "clone"; packageName = "clone"; @@ -11533,6 +11776,15 @@ let sha512 = "cadkfKp6932H8UkhzE/gcUqhRMNf8jHzkAN7+5Myabswaghu4xABTgPHDCjW+dBAJxj/SpkTYokpzDqY4pCzQw=="; }; }; + "code-excerpt-3.0.0" = { + name = "code-excerpt"; + packageName = "code-excerpt"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/code-excerpt/-/code-excerpt-3.0.0.tgz"; + sha512 = "VHNTVhd7KsLGOqfX3SyeO8RyYPMp1GJOg194VITk04WMYCv4plV68YWe6TJZxd9MhobjtpMRnVky01gqZsalaw=="; + }; + }; "code-point-at-1.1.0" = { name = "code-point-at"; packageName = "code-point-at"; @@ -11956,6 +12208,15 @@ let sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4"; }; }; + "commander-3.0.2" = { + name = "commander"; + packageName = "commander"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-3.0.2.tgz"; + sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; + }; + }; "commander-4.1.0" = { name = "commander"; packageName = "commander"; @@ -12010,6 +12271,15 @@ let sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg=="; }; }; + "common-path-prefix-2.0.0" = { + name = "common-path-prefix"; + packageName = "common-path-prefix"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-2.0.0.tgz"; + sha512 = "Lb9qbwwyQdRDmyib0qur7BC9/GHIbviTaQebayFsGC/n77AwFhZINCcJkQx2qVv9LJsA8F5ex65F2qrOfWGUyw=="; + }; + }; "common-tags-1.8.0" = { name = "common-tags"; packageName = "common-tags"; @@ -12199,6 +12469,15 @@ let sha512 = "MWufYdFw53ccGjCA+Ol7XJYpAlW6/prSMzuPOTRnJGcGzuhLn4Scrz7qf6o8bROZ514ltazcIFJZevcfbo0x7A=="; }; }; + "concordance-4.0.0" = { + name = "concordance"; + packageName = "concordance"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/concordance/-/concordance-4.0.0.tgz"; + sha512 = "l0RFuB8RLfCS0Pt2Id39/oCPykE01pyxgAFypWTlaGRgvLkZrtczZ8atEHpTeEIW+zYWXTBuA9cCSeEOScxReQ=="; + }; + }; "conf-1.4.0" = { name = "conf"; packageName = "conf"; @@ -12208,13 +12487,13 @@ let sha512 = "bzlVWS2THbMetHqXKB8ypsXN4DQ/1qopGwNJi1eYbpwesJcd86FBjFciCQX/YwAhp9bM7NVnPFqZ5LpV7gP0Dg=="; }; }; - "conf-6.2.4" = { + "conf-7.1.2" = { name = "conf"; packageName = "conf"; - version = "6.2.4"; + version = "7.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/conf/-/conf-6.2.4.tgz"; - sha512 = "GjgyPRLo1qK1LR9RWAdUagqo+DP18f5HWCFk4va7GS+wpxQTOzfuKTwKOvGW2c01/YXNicAyyoyuSddmdkBzZQ=="; + url = "https://registry.npmjs.org/conf/-/conf-7.1.2.tgz"; + sha512 = "r8/HEoWPFn4CztjhMJaWNAe5n+gPUCSaJ0oufbqDLFKsA1V8JjAG7G+p0pgoDFAws9Bpk2VtVLLXqOBA7WxLeg=="; }; }; "config-1.31.0" = { @@ -12235,13 +12514,13 @@ let sha512 = "a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA=="; }; }; - "configstore-3.1.2" = { + "configstore-3.1.5" = { name = "configstore"; packageName = "configstore"; - version = "3.1.2"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz"; - sha512 = "vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw=="; + url = "https://registry.npmjs.org/configstore/-/configstore-3.1.5.tgz"; + sha512 = "nlOhI4+fdzoK5xmJ+NY+1gZK56bwEaWZr8fYuXohZ9Vkc1o3a4T/R3M+yE/w7x/ZVJ1zF8c+oaOvF0dztdUgmA=="; }; }; "configstore-4.0.0" = { @@ -12379,6 +12658,15 @@ let sha1 = "5a25047bc76f73072667c8cb52c989888f494c63"; }; }; + "consolidate-0.15.1" = { + name = "consolidate"; + packageName = "consolidate"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz"; + sha512 = "DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw=="; + }; + }; "constant-case-3.0.3" = { name = "constant-case"; packageName = "constant-case"; @@ -12623,6 +12911,15 @@ let sha1 = "f67a4938c5233443564250479c67014bac878499"; }; }; + "convert-to-spaces-1.0.2" = { + name = "convert-to-spaces"; + packageName = "convert-to-spaces"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-1.0.2.tgz"; + sha1 = "7e3e48bbe6d997b1417ddca2868204b4d3d85715"; + }; + }; "convict-6.0.0" = { name = "convict"; packageName = "convict"; @@ -12767,6 +13064,15 @@ let sha512 = "7cjuUME+p+S3HZlbllgsn2CDwS+5eCCX16qBgNC4jgSTf49qR1VKy/Zhl400m0IQXl/bPGEVqncgUUMjrr4s8A=="; }; }; + "copy-template-dir-1.4.0" = { + name = "copy-template-dir"; + packageName = "copy-template-dir"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/copy-template-dir/-/copy-template-dir-1.4.0.tgz"; + sha512 = "xkXSJhvKz4MfLbVkZ7GyCaFo4ciB3uKI/HHzkGwj1eyTH5+7RTFxW5CE0irWAZgV5oFcO9hd6+NVXAtY9hlo7Q=="; + }; + }; "cordova-app-hello-world-5.0.0" = { name = "cordova-app-hello-world"; packageName = "cordova-app-hello-world"; @@ -12938,6 +13244,15 @@ let sha1 = "aba6c5833be410d45b1eca3e6d583844ce682c77"; }; }; + "cp-file-6.2.0" = { + name = "cp-file"; + packageName = "cp-file"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cp-file/-/cp-file-6.2.0.tgz"; + sha512 = "fmvV4caBnofhPe8kOcitBwSn2f39QLjnAnGq3gO9dfd75mUytzKNZB1hde6QHunW2Rt+OwuBOMc3i1tNElbszA=="; + }; + }; "cp-file-7.0.0" = { name = "cp-file"; packageName = "cp-file"; @@ -13010,15 +13325,6 @@ let sha512 = "mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A=="; }; }; - "create-emotion-9.2.12" = { - name = "create-emotion"; - packageName = "create-emotion"; - version = "9.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/create-emotion/-/create-emotion-9.2.12.tgz"; - sha512 = "P57uOF9NL2y98Xrbl2OuiDQUZ30GVmASsv5fbsjF4Hlraip2kyAvMm+2PoYUvFFw03Fhgtxk3RqZSm2/qHL9hA=="; - }; - }; "create-error-class-3.0.2" = { name = "create-error-class"; packageName = "create-error-class"; @@ -13586,13 +13892,13 @@ let sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; }; }; - "cuss-1.20.0" = { + "cuss-1.21.0" = { name = "cuss"; packageName = "cuss"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/cuss/-/cuss-1.20.0.tgz"; - sha512 = "ca6Z5roeWhHgXeDLn0g3SLrG68Cb9922MvHme7Q/dz4XfwuxcBLalW4RqFUyZOiczzAqKc2XVtR2Kof+sIfinQ=="; + url = "https://registry.npmjs.org/cuss/-/cuss-1.21.0.tgz"; + sha512 = "X3VvImImJ5q6w0wOgJtxAX+RC06d26egp/A/vdSxqOrsRtAA9biXAkc4PZGj/3gx0+z+gDFri6BpcpwuG1/UEw=="; }; }; "custom-error-instance-2.1.1" = { @@ -13892,6 +14198,15 @@ let sha1 = "eaf439fd4d4848ad74e5cc7dbef200672b9e345b"; }; }; + "date-time-2.1.0" = { + name = "date-time"; + packageName = "date-time"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/date-time/-/date-time-2.1.0.tgz"; + sha512 = "/9+C44X7lot0IeiyfgJmETtRMhBidBYM2QFFIkGa0U1k+hSyY87Nw7PY3eDqpvCBm7I3WCSfPeZskW/YYq6m4g=="; + }; + }; "dateformat-2.2.0" = { name = "dateformat"; packageName = "dateformat"; @@ -13910,22 +14225,13 @@ let sha512 = "jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q=="; }; }; - "dayjs-1.8.32" = { + "dayjs-1.8.34" = { name = "dayjs"; packageName = "dayjs"; - version = "1.8.32"; - src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.32.tgz"; - sha512 = "V91aTRu5btP+uzGHaaOfodckEfBWhmi9foRP7cauAO1PTB8+tZ9o0Jec7q6TIIRY1N4q1IfiKsZunkB/AEWqMQ=="; - }; - }; - "de-indent-1.0.2" = { - name = "de-indent"; - packageName = "de-indent"; - version = "1.0.2"; + version = "1.8.34"; src = fetchurl { - url = "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz"; - sha1 = "b2038e846dc33baa5796128d0804b455b8c1e21d"; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.8.34.tgz"; + sha512 = "Olb+E6EoMvdPmAMq2QoucuyZycKHjTlBXmRx8Ada+wGtq4SIXuDCdtoaX4KkK0yjf1fJLnwXQURr8gQKWKaybw=="; }; }; "deasync-0.1.15" = { @@ -13964,13 +14270,13 @@ let sha512 = "mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg=="; }; }; - "debounce-fn-3.0.1" = { + "debounce-fn-4.0.0" = { name = "debounce-fn"; packageName = "debounce-fn"; - version = "3.0.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-3.0.1.tgz"; - sha512 = "aBoJh5AhpqlRoHZjHmOzZlRx+wz2xVwGL9rjs+Kj0EWUrL4/h4K7OD176thl2Tdoqui/AaA4xhHrNArGLAaI3Q=="; + url = "https://registry.npmjs.org/debounce-fn/-/debounce-fn-4.0.0.tgz"; + sha512 = "8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ=="; }; }; "debounced-seeker-1.0.0" = { @@ -14063,15 +14369,6 @@ let sha512 = "IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg=="; }; }; - "debug-fabulous-1.1.0" = { - name = "debug-fabulous"; - packageName = "debug-fabulous"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug-fabulous/-/debug-fabulous-1.1.0.tgz"; - sha512 = "GZqvGIgKNlUnHUPQhepnUZFIMoi3dgZKQBzKDeL2g7oJF9SNAji/AAu36dusFUas0O+pae74lNeoIPHqXWDkLg=="; - }; - }; "debuglog-1.0.1" = { name = "debuglog"; packageName = "debuglog"; @@ -14162,15 +14459,6 @@ let sha512 = "jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="; }; }; - "decompress-response-5.0.0" = { - name = "decompress-response"; - packageName = "decompress-response"; - version = "5.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decompress-response/-/decompress-response-5.0.0.tgz"; - sha512 = "TLZWWybuxWgoW7Lykv+gq9xvzOsUjQ9tF09Tj6NSTYGMTCHNXzrPnD6Hi+TgZq19PyTAGH4Ll/NIM/eTGglnMw=="; - }; - }; "decompress-response-6.0.0" = { name = "decompress-response"; packageName = "decompress-response"; @@ -14459,15 +14747,6 @@ let sha512 = "8eluCl/Blx4YOGwMapBvXRKxHXhA8ejDXYzEaK8+/gtcm8hRMhSLmXSqDmNUKNc/C8HNSmuyyp/hflhqDAvK2A=="; }; }; - "deferred-leveldown-0.2.0" = { - name = "deferred-leveldown"; - packageName = "deferred-leveldown"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz"; - sha1 = "2cef1f111e1c57870d8bbb8af2650e587cd2f5b4"; - }; - }; "deferred-leveldown-5.3.0" = { name = "deferred-leveldown"; packageName = "deferred-leveldown"; @@ -14666,15 +14945,6 @@ let sha512 = "9YLIBURXj4DJMFALxXw9K3Y3rwb5Fk0X5/8ipCzaN84+gKxoHK43tVKRNakCQbiEx07E8Uwhuq21BpUagFhZ8w=="; }; }; - "deprecated-0.0.1" = { - name = "deprecated"; - packageName = "deprecated"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/deprecated/-/deprecated-0.0.1.tgz"; - sha1 = "f9c9af5464afa1e7a971458a8bdef2aa94d5bb19"; - }; - }; "deprecated-decorator-0.1.6" = { name = "deprecated-decorator"; packageName = "deprecated-decorator"; @@ -14774,15 +15044,6 @@ let sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; }; }; - "detect-newline-2.1.0" = { - name = "detect-newline"; - packageName = "detect-newline"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/detect-newline/-/detect-newline-2.1.0.tgz"; - sha1 = "f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"; - }; - }; "detect-newline-3.1.0" = { name = "detect-newline"; packageName = "detect-newline"; @@ -14819,6 +15080,87 @@ let sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; + "detective-amd-3.0.0" = { + name = "detective-amd"; + packageName = "detective-amd"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.0.tgz"; + sha512 = "kOpKHyabdSKF9kj7PqYHLeHPw+TJT8q2u48tZYMkIcas28el1CYeLEJ42Nm+563/Fq060T5WknfwDhdX9+kkBQ=="; + }; + }; + "detective-cjs-3.1.1" = { + name = "detective-cjs"; + packageName = "detective-cjs"; + version = "3.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-cjs/-/detective-cjs-3.1.1.tgz"; + sha512 = "JQtNTBgFY6h8uT6pgph5QpV3IyxDv+z3qPk/FZRDT9TlFfm5dnRtpH39WtQEr1khqsUxVqXzKjZHpdoQvQbllg=="; + }; + }; + "detective-es6-2.2.0" = { + name = "detective-es6"; + packageName = "detective-es6"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-es6/-/detective-es6-2.2.0.tgz"; + sha512 = "fSpNY0SLER7/sVgQZ1NxJPwmc9uCTzNgdkQDhAaj8NPYwr7Qji9QBcmbNvtMCnuuOGMuKn3O7jv0An+/WRWJZQ=="; + }; + }; + "detective-less-1.0.2" = { + name = "detective-less"; + packageName = "detective-less"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-less/-/detective-less-1.0.2.tgz"; + sha512 = "Rps1xDkEEBSq3kLdsdnHZL1x2S4NGDcbrjmd4q+PykK5aJwDdP5MBgrJw1Xo+kyUHuv3JEzPqxr+Dj9ryeDRTA=="; + }; + }; + "detective-postcss-3.0.1" = { + name = "detective-postcss"; + packageName = "detective-postcss"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-postcss/-/detective-postcss-3.0.1.tgz"; + sha512 = "tfTS2GdpUal5NY0aCqI4dpEy8Xfr88AehYKB0iBIZvo8y2g3UsrcDnrp9PR2FbzoW7xD5Rip3NJW7eCSvtqdUw=="; + }; + }; + "detective-sass-3.0.1" = { + name = "detective-sass"; + packageName = "detective-sass"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-sass/-/detective-sass-3.0.1.tgz"; + sha512 = "oSbrBozRjJ+QFF4WJFbjPQKeakoaY1GiR380NPqwdbWYd5wfl5cLWv0l6LsJVqrgWfFN1bjFqSeo32Nxza8Lbw=="; + }; + }; + "detective-scss-2.0.1" = { + name = "detective-scss"; + packageName = "detective-scss"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-scss/-/detective-scss-2.0.1.tgz"; + sha512 = "VveyXW4WQE04s05KlJ8K0bG34jtHQVgTc9InspqoQxvnelj/rdgSAy7i2DXAazyQNFKlWSWbS+Ro2DWKFOKTPQ=="; + }; + }; + "detective-stylus-1.0.0" = { + name = "detective-stylus"; + packageName = "detective-stylus"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-stylus/-/detective-stylus-1.0.0.tgz"; + sha1 = "50aee7db8babb990381f010c63fabba5b58e54cd"; + }; + }; + "detective-typescript-5.8.0" = { + name = "detective-typescript"; + packageName = "detective-typescript"; + version = "5.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/detective-typescript/-/detective-typescript-5.8.0.tgz"; + sha512 = "SrsUCfCaDTF64QVMHMidRal+kmkbIc5zP8cxxZPsomWx9vuEUjBlSJNhf7/ypE5cLdJJDI4qzKDmyzqQ+iz/xg=="; + }; + }; "dezalgo-1.0.3" = { name = "dezalgo"; packageName = "dezalgo"; @@ -14918,13 +15260,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.1.11" = { + "diff2html-3.1.12" = { name = "diff2html"; packageName = "diff2html"; - version = "3.1.11"; + version = "3.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.11.tgz"; - sha512 = "EtzNnfhT4XzxIUvIw5mhUGxGYDzce9lxkqtSHWq4yas+UrEjwzm5A2pYIaFOikupbFITd9RaHpu0ocErJ1myRw=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.12.tgz"; + sha512 = "iUFPcwhsb2e6ng7ct9VGntOomhCb5qRy1tuSCz2RpTk/3Y0fRjfySHEeL95rYvWqawfGrj/7OjPR/kGOTIT/9w=="; }; }; "diff3-0.0.3" = { @@ -15188,15 +15530,6 @@ let sha512 = "cwaRptBmYZwu/FyhGcqBm2MzXA77W2/E6eVkpOZVDk6PkI9Bjj84xPrXiHMA+OWjzNy+DFjgKh8Q+1hMR7/OHg=="; }; }; - "dockerfile-ast-0.0.19" = { - name = "dockerfile-ast"; - packageName = "dockerfile-ast"; - version = "0.0.19"; - src = fetchurl { - url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.19.tgz"; - sha512 = "iDRNFeAB2j4rh/Ecc2gh3fjciVifCMsszfCfHlYF5Wv8yybjZLiRDZUBt/pS3xrAz8uWT8fCHLq4pOQMmwCDwA=="; - }; - }; "dockerfile-ast-0.0.27" = { name = "dockerfile-ast"; packageName = "dockerfile-ast"; @@ -15215,6 +15548,15 @@ let sha512 = "221P0R4+tx5C1ra99alQxmdRvtfKMbBE7MkESN4VEBN5CX90wijrcIg+EiRaGTCCT5OPk5KBeKy+EIOnmEu4xA=="; }; }; + "dockerfile-ast-0.0.30" = { + name = "dockerfile-ast"; + packageName = "dockerfile-ast"; + version = "0.0.30"; + src = fetchurl { + url = "https://registry.npmjs.org/dockerfile-ast/-/dockerfile-ast-0.0.30.tgz"; + sha512 = "QOeP5NjbjoSLtnMz6jzBLsrKtywLEVPoCOAwA54cQpulyKb1gBnZ63tr6Amq8oVDvu5PXa3aifBVw+wcoCGHKg=="; + }; + }; "dockerfile-language-service-0.1.0" = { name = "dockerfile-language-service"; packageName = "dockerfile-language-service"; @@ -15296,6 +15638,15 @@ let sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g=="; }; }; + "dom-serializer-1.0.1" = { + name = "dom-serializer"; + packageName = "dom-serializer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.0.1.tgz"; + sha512 = "1Aj1Qy3YLbdslkI75QEOfdp9TkQ3o8LRISAzxOibjBs/xWwr1WxZFOQphFkZuepHFGo+kB8e5FVJSS0faAJ4Rw=="; + }; + }; "dom-storage-2.1.0" = { name = "dom-storage"; packageName = "dom-storage"; @@ -15404,13 +15755,13 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-2.0.12" = { + "dompurify-1.0.11" = { name = "dompurify"; packageName = "dompurify"; - version = "2.0.12"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-2.0.12.tgz"; - sha512 = "Fl8KseK1imyhErHypFPA8qpq9gPzlsJ/EukA6yk9o0gX23p1TzC+rh9LqNg1qvErRTc0UNMYlKxEGSfSh43NDg=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-1.0.11.tgz"; + sha512 = "XywCTXZtc/qCX3iprD1pIklRVk/uhl8BKpkTxr+ZyMVUzSUg7wkQXRBp/euJ5J5moa1QvfpvaPQVP71z1O59dQ=="; }; }; "domutils-1.4.3" = { @@ -15440,13 +15791,13 @@ let sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; }; }; - "domutils-2.1.0" = { + "domutils-2.2.0" = { name = "domutils"; packageName = "domutils"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-2.1.0.tgz"; - sha512 = "CD9M0Dm1iaHfQ1R/TI+z3/JWp/pgub0j4jIQKH89ARR4ATAV2nbaOQS5XxU9maJP5jHaPdDDQSEHuE2UmpUTKg=="; + url = "https://registry.npmjs.org/domutils/-/domutils-2.2.0.tgz"; + sha512 = "0haAxVr1PR0SqYwCH7mxMpHZUwjih9oPPedqpR/KufsnxPyZ9dyVw1R5093qnJF3WXSbjBkdzRWLw/knJV/fAg=="; }; }; "dot-case-3.0.3" = { @@ -15458,13 +15809,13 @@ let sha512 = "7hwEmg6RiSQfm/GwPL4AAWXKy3YNNZA3oFv2Pdiey0mwkRCPZ9x6SZbkLcn8Ma5PYeVokzoD4Twv2n7LKp5WeA=="; }; }; - "dot-prop-4.2.0" = { + "dot-prop-4.2.1" = { name = "dot-prop"; packageName = "dot-prop"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz"; - sha512 = "tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ=="; + url = "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz"; + sha512 = "l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ=="; }; }; "dot-prop-5.2.0" = { @@ -15647,13 +15998,13 @@ let sha512 = "b7Z7cNtHPhH9EJhNNbbeqTcXB8LGFFZhq1PGgEvpeHlzd36bhbdTWoE/Ba/YguqpBSlAPKnARWhVlhunCMwfxg=="; }; }; - "duplexer-0.1.1" = { + "duplexer-0.1.2" = { name = "duplexer"; packageName = "duplexer"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + url = "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz"; + sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; }; "duplexer2-0.0.2" = { @@ -15863,22 +16214,22 @@ let sha512 = "7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA=="; }; }; - "ejs-3.1.3" = { + "ejs-3.1.5" = { name = "ejs"; packageName = "ejs"; - version = "3.1.3"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/ejs/-/ejs-3.1.3.tgz"; - sha512 = "wmtrUGyfSC23GC/B1SMv2ogAUgbQEtDmTIhfqielrG5ExIM9TP4UoYdi90jLF1aTcsWCJNEO0UrgKzP0y3nTSg=="; + url = "https://registry.npmjs.org/ejs/-/ejs-3.1.5.tgz"; + sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.520" = { + "electron-to-chromium-1.3.549" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.520"; + version = "1.3.549"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.520.tgz"; - sha512 = "q6H9E1sXDCjRHP+X06vcP+N0ki8ZvYoRPZfKnDuiRX10WWXxEHzKFVf4O9rBFMpuPtR3M+2KAdJnugJoBBp3Rw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.549.tgz"; + sha512 = "q09qZdginlqDH3+Y1P6ch5UDTW8nZ1ijwMkxFs15J/DAWOwqolIx8HZH1UP0vReByBigk/dPlU22xS1MaZ+kpQ=="; }; }; "elegant-spinner-1.0.1" = { @@ -15908,6 +16259,15 @@ let sha1 = "9ac91be6e52fb6e6244c4e54a4ac3ed8ae8e29c0"; }; }; + "elf-tools-1.1.2" = { + name = "elf-tools"; + packageName = "elf-tools"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/elf-tools/-/elf-tools-1.1.2.tgz"; + sha512 = "x+p+XNxLk8ittsYN7294mCnQ2i48udu3UGdHBv2gw1u1MVigXctcfbp5H9ebqTJnDxkbs6PdOSBOAdYGGDN7uA=="; + }; + }; "elliptic-6.5.3" = { name = "elliptic"; packageName = "elliptic"; @@ -16008,15 +16368,6 @@ let sha512 = "/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q=="; }; }; - "emotion-9.2.12" = { - name = "emotion"; - packageName = "emotion"; - version = "9.2.12"; - src = fetchurl { - url = "https://registry.npmjs.org/emotion/-/emotion-9.2.12.tgz"; - sha512 = "hcx7jppaI8VoXxIWEhxpDW7I+B4kq9RNzQLmsrF6LY8BGKqe2N+gFAQr0EfuFucFlPs2A9HM4+xNj4NeqEWIOQ=="; - }; - }; "emphasize-1.5.0" = { name = "emphasize"; packageName = "emphasize"; @@ -16323,13 +16674,13 @@ let sha512 = "jDgnJaF/Btomk+m3PZDTTCb5XIIIX3zYItnCRfF73zVgvinLoRomuhi75Y4su0PtQxWz4v66XnLLckyvyJTOIQ=="; }; }; - "envinfo-7.7.2" = { + "envinfo-7.7.3" = { name = "envinfo"; packageName = "envinfo"; - version = "7.7.2"; + version = "7.7.3"; src = fetchurl { - url = "https://registry.npmjs.org/envinfo/-/envinfo-7.7.2.tgz"; - sha512 = "k3Eh5bKuQnZjm49/L7H4cHzs2FlL5QjbTB3JrPxoTI8aJG7hVMe4uKyJxSYH4ahseby2waUwk5OaKX/nAsaYgg=="; + url = "https://registry.npmjs.org/envinfo/-/envinfo-7.7.3.tgz"; + sha512 = "46+j5QxbPWza0PB1i15nZx0xQ4I/EfQxg9J8Had3b408SV63nEtor2e+oiY63amTo9KTuh2a3XLObNwduxYwwA=="; }; }; "epidemic-broadcast-trees-7.0.0" = { @@ -16395,6 +16746,15 @@ let sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g=="; }; }; + "error-stack-parser-2.0.6" = { + name = "error-stack-parser"; + packageName = "error-stack-parser"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.6.tgz"; + sha512 = "d51brTeqC+BHlwF0BhPtcYgF5nlzf9ZZ0ZIUQNZpc9ZB9qw5IJ2diTrBY9jlCJkTLITYPjmiX6OWCwH+fuyNgQ=="; + }; + }; "errorhandler-1.5.1" = { name = "errorhandler"; packageName = "errorhandler"; @@ -16413,6 +16773,15 @@ let sha512 = "Fr89bON3WFyUi5EvAeI48QTWX0AyekGgLA8H+c+7fbfCkJwRWRMLd8CQedNEyJuoYYhmtEqY92pgte1FAhBlhw=="; }; }; + "es-abstract-1.18.0-next.0" = { + name = "es-abstract"; + packageName = "es-abstract"; + version = "1.18.0-next.0"; + src = fetchurl { + url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.0.tgz"; + sha512 = "elZXTZXKn51hUBdJjSZGYRujuzilgXo8vSPQzjGYXLvSlGiCo8VO8ZGV3kjo9a0WNJJ57hENagwbtlRuHuzkcQ=="; + }; + }; "es-array-method-boxes-properly-1.0.0" = { name = "es-array-method-boxes-properly"; packageName = "es-array-method-boxes-properly"; @@ -16746,13 +17115,13 @@ let sha512 = "vlUP10xse9sWt9SGRtcr1LAC67BENcQMFeV+w5EvLEoFe3xJ8cF1Skd0msziRx/VMC+72B4DxreCE+OR12OA6Q=="; }; }; - "eslint-7.6.0" = { + "eslint-7.7.0" = { name = "eslint"; packageName = "eslint"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz"; - sha512 = "QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz"; + sha512 = "1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg=="; }; }; "eslint-plugin-no-unsanitized-3.1.2" = { @@ -16773,6 +17142,15 @@ let sha512 = "Nhc+oVAHm0uz/PkJAWscwIT4ijTrK5fqNqz9QB1D35SbbuMG1uB6Yr5AJpvPSWg+WOw7nYNswerYh0kOk64gqQ=="; }; }; + "eslint-plugin-vue-7.0.0-beta.2" = { + name = "eslint-plugin-vue"; + packageName = "eslint-plugin-vue"; + version = "7.0.0-beta.2"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-7.0.0-beta.2.tgz"; + sha512 = "EpAVWT62JTM7Yo6IUJIaIvNMSuayDaMVMXv1SC96d1/7nyx18U0FrLRKpN2GdTY8Efi4UepgR75XW7ucSRiI7A=="; + }; + }; "eslint-scope-3.7.3" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -16890,6 +17268,15 @@ let sha512 = "H+cQ3+3JYRMEIOl87e7QdHX70ocly5iW4+dttuR8iYSPr/hXKFb+7dBsZ7+u1adC4VrnPlTkv0+OwuPnDop19g=="; }; }; + "espree-7.3.0" = { + name = "espree"; + packageName = "espree"; + version = "7.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz"; + sha512 = "dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw=="; + }; + }; "esprima-1.1.1" = { name = "esprima"; packageName = "esprima"; @@ -17007,13 +17394,13 @@ let sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw=="; }; }; - "estraverse-5.1.0" = { + "estraverse-5.2.0" = { name = "estraverse"; packageName = "estraverse"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-5.1.0.tgz"; - sha512 = "FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw=="; + url = "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz"; + sha512 = "BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ=="; }; }; "estree-walker-0.6.1" = { @@ -17034,6 +17421,15 @@ let sha512 = "1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg=="; }; }; + "estree-walker-2.0.1" = { + name = "estree-walker"; + packageName = "estree-walker"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.1.tgz"; + sha512 = "tF0hv+Yi2Ot1cwj9eYHtxC0jB9bmjacjQs6ZBTj82H8JwUywFuc+7E83NWfNMwHXZc11mjfFcVXPe9gEP4B8dg=="; + }; + }; "esutils-1.0.0" = { name = "esutils"; packageName = "esutils"; @@ -17178,15 +17574,6 @@ let sha1 = "1c86991d816ad1e504750e73874224ecf3bec508"; }; }; - "eventemitter3-2.0.3" = { - name = "eventemitter3"; - packageName = "eventemitter3"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz"; - sha1 = "b5e1079b59fb5e1ba2771c0a993be060a58c99ba"; - }; - }; "eventemitter3-3.1.2" = { name = "eventemitter3"; packageName = "eventemitter3"; @@ -17196,13 +17583,13 @@ let sha512 = "tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q=="; }; }; - "eventemitter3-4.0.4" = { + "eventemitter3-4.0.6" = { name = "eventemitter3"; packageName = "eventemitter3"; - version = "4.0.4"; + version = "4.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.4.tgz"; - sha512 = "rlaVLnVxtxvoyLsQQFBx53YmXHDxRIzzTLbdfxqi4yocpSjAxXwkU0cScM5JgSKMqEhrZpnvQ2D9gjylR0AimQ=="; + url = "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.6.tgz"; + sha512 = "s3GJL04SQoM+gn2c14oyqxvZ3Pcq7cduSDqy3sBFXx6UPSUmgVYwQM9zwkTn9je0lrfg0gHEwR42pF3Q2dCQkQ=="; }; }; "events-1.1.1" = { @@ -17331,6 +17718,15 @@ let sha512 = "adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA=="; }; }; + "execa-2.1.0" = { + name = "execa"; + packageName = "execa"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-2.1.0.tgz"; + sha512 = "Y/URAVapfbYy2Xp/gb6A0E7iR8xeqOCXsuuaoMn7A5PzrXUK84E1gyiEfq0wQd/GHA6GsoHWwhNq8anb0mleIw=="; + }; + }; "execa-3.4.0" = { name = "execa"; packageName = "execa"; @@ -17502,6 +17898,15 @@ let sha1 = "3a2ad27f7bebc90fc533d110d7c6d83097bcd057"; }; }; + "express-logging-1.1.1" = { + name = "express-logging"; + packageName = "express-logging"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express-logging/-/express-logging-1.1.1.tgz"; + sha1 = "62839618cbab5bb3610f1a1c1485352fe9d26c2a"; + }; + }; "express-normalize-query-params-middleware-0.5.1" = { name = "express-normalize-query-params-middleware"; packageName = "express-normalize-query-params-middleware"; @@ -17601,15 +18006,6 @@ let sha512 = "fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="; }; }; - "extend-shallow-1.1.4" = { - name = "extend-shallow"; - packageName = "extend-shallow"; - version = "1.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz"; - sha1 = "19d6bf94dfc09d76ba711f39b872d21ff4dd9071"; - }; - }; "extend-shallow-2.0.1" = { name = "extend-shallow"; packageName = "extend-shallow"; @@ -17844,6 +18240,15 @@ let sha512 = "xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w=="; }; }; + "fast-equals-1.6.3" = { + name = "fast-equals"; + packageName = "fast-equals"; + version = "1.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-equals/-/fast-equals-1.6.3.tgz"; + sha512 = "4WKW0AL5+WEqO0zWavAfYGY1qwLsBgE//DN4TTcVEN2UlINgkv9b3vm2iHicoenWKSX9mKWmGOsU/iI5IST7pQ=="; + }; + }; "fast-glob-2.2.7" = { name = "fast-glob"; packageName = "fast-glob"; @@ -17898,6 +18303,15 @@ let sha1 = "0178dcdee023b92905193af0959e8a7639cfdcb9"; }; }; + "fast-levenshtein-1.1.4" = { + name = "fast-levenshtein"; + packageName = "fast-levenshtein"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.1.4.tgz"; + sha1 = "e6a754cc8f15e58987aa9cbd27af66fd6f4e5af9"; + }; + }; "fast-levenshtein-2.0.6" = { name = "fast-levenshtein"; packageName = "fast-levenshtein"; @@ -17934,6 +18348,15 @@ let sha512 = "Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA=="; }; }; + "fast-stringify-1.1.2" = { + name = "fast-stringify"; + packageName = "fast-stringify"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-stringify/-/fast-stringify-1.1.2.tgz"; + sha512 = "SfslXjiH8km0WnRiuPfpUKwlZjW5I878qsOm+2x8x3TgqmElOOLh1rgJFb+PolNdNRK3r8urEefqx0wt7vx1dA=="; + }; + }; "fast-text-encoding-1.0.3" = { name = "fast-text-encoding"; packageName = "fast-text-encoding"; @@ -18114,6 +18537,15 @@ let sha512 = "bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g=="; }; }; + "file-size-0.0.5" = { + name = "file-size"; + packageName = "file-size"; + version = "0.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/file-size/-/file-size-0.0.5.tgz"; + sha1 = "057d43c3a3ed735da3f90d6052ab380f1e6d5e3b"; + }; + }; "file-type-10.11.0" = { name = "file-type"; packageName = "file-type"; @@ -18123,13 +18555,13 @@ let sha512 = "uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw=="; }; }; - "file-type-14.1.3" = { + "file-type-14.7.1" = { name = "file-type"; packageName = "file-type"; - version = "14.1.3"; + version = "14.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/file-type/-/file-type-14.1.3.tgz"; - sha512 = "fTTNfpY1QxlpKCrA5bRxZL/6f7+6jUCJkOCCzFkAI+tmLu5lfX+4Zo22GG1orRhVH7Dx0fHtMFXq0++NDjKn/w=="; + url = "https://registry.npmjs.org/file-type/-/file-type-14.7.1.tgz"; + sha512 = "sXAMgFk67fQLcetXustxfKX+PZgHIUFn96Xld9uH8aXPdX3xOp0/jg9OdouVTvQrf7mrn+wAa4jN/y9fUOOiRA=="; }; }; "file-type-3.9.0" = { @@ -18312,15 +18744,6 @@ let sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; }; }; - "find-index-0.1.1" = { - name = "find-index"; - packageName = "find-index"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/find-index/-/find-index-0.1.1.tgz"; - sha1 = "675d358b2ca3892d795a1ab47232f8b6e2e0dde4"; - }; - }; "find-process-1.4.3" = { name = "find-process"; packageName = "find-process"; @@ -18339,15 +18762,6 @@ let sha512 = "UME7hNwBfzeISSFQcBEDemEEskpOjI/shPrpJM5PI4DSdn6hX0dmz+2dL70blZER2z8tSnTRL+2rfzlYgtbBoQ=="; }; }; - "find-root-1.1.0" = { - name = "find-root"; - packageName = "find-root"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/find-root/-/find-root-1.1.0.tgz"; - sha512 = "NKfW6bec6GfKc0SGx1e07QZY9PE99u0Bft/0rzSD5k3sO/vwkVUpDUKVm5Gpp5Ue3YfShPFTX2070tDs5kB9Ng=="; - }; - }; "find-up-1.1.2" = { name = "find-up"; packageName = "find-up"; @@ -18384,6 +18798,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=="; + }; + }; "find-versions-2.0.0" = { name = "find-versions"; packageName = "find-versions"; @@ -18456,15 +18879,6 @@ let sha512 = "BPfcUISOV6+UwF6uqo5QS8iuFL6XZvHCm+1iuynIJ7fe1zea69Is77/n/098fp0a9sZ94lvT8rpYB15S/riSaA=="; }; }; - "first-chunk-stream-1.0.0" = { - name = "first-chunk-stream"; - packageName = "first-chunk-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz"; - sha1 = "59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"; - }; - }; "first-chunk-stream-2.0.0" = { name = "first-chunk-stream"; packageName = "first-chunk-stream"; @@ -18528,13 +18942,13 @@ let sha512 = "Px/TiLIznH7gEDlPXcUD4KnBusa6kR6ayRUVcnEAbreRIuhkqow/mun59BuRXwoYk7ZQOLW1ZM05ilIvK38hFw=="; }; }; - "flat-5.0.0" = { + "flat-5.0.2" = { name = "flat"; packageName = "flat"; - version = "5.0.0"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/flat/-/flat-5.0.0.tgz"; - sha512 = "6KSMM+cHHzXC/hpldXApL2S8Uz+QZv+tq5o/L0KQYleoG+GcwrnIJhTWC7tCOiKQp8D/fIvryINU1OZCCwevjA=="; + url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz"; + sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ=="; }; }; "flat-cache-1.3.4" = { @@ -18609,6 +19023,15 @@ let sha1 = "554440766da0a0d603999f433453f6c2fc6a75c1"; }; }; + "flatten-1.0.3" = { + name = "flatten"; + packageName = "flatten"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz"; + sha512 = "dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg=="; + }; + }; "flow-bin-0.118.0" = { name = "flow-bin"; packageName = "flow-bin"; @@ -18618,13 +19041,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.130.0" = { + "flow-parser-0.132.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.130.0"; + version = "0.132.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.130.0.tgz"; - sha512 = "h9NATB7QsKhj2ucgEH2XzB7p+5ubk8IZX5u/qHkN+oyQoECi1diq6mYfIuYBOyL35f3AhJf/YDkBYQBTqqYK+w=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.132.0.tgz"; + sha512 = "y1P37zDCPSdphlk+w+roCqcOar6iQdNaAJldJ6xx5/2r4ZRv4KHO+qL+AXwPWp+34eN+oPxPjWnU7GybJnyISQ=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -18744,6 +19167,15 @@ let sha512 = "3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w=="; }; }; + "flush-write-stream-2.0.0" = { + name = "flush-write-stream"; + packageName = "flush-write-stream"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-2.0.0.tgz"; + sha512 = "uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g=="; + }; + }; "fn-name-2.0.1" = { name = "fn-name"; packageName = "fn-name"; @@ -18762,13 +19194,22 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.12.1" = { + "folder-walker-3.2.0" = { + name = "folder-walker"; + packageName = "folder-walker"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/folder-walker/-/folder-walker-3.2.0.tgz"; + sha512 = "VjAQdSLsl6AkpZNyrQJfO7BXLo4chnStqb055bumZMbRUPpVuPN3a4ktsnRCmrFZjtMlYLkyXiR5rAs4WOpC4Q=="; + }; + }; + "follow-redirects-1.13.0" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.12.1"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.12.1.tgz"; - sha512 = "tmRv0AVuR7ZyouUHLeNSiO6pqulF7dYa3s19c6t+wz9LD69/uSzdMxJ2S91nTI9U3rt/IldxpzMOFejp6f0hjg=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.13.0.tgz"; + sha512 = "aq6gF1BEKje4a9i9+5jimNFIpq4Q1WiwBToeRK5NvZBd/TRsmW8BsJfOEGkr76TbOyPVD3OVDN910EcUNtRYEA=="; }; }; "follow-redirects-1.5.10" = { @@ -18879,13 +19320,13 @@ let sha512 = "47VfT5AYpxn1bnsnH6UfpBWKpMVnSz42MZwH+hwz/wACd9THyUu/fRoCRIT758fzCAbRoHIlkVUAL+WmlxSKeg=="; }; }; - "fork-ts-checker-webpack-plugin-5.0.4" = { + "fork-ts-checker-webpack-plugin-5.1.0" = { name = "fork-ts-checker-webpack-plugin"; packageName = "fork-ts-checker-webpack-plugin"; - version = "5.0.4"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.0.4.tgz"; - sha512 = "nSEqM3KhAjTf8VmuZym2k6WadIasvXybJExFegqMJDkTrOBOY8yGjsXG2FGFJls3DOHtXKzrr3Bv0ZD1LaM7cA=="; + url = "https://registry.npmjs.org/fork-ts-checker-webpack-plugin/-/fork-ts-checker-webpack-plugin-5.1.0.tgz"; + sha512 = "vuKyEjSLGbhQbEr5bifXXOkr9iV73L6n72mHoHIv7okvrf7O7z6RKeplM6C6ATPsukoQivij+Ba1vcptL60Z2g=="; }; }; "form-data-1.0.0-rc3" = { @@ -19005,13 +19446,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.8.1" = { + "fp-ts-2.8.2" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.8.1"; + version = "2.8.2"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.1.tgz"; - sha512 = "HuA/6roEliHoBgEOLCKmGRcM90e2trW/ITZZ9d9P/ra7PreqQagC3Jg6OzqWkai13KUbG90b8QO9rHPBGK/ckw=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.2.tgz"; + sha512 = "YKLBW75Rp+L9DuY1jr7QO6mZLTmJjy7tOqSAMcB2q2kBomqLjBMyV7dotpcnZmUYY6khMsfgYWtPbUDOFcNmkA=="; }; }; "fragment-cache-0.2.1" = { @@ -19077,6 +19518,15 @@ let sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; }; }; + "from2-array-0.0.4" = { + name = "from2-array"; + packageName = "from2-array"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/from2-array/-/from2-array-0.0.4.tgz"; + sha1 = "eafc16b65f6e2719bcd57fdc1869005ac1332cd6"; + }; + }; "fs-capacitor-2.0.4" = { name = "fs-capacitor"; packageName = "fs-capacitor"; @@ -19392,13 +19842,22 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "fuse.js-3.6.1" = { + "fuse.js-6.4.1" = { name = "fuse.js"; packageName = "fuse.js"; - version = "3.6.1"; + version = "6.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-3.6.1.tgz"; - sha512 = "hT9yh/tiinkmirKrlv4KWOjztdoZo1mx9Qh4KvWqC7isoXwdUY3PNWUxceF4/qO9R6riA2C29jdTOeQOIROjgw=="; + url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.1.tgz"; + sha512 = "+hAS7KYgLXontDh/vqffs7wIBw0ceb9Sx8ywZQhOsiQGcSO5zInGhttWOUYQYlvV/yYMJOacQ129Xs3mP3+oZQ=="; + }; + }; + "fuzzy-0.1.3" = { + name = "fuzzy"; + packageName = "fuzzy"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fuzzy/-/fuzzy-0.1.3.tgz"; + sha1 = "4c76ec2ff0ac1a36a9dccf9a00df8623078d4ed8"; }; }; "fuzzy-search-3.2.1" = { @@ -19446,15 +19905,6 @@ let sha1 = "2c03405c7538c39d7eb37b317022e325fb018bf7"; }; }; - "gaze-0.5.2" = { - name = "gaze"; - packageName = "gaze"; - version = "0.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gaze/-/gaze-0.5.2.tgz"; - sha1 = "40b709537d24d1d45767db5a908689dfe69ac44f"; - }; - }; "gaze-1.1.3" = { name = "gaze"; packageName = "gaze"; @@ -19518,6 +19968,15 @@ let sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0"; }; }; + "generic-names-2.0.1" = { + name = "generic-names"; + packageName = "generic-names"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/generic-names/-/generic-names-2.0.1.tgz"; + sha512 = "kPCHWa1m9wGG/OwQpeweTwM/PYiQLrUIxXbt/P4Nic3LbGjCP0YwrALHW1uNLKZ0LIMg+RF+XRlj2ekT9ZlZAQ=="; + }; + }; "genfun-5.0.0" = { name = "genfun"; packageName = "genfun"; @@ -19536,6 +19995,15 @@ let sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; }; }; + "get-amd-module-type-3.0.0" = { + name = "get-amd-module-type"; + packageName = "get-amd-module-type"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/get-amd-module-type/-/get-amd-module-type-3.0.0.tgz"; + sha512 = "99Q7COuACPfVt18zH9N4VAMyb81S6TUgJm2NgV6ERtkh9VIkAaByZkW530wl3lLN5KTtSrK9jVLxYsoP5hQKsw=="; + }; + }; "get-assigned-identifiers-1.2.0" = { name = "get-assigned-identifiers"; packageName = "get-assigned-identifiers"; @@ -19617,6 +20085,15 @@ let sha512 = "/b3jarXkH8KJoOMQc3uVGHASwGLPq3gSFJ7tgJm2diza+bydJPTGOibin2steecKeOylE8oY2JERlVWkAJO6yw=="; }; }; + "get-port-5.1.1" = { + name = "get-port"; + packageName = "get-port"; + version = "5.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-port/-/get-port-5.1.1.tgz"; + sha512 = "g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ=="; + }; + }; "get-prototype-chain-1.0.1" = { name = "get-prototype-chain"; packageName = "get-prototype-chain"; @@ -19707,13 +20184,13 @@ let sha512 = "GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w=="; }; }; - "get-stream-5.1.0" = { + "get-stream-5.2.0" = { name = "get-stream"; packageName = "get-stream"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz"; - sha512 = "EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw=="; + url = "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz"; + sha512 = "nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA=="; }; }; "get-uri-2.0.4" = { @@ -19770,6 +20247,15 @@ let sha1 = "ee95be37106fd8748a96f8d1db4baea89e1bfa8a"; }; }; + "gh-release-fetch-1.0.3" = { + name = "gh-release-fetch"; + packageName = "gh-release-fetch"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/gh-release-fetch/-/gh-release-fetch-1.0.3.tgz"; + sha512 = "Av+27/G9dJT5iPjFGZcHbjKJcTO1FrGIFQ3e8//9PJtNbK1QKbtm++R/rn8+OXH5ebtMGtXcVdyZrQLyf16i7g=="; + }; + }; "git-apply-delta-0.0.7" = { name = "git-apply-delta"; packageName = "git-apply-delta"; @@ -19851,6 +20337,15 @@ let sha1 = "7f51b804924d6c603fc142e3302998d4e0b4d906"; }; }; + "git-repo-info-2.1.1" = { + name = "git-repo-info"; + packageName = "git-repo-info"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/git-repo-info/-/git-repo-info-2.1.1.tgz"; + sha512 = "8aCohiDo4jwjOwma4FmYFd3i97urZulL8XL24nIPxuE+GZnfsAyy/g2Shqx6OjUiFKUXZM+Yy+KHnOmmA3FVcg=="; + }; + }; "git-rev-sync-2.0.0" = { name = "git-rev-sync"; packageName = "git-rev-sync"; @@ -19887,13 +20382,13 @@ let sha512 = "8mqO63M60lCiNR+6ROvXuX4VI6pVAru4wMn3uUfxq0xmpNwrZYC4Rkrt5rSGUPumJ43ZUJyeMXXq60v03PUY/g=="; }; }; - "git-up-4.0.1" = { + "git-up-4.0.2" = { name = "git-up"; packageName = "git-up"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/git-up/-/git-up-4.0.1.tgz"; - sha512 = "LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw=="; + url = "https://registry.npmjs.org/git-up/-/git-up-4.0.2.tgz"; + sha512 = "kbuvus1dWQB2sSW4cbfTeGpCMd8ge9jx9RKnhXhuJ7tnvT+NIrTVfYZxjtflZddQYcmdOTlkAcjmx7bor+15AQ=="; }; }; "git-url-parse-11.1.2" = { @@ -19905,6 +20400,15 @@ let sha512 = "gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ=="; }; }; + "git-url-parse-11.1.3" = { + name = "git-url-parse"; + packageName = "git-url-parse"; + version = "11.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.1.3.tgz"; + sha512 = "GPsfwticcu52WQ+eHp0IYkAyaOASgYdtsQDIt4rUp6GbiNt1P9ddrh3O0kQB0eD4UJZszVqNT3+9Zwcg40fywA=="; + }; + }; "gitconfiglocal-1.0.0" = { name = "gitconfiglocal"; packageName = "gitconfiglocal"; @@ -19914,6 +20418,15 @@ let sha1 = "41d045f3851a5ea88f03f24ca1c6178114464b9b"; }; }; + "gitconfiglocal-2.1.0" = { + name = "gitconfiglocal"; + packageName = "gitconfiglocal"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/gitconfiglocal/-/gitconfiglocal-2.1.0.tgz"; + sha512 = "qoerOEliJn3z+Zyn1HW2F6eoYJqKwS6MgC9cztTLUB/xLWX8gD/6T60pKn4+t/d6tP7JlybI7Z3z+I572CR/Vg=="; + }; + }; "github-from-package-0.0.0" = { name = "github-from-package"; packageName = "github-from-package"; @@ -19950,15 +20463,6 @@ let sha512 = "0YCjVpE3pS5XWlN3J4X7AiAx65+nqAI54LndtVFnQZB6G/FVLkZH8y8V6R3cIoOQR4pUdfwQGd1iwyoXHJ4Qfw=="; }; }; - "glob-3.1.21" = { - name = "glob"; - packageName = "glob"; - version = "3.1.21"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-3.1.21.tgz"; - sha1 = "d29e0a055dea5138f4d07ed40e8982e83c2066cd"; - }; - }; "glob-3.2.11" = { name = "glob"; packageName = "glob"; @@ -19968,15 +20472,6 @@ let sha1 = "4a973f635b9190f715d10987d5c00fd2815ebe3d"; }; }; - "glob-4.5.3" = { - name = "glob"; - packageName = "glob"; - version = "4.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-4.5.3.tgz"; - sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f"; - }; - }; "glob-5.0.15" = { name = "glob"; packageName = "glob"; @@ -20067,15 +20562,6 @@ let sha512 = "FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ=="; }; }; - "glob-stream-3.1.18" = { - name = "glob-stream"; - packageName = "glob-stream"; - version = "3.1.18"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; - sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; - }; - }; "glob-stream-6.1.0" = { name = "glob-stream"; packageName = "glob-stream"; @@ -20094,15 +20580,6 @@ let sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; }; }; - "glob-watcher-0.0.6" = { - name = "glob-watcher"; - packageName = "glob-watcher"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-0.0.6.tgz"; - sha1 = "b95b4a8df74b39c83298b0c05c978b4d9a3b710b"; - }; - }; "glob-watcher-5.0.5" = { name = "glob-watcher"; packageName = "glob-watcher"; @@ -20112,15 +20589,6 @@ let sha512 = "zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw=="; }; }; - "glob2base-0.0.12" = { - name = "glob2base"; - packageName = "glob2base"; - version = "0.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/glob2base/-/glob2base-0.0.12.tgz"; - sha1 = "9d419b3e28f12e83a362164a277055922c9c0d56"; - }; - }; "global-4.3.2" = { name = "global"; packageName = "global"; @@ -20130,6 +20598,15 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; + "global-4.4.0" = { + name = "global"; + packageName = "global"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/global/-/global-4.4.0.tgz"; + sha512 = "wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w=="; + }; + }; "global-agent-2.1.12" = { name = "global-agent"; packageName = "global-agent"; @@ -20139,6 +20616,15 @@ let sha512 = "caAljRMS/qcDo69X9BfkgrihGUgGx44Fb4QQToNQjsiWh+YlQ66uqYVAdA8Olqit+5Ng0nkz09je3ZzANMZcjg=="; }; }; + "global-cache-dir-1.0.1" = { + name = "global-cache-dir"; + packageName = "global-cache-dir"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/global-cache-dir/-/global-cache-dir-1.0.1.tgz"; + sha512 = "wYGh6O3Xkx1LsMXQpObr/uu3PsFpbWhpbslgn9Xq52rbDZ6YOwJcQtU5R4lSEQgCDtXLItV9EH5X1F/VnBTAlw=="; + }; + }; "global-dirs-0.1.1" = { name = "global-dirs"; packageName = "global-dirs"; @@ -20365,15 +20851,6 @@ let sha512 = "uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg=="; }; }; - "globule-0.1.0" = { - name = "globule"; - packageName = "globule"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/globule/-/globule-0.1.0.tgz"; - sha1 = "d9c8edde1da79d125a151b79533b978676346ae5"; - }; - }; "globule-1.3.2" = { name = "globule"; packageName = "globule"; @@ -20446,31 +20923,22 @@ let sha1 = "d9430ba32f6a30218243884418767340aafc0400"; }; }; - "got-10.6.0" = { - name = "got"; - packageName = "got"; - version = "10.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-10.6.0.tgz"; - sha512 = "3LIdJNTdCFbbJc+h/EH0V5lpNpbJ6Bfwykk21lcQvQsEcrzdi/ltCyQehFHLzJ/ka0UMH4Slg0hkYvAZN9qUDg=="; - }; - }; - "got-10.7.0" = { + "got-11.4.0" = { name = "got"; packageName = "got"; - version = "10.7.0"; + version = "11.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-10.7.0.tgz"; - sha512 = "aWTDeNw9g+XqEZNcTjMMZSy7B7yE9toWOFYip7ofFTLleJhvZwUxxTxkTpKvF+p1SAA4VHmuEy7PiHTHyq8tJg=="; + url = "https://registry.npmjs.org/got/-/got-11.4.0.tgz"; + sha512 = "XysJZuZNVpaQ37Oo2LV90MIkPeYITehyy1A0QzO1JwOXm8EWuEf9eeGk2XuHePvLEGnm9AVOI37bHwD6KYyBtg=="; }; }; - "got-11.5.1" = { + "got-11.5.2" = { name = "got"; packageName = "got"; - version = "11.5.1"; + version = "11.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.5.1.tgz"; - sha512 = "reQEZcEBMTGnujmQ+Wm97mJs/OK6INtO6HmLI+xt3+9CvnRwWjXutUvb2mqr+Ao4Lu05Rx6+udx9sOQAmExMxA=="; + url = "https://registry.npmjs.org/got/-/got-11.5.2.tgz"; + sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; "got-6.7.1" = { @@ -20761,24 +21229,6 @@ let sha512 = "cHwsLqoighpu7TuYj5RonnEuxGVFnztcUqTqp5rXFGYL4OuPFofwC4Ycg7n9fYwvK6F5WbYgeVOwph9Crs2fsQ=="; }; }; - "gulp-3.9.1" = { - name = "gulp"; - packageName = "gulp"; - version = "3.9.1"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp/-/gulp-3.9.1.tgz"; - sha1 = "571ce45928dd40af6514fc4011866016c13845b4"; - }; - }; - "gulp-clean-css-3.10.0" = { - name = "gulp-clean-css"; - packageName = "gulp-clean-css"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-clean-css/-/gulp-clean-css-3.10.0.tgz"; - sha512 = "7Isf9Y690o/Q5MVjEylH1H7L8WeZ89woW7DnhD5unTintOdZb67KdOayRgp9trUFo+f9UyJtuatV42e/+kghPg=="; - }; - }; "gulp-cli-2.3.0" = { name = "gulp-cli"; packageName = "gulp-cli"; @@ -20797,42 +21247,6 @@ let sha1 = "04e57e3e18c6974267c12cf6855dc717d4a313bd"; }; }; - "gulp-less-3.5.0" = { - name = "gulp-less"; - packageName = "gulp-less"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-less/-/gulp-less-3.5.0.tgz"; - sha512 = "FQLY7unaHdTOXG0jlwxeBQcWoPPrTMQZRA7HfYwSNi9IPVx5l7GJEN72mG4ri2yigp/f/VNGUAJnFMJHBmH3iw=="; - }; - }; - "gulp-sourcemaps-2.6.5" = { - name = "gulp-sourcemaps"; - packageName = "gulp-sourcemaps"; - version = "2.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-2.6.5.tgz"; - sha512 = "SYLBRzPTew8T5Suh2U8jCSDKY+4NARua4aqjj8HOysBh2tSgT9u4jc1FYirAdPx1akUxxDeK++fqw6Jg0LkQRg=="; - }; - }; - "gulp-typescript-4.0.2" = { - name = "gulp-typescript"; - packageName = "gulp-typescript"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-typescript/-/gulp-typescript-4.0.2.tgz"; - sha512 = "Hhbn5Aa2l3T+tnn0KqsG6RRJmcYEsr3byTL2nBpNBeAK8pqug9Od4AwddU4JEI+hRw7mzZyjRbB8DDWR6paGVA=="; - }; - }; - "gulp-uglify-3.0.2" = { - name = "gulp-uglify"; - packageName = "gulp-uglify"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/gulp-uglify/-/gulp-uglify-3.0.2.tgz"; - sha512 = "gk1dhB74AkV2kzqPMQBLA3jPoIAPd/nlNzP2XMDSG8XZrqnlCiDGAqC+rZOumzFvB5zOphlFh6yr3lgcAb/OOg=="; - }; - }; "gulp-util-3.0.8" = { name = "gulp-util"; packageName = "gulp-util"; @@ -21211,6 +21625,15 @@ let sha1 = "78d7cbfc1e6d66303fe79837365984517b2f6ee1"; }; }; + "hasha-5.2.0" = { + name = "hasha"; + packageName = "hasha"; + version = "5.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz"; + sha512 = "2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw=="; + }; + }; "hasher-1.2.0" = { name = "hasher"; packageName = "hasher"; @@ -21247,13 +21670,13 @@ let sha512 = "0FfLHmfArWOizbdwjL+Rc9QIBzqP80juicNl4S4NEPq5OYWBCgYrtYDPUDoSyQQ9IQlBn9W7++fpYQNzZSq/wQ=="; }; }; - "hast-util-from-parse5-5.0.3" = { + "hast-util-from-parse5-6.0.0" = { name = "hast-util-from-parse5"; packageName = "hast-util-from-parse5"; - version = "5.0.3"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-5.0.3.tgz"; - sha512 = "gOc8UB99F6eWVWFtM9jUikjN7QkWxB3nY0df5Z0Zq1/Nkwl5V4hAAsl0tmwlgWl/1shlTF8DnNYLO8X6wRV9pA=="; + url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.0.tgz"; + sha512 = "3ZYnfKenbbkhhNdmOQqgH10vnvPivTdsOJCri+APn0Kty+nRkDHArnaX9Hiaf8H+Ig+vkNptL+SRY/6RwWJk1Q=="; }; }; "hast-util-has-property-1.0.4" = { @@ -21274,13 +21697,13 @@ let sha512 = "mFblNpLvFbD8dG2Nw5dJBYZkxIHeph1JAh5yr4huI7T5m8cV0zaXNiqzKPX/JdjA+tIDF7c33u9cxK132KRjyQ=="; }; }; - "hast-util-is-element-1.0.4" = { + "hast-util-is-element-1.1.0" = { name = "hast-util-is-element"; packageName = "hast-util-is-element"; - version = "1.0.4"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.0.4.tgz"; - sha512 = "NFR6ljJRvDcyPP5SbV7MyPBgF47X3BsskLnmw1U34yL+X6YC0MoBx9EyMg8Jtx4FzGH95jw8+c1VPLHaRA0wDQ=="; + url = "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz"; + sha512 = "oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ=="; }; }; "hast-util-parse-selector-2.2.4" = { @@ -21914,6 +22337,15 @@ let sha512 = "yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q=="; }; }; + "http-proxy-middleware-0.21.0" = { + name = "http-proxy-middleware"; + packageName = "http-proxy-middleware"; + version = "0.21.0"; + src = fetchurl { + url = "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.21.0.tgz"; + sha512 = "4Arcl5QQ6pRMRJmtM1WVHKHkFAQn5uvw83XuNeqnMTOikDiCoTxv5/vdudhKQsF+1mtaAawrK2SEB1v2tYecdQ=="; + }; + }; "http-signature-0.11.0" = { name = "http-signature"; packageName = "http-signature"; @@ -22211,13 +22643,22 @@ let sha1 = "06ea6f83679a7749e386cfe1fe812ae5db223ded"; }; }; - "idb-kv-store-4.4.0" = { + "icss-utils-4.1.1" = { + name = "icss-utils"; + packageName = "icss-utils"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz"; + sha512 = "4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA=="; + }; + }; + "idb-kv-store-4.5.0" = { name = "idb-kv-store"; packageName = "idb-kv-store"; - version = "4.4.0"; + version = "4.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/idb-kv-store/-/idb-kv-store-4.4.0.tgz"; - sha1 = "22c56a8d5f90bd88f818a859db9c58627de278be"; + url = "https://registry.npmjs.org/idb-kv-store/-/idb-kv-store-4.5.0.tgz"; + sha512 = "snvtAQRforYUI+C2+45L2LBJy/0/uQUffxv8/uwiS98fSUoXHVrFPClgzWZWxT0drwkLHJRm9inZcYzTR42GLA=="; }; }; "ieee754-1.1.13" = { @@ -22409,13 +22850,13 @@ let sha1 = "97b38fd444114eec16824a935f8da575b57aa1ce"; }; }; - "import-jsx-3.1.0" = { + "import-jsx-4.0.0" = { name = "import-jsx"; packageName = "import-jsx"; - version = "3.1.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-jsx/-/import-jsx-3.1.0.tgz"; - sha512 = "lTuMdQ/mRXC+xQSGPDvAg1VkODlX78j5hZv2tneJ+zuo7GH/XhUF/YVKoeF382a4jO4GYw9jgganbMhEcxwb0g=="; + url = "https://registry.npmjs.org/import-jsx/-/import-jsx-4.0.0.tgz"; + sha512 = "CnjJ2BZFJzbFDmYG5S47xPQjMlSbZLyLJuG4znzL4TdPtJBxHtFP1xVmR+EYX4synFSldiY3B6m00XkPM3zVnA=="; }; }; "import-lazy-2.1.0" = { @@ -22526,15 +22967,6 @@ let sha1 = "82dc336d232b9062179d05ab3293a66059fd435d"; }; }; - "indx-0.2.3" = { - name = "indx"; - packageName = "indx"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/indx/-/indx-0.2.3.tgz"; - sha1 = "15dcf56ee9cf65c0234c513c27fbd580e70fbc50"; - }; - }; "infer-owner-1.0.4" = { name = "infer-owner"; packageName = "infer-owner"; @@ -22625,22 +23057,22 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "ink-2.7.1" = { + "ink-3.0.4" = { name = "ink"; packageName = "ink"; - version = "2.7.1"; + version = "3.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-2.7.1.tgz"; - sha512 = "s7lJuQDJEdjqtaIWhp3KYHl6WV3J04U9zoQ6wVc+Xoa06XM27SXUY57qC5DO46xkF0CfgXMKkKNcgvSu/SAEpA=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.4.tgz"; + sha512 = "WURr4mZoIZNaIqrgRHS1QKJsZdhs4UEeZ7IFvQgGCE7xCgtC+Svu7f7MoEuVz2hexCsmOdBKrkhMCRwFncSe1A=="; }; }; - "ink-text-input-3.3.0" = { + "ink-text-input-4.0.0" = { name = "ink-text-input"; packageName = "ink-text-input"; - version = "3.3.0"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-3.3.0.tgz"; - sha512 = "gO4wrOf2ie3YuEARTIwGlw37lMjFn3Gk6CKIDrMlHb46WFMagZU7DplohjM24zynlqfnXA5UDEIfC2NBcvD8kg=="; + url = "https://registry.npmjs.org/ink-text-input/-/ink-text-input-4.0.0.tgz"; + sha512 = "mzftl3MRUYEi4/lQQzjUGgmPtPIQgGbeedp6G9cDIGTQPMOiaklrCX8zWi9aY5n0OKoJpjmi3TR6eRBNNhCP8Q=="; }; }; "inline-source-map-0.6.2" = { @@ -22760,15 +23192,6 @@ let sha512 = "5fJMWEmikSYu0nv/flMc475MhGbB7TSPd/2IpFV4I4rMklboCH2rQjYY5kKiYGHqUF9gvaambupcJFFG9dvReg=="; }; }; - "inquirer-7.2.0" = { - name = "inquirer"; - packageName = "inquirer"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/inquirer/-/inquirer-7.2.0.tgz"; - sha512 = "E0c4rPwr9ByePfNlTIB8z51kK1s2n6jrHuJeEHENl/sbq2G/S1auvibgEwNR4uSyiU+PiYHqSwsgGiXjG8p5ZQ=="; - }; - }; "inquirer-7.3.3" = { name = "inquirer"; packageName = "inquirer"; @@ -22778,13 +23201,13 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "inquirer-autocomplete-prompt-1.0.2" = { + "inquirer-autocomplete-prompt-1.1.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.0.2.tgz"; - sha512 = "vNmAhhrOQwPnUm4B9kz1UB7P98rVF1z8txnjp53r40N0PBCuqoRWqjg3Tl0yz0UkDg7rEUtZ2OZpNc7jnOU9Zw=="; + url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.1.0.tgz"; + sha512 = "mrSeUSFGnTSid/DCKG+E+IcN4MaOnT2bW7NuSagZAguD4k3hZ0UladdYNP4EstZOwgeqv0C3M1zYa1QIIf0Oyg=="; }; }; "insert-module-globals-7.2.0" = { @@ -23066,13 +23489,22 @@ let sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; }; }; - "irc-framework-4.7.0" = { + "ipaddr.js-2.0.0" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.0.0.tgz"; + sha512 = "S54H9mIj0rbxRIyrDMEuuER86LdlgUg9FSeZ8duQb6CUG2iRrA36MYVQBSprTF/ZeAwvyQ5mDGuNvIPM0BIl3w=="; + }; + }; + "irc-framework-4.9.0" = { name = "irc-framework"; packageName = "irc-framework"; - version = "4.7.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.7.0.tgz"; - sha512 = "XKXQ8RDr6BpJb4xGIUxzkaeOApkaJCLfAuawAieBg4skD7EP2Ag2C1P/hPAJgLrIAVRKZqTpiWnQDx9gIzdLsA=="; + url = "https://registry.npmjs.org/irc-framework/-/irc-framework-4.9.0.tgz"; + sha512 = "cUYMnnKwcNpXtEw/CXnEwUtglmaWZbfu0E/0iI7bENC3bASPNfcvcyTsFQcdknpnoFLyh5kXpQCjPBWKTbOQAQ=="; }; }; "irc-replies-2.0.1" = { @@ -23480,6 +23912,15 @@ let sha1 = "39acaa6be7fd1f3471dc42c7416e61c24317ac9f"; }; }; + "is-expression-4.0.0" = { + name = "is-expression"; + packageName = "is-expression"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz"; + sha512 = "zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A=="; + }; + }; "is-extendable-0.1.1" = { name = "is-extendable"; packageName = "is-extendable"; @@ -23741,6 +24182,15 @@ let sha1 = "6910bca5da8c95e784b5751b976cf5a10fee36d2"; }; }; + "is-negative-zero-2.0.0" = { + name = "is-negative-zero"; + packageName = "is-negative-zero"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + }; "is-npm-1.0.0" = { name = "is-npm"; packageName = "is-npm"; @@ -23966,6 +24416,15 @@ let sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; }; }; + "is-promise-4.0.0" = { + name = "is-promise"; + packageName = "is-promise"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz"; + sha512 = "hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ=="; + }; + }; "is-property-1.0.2" = { name = "is-property"; packageName = "is-property"; @@ -24110,13 +24569,13 @@ let sha512 = "eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA=="; }; }; - "is-ssh-1.3.1" = { + "is-ssh-1.3.2" = { name = "is-ssh"; packageName = "is-ssh"; - version = "1.3.1"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.1.tgz"; - sha512 = "0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg=="; + url = "https://registry.npmjs.org/is-ssh/-/is-ssh-1.3.2.tgz"; + sha512 = "elEw0/0c2UscLrNG+OAorbP539E3rhliKPg+hDMWN9VwrDXfYK+4PBEykDPfxlYYtQvl84TascnQyobfQLHEhQ=="; }; }; "is-stream-1.1.0" = { @@ -24236,13 +24695,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-valid-domain-0.0.14" = { + "is-valid-domain-0.0.15" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.0.14"; + version = "0.0.15"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.14.tgz"; - sha512 = "MTUz/3y25zTtutAfwrLyFK+1l2IL4bcq2iHVdYHIPQbvBJLunlYu9dsQdtLwD9HKPDyxCDlKnSbGcRwvjVeCxA=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.15.tgz"; + sha512 = "Mcq4a6oLR+ugNyUlZ8WbuJBCm6hB50B6bgZcr0z7qm4mjbmw+WuqLAxR0eV+jnmtRcSSd++21wD4aQJZb7YZZg=="; }; }; "is-valid-glob-1.0.0" = { @@ -24407,6 +24866,15 @@ let sha512 = "zKqkK+O+dGqevc93KNsbZ/TqTUFd46MwWjYOoMrjIMZ51eU7DtQG3Wmd9SQQT7i7RVnuTPEiYEWHU3MSbxC1Tg=="; }; }; + "iserror-0.0.2" = { + name = "iserror"; + packageName = "iserror"; + version = "0.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/iserror/-/iserror-0.0.2.tgz"; + sha1 = "bd53451fe2f668b9f2402c1966787aaa2c7c0bf5"; + }; + }; "isexe-1.1.2" = { name = "isexe"; packageName = "isexe"; @@ -24614,13 +25082,13 @@ let sha1 = "dc5ebed10d04a5e0eaf49ef0009bec473d1a6b31"; }; }; - "jaeger-client-3.18.0" = { + "jaeger-client-3.18.1" = { name = "jaeger-client"; packageName = "jaeger-client"; - version = "3.18.0"; + version = "3.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.18.0.tgz"; - sha512 = "xZ9WvZDWLkZFq7SObpLwu1asMCKCgBRNcDxxGSvK+ZQ7OZyJC5xPlU+rJa4+s/P6autPBVwHpqMGbOERFxWuuA=="; + url = "https://registry.npmjs.org/jaeger-client/-/jaeger-client-3.18.1.tgz"; + sha512 = "eZLM2U6rJvYo0XbzQYFeMYfp29gQix7SKlmDReorp9hJkUwXZtTyxW81AcKdmFCjLHO5tFysTX+394BnjEnUZg=="; }; }; "jake-10.8.2" = { @@ -24659,6 +25127,15 @@ let sha1 = "7a549bbd9ffe1585b0cd0a191e203055bee574b4"; }; }; + "jest-get-type-24.9.0" = { + name = "jest-get-type"; + packageName = "jest-get-type"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-24.9.0.tgz"; + sha512 = "lUseMzAley4LhIcpSP9Jf+fTrQ4a1yHQwLNeeVa2cEmbCGeoZAtYPOIv8JaxLD/sUpKxetKGP+gsHl8f8TSj8Q=="; + }; + }; "jest-haste-map-25.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; @@ -24695,6 +25172,15 @@ let sha512 = "KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA=="; }; }; + "jest-validate-24.9.0" = { + name = "jest-validate"; + packageName = "jest-validate"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-24.9.0.tgz"; + sha512 = "HPIt6C5ACwiqSiwi+OfSSHbK8sG7akG8eATl+IPKaeIjtPOeBUd/g3J7DghugzxrGjI93qS/+RPKe1H6PqvhRQ=="; + }; + }; "jest-worker-25.5.0" = { name = "jest-worker"; packageName = "jest-worker"; @@ -24758,13 +25244,13 @@ let sha512 = "qL4+1iycQjZ1fs8zk3jSRk7cg3ROBUHk7GKtiLAQLFzLPKErnILUvz5DLszSQvz3s1sTjPbywLDISVUtBY6HaA=="; }; }; - "jpeg-js-0.4.1" = { + "jpeg-js-0.4.2" = { name = "jpeg-js"; packageName = "jpeg-js"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.1.tgz"; - sha512 = "jA55yJiB5tCXEddos8JBbvW+IMrqY0y1tjjx9KNVtA+QPmu7ND5j0zkKopClpUTsaETL135uOM2XfcYG4XRjmw=="; + url = "https://registry.npmjs.org/jpeg-js/-/jpeg-js-0.4.2.tgz"; + sha512 = "+az2gi/hvex7eLTMTlbRLOhH6P6WFdk2ITI8HJsaH2VqYO0I594zXSYEP+tf4FW+8Cy68ScDXoAsQdyQanv3sw=="; }; }; "jpeg-turbo-0.4.0" = { @@ -24794,13 +25280,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.17.6" = { + "jquery.terminal-2.18.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.17.6"; + version = "2.18.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.17.6.tgz"; - sha512 = "NPAxHodxrs6hLXNW9VAfijYkBFtoL/pyzpDDu2vX2slUyLekkUD9JBM4V0NcAuOvhB2eW4hLFChoYD5B2uu9Sg=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.18.2.tgz"; + sha512 = "i6vjYLg+VwJu7r5rXggGx9ezB2o2VeBbGfAooliIANNQDLZSgh095+TtB7NeO/eS1Nfu6vHrXj5AjPL5v+9I8w=="; }; }; "js-base64-2.6.4" = { @@ -24812,13 +25298,13 @@ let sha512 = "pZe//GGmwJndub7ZghVHz7vjb2LgC1m8B07Au3eYqeqv9emhESByMXxaEgkUkEqJe87oBbSniGYoQNIBklc7IQ=="; }; }; - "js-beautify-1.11.0" = { + "js-beautify-1.13.0" = { name = "js-beautify"; packageName = "js-beautify"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.11.0.tgz"; - sha512 = "a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz"; + sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA=="; }; }; "js-message-1.0.5" = { @@ -24884,15 +25370,6 @@ let sha512 = "RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="; }; }; - "js-yaml-3.13.1" = { - name = "js-yaml"; - packageName = "js-yaml"; - version = "3.13.1"; - src = fetchurl { - url = "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz"; - sha512 = "YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw=="; - }; - }; "js-yaml-3.14.0" = { name = "js-yaml"; packageName = "js-yaml"; @@ -25073,13 +25550,13 @@ let sha512 = "mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="; }; }; - "json-parse-even-better-errors-2.2.0" = { + "json-parse-even-better-errors-2.3.0" = { name = "json-parse-even-better-errors"; packageName = "json-parse-even-better-errors"; - version = "2.2.0"; + version = "2.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.2.0.tgz"; - sha512 = "2tLgY7LRNZ9Hd6gmCuBG5/OjRHQpSgJQqJoYyLLOhUgn8LdOYrjaZLcxkWnDads+AD/haWWioPNziXQcgvQJ/g=="; + url = "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.0.tgz"; + sha512 = "o3aP+RsWDJZayj1SbHNQAI8x0v3T3SKiGoZlNYfbUP1S3omJQ6i9CnqADqkSPaOAxwua4/1YWx5CM7oiChJt2Q=="; }; }; "json-parse-helpfulerror-1.0.3" = { @@ -25343,6 +25820,15 @@ let sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; }; }; + "jsonlines-0.1.1" = { + name = "jsonlines"; + packageName = "jsonlines"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonlines/-/jsonlines-0.1.1.tgz"; + sha1 = "4fcd246dc5d0e38691907c44ab002f782d1d94cc"; + }; + }; "jsonlint-1.6.2" = { name = "jsonlint"; packageName = "jsonlint"; @@ -25523,6 +26009,15 @@ let sha512 = "qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA=="; }; }; + "jwa-2.0.0" = { + name = "jwa"; + packageName = "jwa"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jwa/-/jwa-2.0.0.tgz"; + sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA=="; + }; + }; "jws-3.2.2" = { name = "jws"; packageName = "jws"; @@ -25532,6 +26027,15 @@ let sha512 = "YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA=="; }; }; + "jws-4.0.0" = { + name = "jws"; + packageName = "jws"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jws/-/jws-4.0.0.tgz"; + sha512 = "KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg=="; + }; + }; "jwt-decode-2.2.0" = { name = "jwt-decode"; packageName = "jwt-decode"; @@ -25677,6 +26181,15 @@ let sha1 = "44847ca394ce8d6b521ae85816bd64509942b385"; }; }; + "keep-func-props-3.0.1" = { + name = "keep-func-props"; + packageName = "keep-func-props"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/keep-func-props/-/keep-func-props-3.0.1.tgz"; + sha512 = "5AsrYCiCHIUxuw/G2r7xcoTW/NTf5IFwAe1fkwf2ifM/KZzEojaTylh1Pppu60oEixww1rfcWJaRGLi3eAJsrQ=="; + }; + }; "kew-0.7.0" = { name = "kew"; packageName = "kew"; @@ -25767,15 +26280,6 @@ let sha512 = "LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg=="; }; }; - "kind-of-1.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz"; - sha1 = "140a3d2d41a36d2efcfa9377b62c24f8495a5c44"; - }; - }; "kind-of-3.2.2" = { name = "kind-of"; packageName = "kind-of"; @@ -25920,6 +26424,15 @@ let sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw=="; }; }; + "lambda-local-1.7.3" = { + name = "lambda-local"; + packageName = "lambda-local"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/lambda-local/-/lambda-local-1.7.3.tgz"; + sha512 = "T+iwIkuQT0JvTQhvNBTikLhpEJk3ovNoC33niE4QNmYOUrCOdo86PcPkgppOZl+NJXXHebdPHDJ40zqBJ9VMzg=="; + }; + }; "last-one-wins-1.0.4" = { name = "last-one-wins"; packageName = "last-one-wins"; @@ -26082,13 +26595,13 @@ let sha1 = "544ff7032b7b83c68f0701328d9297aa694340f9"; }; }; - "ldapjs-2.0.0-pre.5" = { + "ldapjs-2.1.1" = { name = "ldapjs"; packageName = "ldapjs"; - version = "2.0.0-pre.5"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/ldapjs/-/ldapjs-2.0.0-pre.5.tgz"; - sha512 = "nmcSqdUjS7dzloToGCrSX3/TCdKJqLKUD+mMeo2K+NAkRkyn2iDZJRVusUFwFykXcaAr8hPX2qOKzc9PeTA4MQ=="; + url = "https://registry.npmjs.org/ldapjs/-/ldapjs-2.1.1.tgz"; + sha512 = "XzF2BEGeM/nenYDAJvkDMYovZ07fIGalrYD+suprSqUWPCWpoa+a4vWl5g8o/En85m6NHWBpirDFNClWLAd77w=="; }; }; "lead-1.0.0" = { @@ -26127,15 +26640,6 @@ let sha512 = "Tqyx4nggb9nkLD6p4hyIz7UiVNg5u3OnCP2h0hS/HXpheH88rsoNEgNB8xTnpPMw6zWXGZ7Cpg1zhWPlsJ0/TQ=="; }; }; - "less-2.7.3" = { - name = "less"; - packageName = "less"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/less/-/less-2.7.3.tgz"; - sha512 = "KPdIJKWcEAb02TuJtaLrhue0krtRLoRoo7x6BNJIBelO00t/CCdJQUnHW5V34OnHMWzIktSalJxRO+FvytQlCQ=="; - }; - }; "level-5.0.1" = { name = "level"; packageName = "level"; @@ -26235,15 +26739,6 @@ let sha512 = "PWYqG4Q00asOrLhX7BejSajByB4EmG2GaKHfj3h5UmmZ2duciXLPGYWIjBzLECFWUGOZWlm5B20h/n3Gs3HKew=="; }; }; - "level-sublevel-6.6.5" = { - name = "level-sublevel"; - packageName = "level-sublevel"; - version = "6.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/level-sublevel/-/level-sublevel-6.6.5.tgz"; - sha512 = "SBSR60x+dghhwGUxPKS+BvV1xNqnwsEUBKmnFepPaHJ6VkBXyPK9SImGc3K2BkwBfpxlt7GKkBNlCnrdufsejA=="; - }; - }; "level-supports-1.0.1" = { name = "level-supports"; packageName = "level-supports"; @@ -26262,15 +26757,6 @@ let sha512 = "iB8O/7Db9lPaITU1aA2txU/cBEXAt4vWwKQRrrWuS6XDgbP4QZGj9BL2aNbwb002atoQ/lIotJkfyzz+ygQnUQ=="; }; }; - "levelup-0.19.1" = { - name = "levelup"; - packageName = "levelup"; - version = "0.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/levelup/-/levelup-0.19.1.tgz"; - sha1 = "f3a6a7205272c4b5f35e412ff004a03a0aedf50b"; - }; - }; "levelup-4.4.0" = { name = "levelup"; packageName = "levelup"; @@ -26568,6 +27054,15 @@ let sha512 = "dYB1lbwqHgPTrruy9glukCu8Ya9vzj6TMfouCtj2H/GuJ+8syioisgKTBPxnCi6m8K8jINKfTOxOHngFkUYqHw=="; }; }; + "load-plugin-3.0.0" = { + name = "load-plugin"; + packageName = "load-plugin"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/load-plugin/-/load-plugin-3.0.0.tgz"; + sha512 = "od7eKCCZ62ITvFf8nHHrIiYmgOHb4xVNDRDqxBWSaao5FZyyZVX8OmRCbwjDGPrSrgIulwPNyBsWCGnhiDC0oQ=="; + }; + }; "loader-runner-2.4.0" = { name = "loader-runner"; packageName = "loader-runner"; @@ -26631,6 +27126,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=="; + }; + }; "locks-0.2.2" = { name = "locks"; packageName = "locks"; @@ -26649,15 +27153,6 @@ let sha512 = "C0q1L38lK5q1t+wE0KY21/9szrBHxye6o2z5EJzU+5B79tubNOC+nLAEzTTn1vPUGoUuehKh8kYKqiVUTWRyaQ=="; }; }; - "lodash-1.0.2" = { - name = "lodash"; - packageName = "lodash"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-1.0.2.tgz"; - sha1 = "8f57560c83b59fc270bd3d561b690043430e2551"; - }; - }; "lodash-2.4.2" = { name = "lodash"; packageName = "lodash"; @@ -26694,22 +27189,13 @@ let sha1 = "d22c9ac660288f3843e16ba7d2b5d06cca27d777"; }; }; - "lodash-4.17.15" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.15"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz"; - sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; - }; - }; - "lodash-4.17.19" = { + "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; - version = "4.17.19"; + version = "4.17.20"; src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz"; - sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="; + url = "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz"; + sha512 = "PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA=="; }; }; "lodash-4.17.5" = { @@ -27099,6 +27585,15 @@ let sha1 = "7ae3017e939622ac31b7d7d7dcb1b34db1690d35"; }; }; + "lodash.camelcase-4.3.0" = { + name = "lodash.camelcase"; + packageName = "lodash.camelcase"; + version = "4.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz"; + sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; + }; + }; "lodash.clone-4.5.0" = { name = "lodash.clone"; packageName = "lodash.clone"; @@ -27144,6 +27639,15 @@ let sha1 = "82d79bff30a67c4005ffd5e2515300ad9ca4d7af"; }; }; + "lodash.deburr-4.1.0" = { + name = "lodash.deburr"; + packageName = "lodash.deburr"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.deburr/-/lodash.deburr-4.1.0.tgz"; + sha1 = "ddb1bbb3ef07458c0177ba07de14422cb033ff9b"; + }; + }; "lodash.defaults-4.2.0" = { name = "lodash.defaults"; packageName = "lodash.defaults"; @@ -27171,6 +27675,15 @@ let sha1 = "995ee0dc18c1b48cc92effae71a10aab5b487698"; }; }; + "lodash.escaperegexp-4.1.2" = { + name = "lodash.escaperegexp"; + packageName = "lodash.escaperegexp"; + version = "4.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; + sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; + }; + }; "lodash.filter-4.6.0" = { name = "lodash.filter"; packageName = "lodash.filter"; @@ -27198,6 +27711,15 @@ let sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; }; }; + "lodash.flattendeep-4.4.0" = { + name = "lodash.flattendeep"; + packageName = "lodash.flattendeep"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz"; + sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; + }; + }; "lodash.foreach-2.4.1" = { name = "lodash.foreach"; packageName = "lodash.foreach"; @@ -27378,6 +27900,15 @@ let sha1 = "619c0af3d03f8b04c31f5882840b77b11cd68343"; }; }; + "lodash.islength-4.0.1" = { + name = "lodash.islength"; + packageName = "lodash.islength"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.islength/-/lodash.islength-4.0.1.tgz"; + sha1 = "4e9868d452575d750affd358c979543dc20ed577"; + }; + }; "lodash.ismatch-4.4.0" = { name = "lodash.ismatch"; packageName = "lodash.ismatch"; @@ -27405,6 +27936,15 @@ let sha1 = "5a2e47fe69953f1ee631a7eba1fe64d2d06558f5"; }; }; + "lodash.isobject-3.0.2" = { + name = "lodash.isobject"; + packageName = "lodash.isobject"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-3.0.2.tgz"; + sha1 = "3c8fb8d5b5bf4bf90ae06e14f2a530a4ed935e1d"; + }; + }; "lodash.isplainobject-4.0.6" = { name = "lodash.isplainobject"; packageName = "lodash.isplainobject"; @@ -27558,15 +28098,6 @@ let sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; }; }; - "lodash.partialright-4.2.1" = { - name = "lodash.partialright"; - packageName = "lodash.partialright"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.partialright/-/lodash.partialright-4.2.1.tgz"; - sha1 = "0130d80e83363264d40074f329b8a3e7a8a1cc4b"; - }; - }; "lodash.pick-4.4.0" = { name = "lodash.pick"; packageName = "lodash.pick"; @@ -27621,6 +28152,15 @@ let sha1 = "936a4e309ef330a7645ed4145986c85ae5b20805"; }; }; + "lodash.sample-4.2.1" = { + name = "lodash.sample"; + packageName = "lodash.sample"; + version = "4.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.sample/-/lodash.sample-4.2.1.tgz"; + sha1 = "5e4291b0c753fa1abeb0aab8fb29df1b66f07f6d"; + }; + }; "lodash.set-4.3.2" = { name = "lodash.set"; packageName = "lodash.set"; @@ -27639,6 +28179,15 @@ let sha1 = "71fe75ed3eabdb2bcb73a1b0b4f51c392ee27b86"; }; }; + "lodash.snakecase-4.1.1" = { + name = "lodash.snakecase"; + packageName = "lodash.snakecase"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz"; + sha1 = "39d714a35357147837aefd64b5dcbb16becd8f8d"; + }; + }; "lodash.some-4.6.0" = { name = "lodash.some"; packageName = "lodash.some"; @@ -27801,6 +28350,15 @@ let sha512 = "sxChESNYJ/EcQv8C7xpmxhtTOngoXuMEqGDAkhXBEmt3MAzM3SM/TmIBOqnMEVdrOv1+VgZoYbo6U2GemQiU4g=="; }; }; + "log-process-errors-5.1.2" = { + name = "log-process-errors"; + packageName = "log-process-errors"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/log-process-errors/-/log-process-errors-5.1.2.tgz"; + sha512 = "s4kmYHrzj543xUAIxc/cpmoiGZcbFwKRqqwO49DbgH+hFoSTswi0sYZuJKjUUc73b49MRPQGl0CNl8cx98/Wtg=="; + }; + }; "log-symbols-1.0.2" = { name = "log-symbols"; packageName = "log-symbols"; @@ -27828,6 +28386,15 @@ let sha512 = "dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ=="; }; }; + "log-symbols-4.0.0" = { + name = "log-symbols"; + packageName = "log-symbols"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz"; + sha512 = "FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA=="; + }; + }; "log-update-1.0.2" = { name = "log-update"; packageName = "log-update"; @@ -27891,13 +28458,13 @@ let sha1 = "e9fa47002eb5d8cda7616d41639b97552eb674be"; }; }; - "loglevel-1.6.8" = { + "loglevel-1.7.0" = { name = "loglevel"; packageName = "loglevel"; - version = "1.6.8"; + version = "1.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/loglevel/-/loglevel-1.6.8.tgz"; - sha512 = "bsU7+gc9AJ2SqpzxwU3+1fedl8zAntbtC5XYlt3s2j1hJcn2PsXSmgN8TaLG/J1/2mod4+cE/3vNL70/c1RNCA=="; + url = "https://registry.npmjs.org/loglevel/-/loglevel-1.7.0.tgz"; + sha512 = "i2sY04nal5jDcagM3FMfG++T69GEEM8CYuOfeOIvmXzOIcwE9a/CJPR0MFM97pYMj/u10lzz7/zd7+qwhrBTqQ=="; }; }; "loglevel-colored-level-prefix-1.0.0" = { @@ -28206,15 +28773,6 @@ let sha1 = "d637764ea33a929bd00f34d2a23c2256d0d5fb5b"; }; }; - "ltgt-2.1.3" = { - name = "ltgt"; - packageName = "ltgt"; - version = "2.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ltgt/-/ltgt-2.1.3.tgz"; - sha1 = "10851a06d9964b971178441c23c9e52698eece34"; - }; - }; "ltgt-2.2.1" = { name = "ltgt"; packageName = "ltgt"; @@ -28233,13 +28791,13 @@ let sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; }; }; - "lunr-2.3.8" = { + "lunr-2.3.6" = { name = "lunr"; packageName = "lunr"; - version = "2.3.8"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz"; - sha512 = "oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg=="; + url = "https://registry.npmjs.org/lunr/-/lunr-2.3.6.tgz"; + sha512 = "swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q=="; }; }; "lynx-0.2.0" = { @@ -28395,15 +28953,6 @@ let sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw=="; }; }; - "make-error-cause-1.2.2" = { - name = "make-error-cause"; - packageName = "make-error-cause"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/make-error-cause/-/make-error-cause-1.2.2.tgz"; - sha1 = "df0388fcd0b37816dff0a5fb8108939777dcbc9d"; - }; - }; "make-fetch-happen-5.0.2" = { name = "make-fetch-happen"; packageName = "make-fetch-happen"; @@ -28764,6 +29313,15 @@ let sha512 = "1RUZVgQlpJSPWYbFSpmudq5nHY1doEIv89gBtF0s4gW1GF2XorxcA/70M5vq7rLv0a6mhOUccRsqkwhwLCIQ2Q=="; }; }; + "markdown-table-2.0.0" = { + name = "markdown-table"; + packageName = "markdown-table"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/markdown-table/-/markdown-table-2.0.0.tgz"; + sha512 = "Ezda85ToJUBhM6WGaG6veasyym+Tbs3cMAw/ZhOPqXiYsr0jgocBV3j3nx+4lk47plLlIqjwuTm/ywVI+zjJ/A=="; + }; + }; "marked-0.3.19" = { name = "marked"; packageName = "marked"; @@ -28773,6 +29331,15 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; + "marked-0.6.3" = { + name = "marked"; + packageName = "marked"; + version = "0.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz"; + sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ=="; + }; + }; "marked-0.7.0" = { name = "marked"; packageName = "marked"; @@ -28890,6 +29457,24 @@ let sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg=="; }; }; + "maxstache-1.0.7" = { + name = "maxstache"; + packageName = "maxstache"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/maxstache/-/maxstache-1.0.7.tgz"; + sha1 = "2231d5180ba783d5ecfc31c45fedac7ae4276984"; + }; + }; + "maxstache-stream-1.0.4" = { + name = "maxstache-stream"; + packageName = "maxstache-stream"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/maxstache-stream/-/maxstache-stream-1.0.4.tgz"; + sha1 = "9c7f5cab7e5fdd2d90da86143b4e9631ea328040"; + }; + }; "md5-2.2.1" = { name = "md5"; packageName = "md5"; @@ -28926,6 +29511,24 @@ let sha512 = "xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw=="; }; }; + "md5-hex-2.0.0" = { + name = "md5-hex"; + packageName = "md5-hex"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/md5-hex/-/md5-hex-2.0.0.tgz"; + sha1 = "d0588e9f1c74954492ecd24ac0ac6ce997d92e33"; + }; + }; + "md5-o-matic-0.1.1" = { + name = "md5-o-matic"; + packageName = "md5-o-matic"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/md5-o-matic/-/md5-o-matic-0.1.1.tgz"; + sha1 = "822bccd65e117c514fab176b25945d54100a03c3"; + }; + }; "md5.js-1.3.5" = { name = "md5.js"; packageName = "md5.js"; @@ -28953,13 +29556,22 @@ let sha512 = "3YDMQHI5vRiS2uygEFYaqckibpJtKq5Sj2c8JioeOQBU6INpKbdWzfyLqFFnDwEcEnRFIdMsguzs5pC1Jp4Isg=="; }; }; - "mdast-util-to-nlcst-3.2.3" = { + "mdast-util-compact-2.0.1" = { + name = "mdast-util-compact"; + packageName = "mdast-util-compact"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/mdast-util-compact/-/mdast-util-compact-2.0.1.tgz"; + sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; + }; + }; + "mdast-util-to-nlcst-4.0.0" = { name = "mdast-util-to-nlcst"; packageName = "mdast-util-to-nlcst"; - version = "3.2.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-3.2.3.tgz"; - sha512 = "hPIsgEg7zCvdU6/qvjcR6lCmJeRuIEpZGY5xBV+pqzuMOvQajyyF8b6f24f8k3Rw8u40GwkI3aAxUXr3bB2xag=="; + url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-4.0.0.tgz"; + sha512 = "CPDf82bVAVImJTZgZ9S1yxGczDyoYi1R+edzz8EVFUPvT3RN0RZnnSnMikawLf6ukAKj6pyhsG0exSO7UEA3DA=="; }; }; "mdmanifest-1.0.8" = { @@ -29286,13 +29898,13 @@ let sha512 = "3YffViIt2QWgTy6Pale5QpopX/IvU3LPL03jOTqp6pGj3VjesdO/U8CuHMKpnQr4shCNCM5fd5XFFvIIl6JBHg=="; }; }; - "meow-7.0.1" = { + "meow-7.1.0" = { name = "meow"; packageName = "meow"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-7.0.1.tgz"; - sha512 = "tBKIQqVrAHqwit0vfuFPY3LlzJYkEOFyKa3bPgxzNl6q/RtN8KQ+ALYEASYuFayzSAsjlhXj/JZ10rH85Q6TUw=="; + url = "https://registry.npmjs.org/meow/-/meow-7.1.0.tgz"; + sha512 = "kq5F0KVteskZ3JdfyQFivJEj2RaA8NFsS4+r9DaMKLcUHpk5OcHS3Q0XkCXONB1mZRPsu/Y/qImKri0nwSEZog=="; }; }; "merge-1.2.1" = { @@ -29322,6 +29934,15 @@ let sha1 = "a5de46538dae84d4114cc5ea02b4772a6346701f"; }; }; + "merge-source-map-1.1.0" = { + name = "merge-source-map"; + packageName = "merge-source-map"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz"; + sha512 = "Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw=="; + }; + }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -29358,13 +29979,13 @@ let sha1 = "401fdec7ec21cdb9e03cd3d3021398da21b27085"; }; }; - "metals-languageclient-0.2.8" = { + "metals-languageclient-0.3.0" = { name = "metals-languageclient"; packageName = "metals-languageclient"; - version = "0.2.8"; + version = "0.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.2.8.tgz"; - sha512 = "RGy28w9iYwGt3im5Da6YjD9eF6GTKtrRvluWy8StfwbHvI/KsobF1zmyVX/fD0wvNUCY0am867rImkjs1paTzA=="; + url = "https://registry.npmjs.org/metals-languageclient/-/metals-languageclient-0.3.0.tgz"; + sha512 = "Uh3jj6+b/vWdR3k1BqC8QZK3a/5Z9mVdI+OhVbFGMq6slJ6odFLTDaDZ25zpon4MaLEs+IIC4R91pJcmFdU6og=="; }; }; "metalsmith-2.3.0" = { @@ -29412,6 +30033,24 @@ let sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; }; }; + "micro-api-client-3.3.0" = { + name = "micro-api-client"; + packageName = "micro-api-client"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/micro-api-client/-/micro-api-client-3.3.0.tgz"; + sha512 = "y0y6CUB9RLVsy3kfgayU28746QrNMpSm9O/AYGNsBgOkJr/X/Jk0VLGoO8Ude7Bpa8adywzF+MzXNZRFRsNPhg=="; + }; + }; + "micro-memoize-2.1.2" = { + name = "micro-memoize"; + packageName = "micro-memoize"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/micro-memoize/-/micro-memoize-2.1.2.tgz"; + sha512 = "COjNutiFgnDHXZEIM/jYuZPwq2h8zMUeScf6Sh6so98a+REqdlpaNS7Cb2ffGfK5I+xfgoA3Rx49NGuNJTJq3w=="; + }; + }; "microbuffer-1.0.0" = { name = "microbuffer"; packageName = "microbuffer"; @@ -29538,15 +30177,6 @@ let sha512 = "BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ=="; }; }; - "mime-db-1.43.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz"; - sha512 = "+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="; - }; - }; "mime-db-1.44.0" = { name = "mime-db"; packageName = "mime-db"; @@ -29565,15 +30195,6 @@ let sha512 = "lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ=="; }; }; - "mime-types-2.1.26" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.26"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz"; - sha512 = "01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ=="; - }; - }; "mime-types-2.1.27" = { name = "mime-types"; packageName = "mime-types"; @@ -29691,15 +30312,6 @@ let sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; }; }; - "minimatch-0.2.14" = { - name = "minimatch"; - packageName = "minimatch"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-0.2.14.tgz"; - sha1 = "c74e780574f63c6f9a090e90efbe6ef53a6a756a"; - }; - }; "minimatch-0.3.0" = { name = "minimatch"; packageName = "minimatch"; @@ -29709,15 +30321,6 @@ let sha1 = "275d8edaac4f1bb3326472089e7949c8394699dd"; }; }; - "minimatch-2.0.10" = { - name = "minimatch"; - packageName = "minimatch"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-2.0.10.tgz"; - sha1 = "8d087c39c6b38c001b97fca7ce6d0e1e80afbac7"; - }; - }; "minimatch-3.0.4" = { name = "minimatch"; packageName = "minimatch"; @@ -29826,13 +30429,13 @@ let sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA=="; }; }; - "minipass-fetch-1.3.0" = { + "minipass-fetch-1.3.1" = { name = "minipass-fetch"; packageName = "minipass-fetch"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.0.tgz"; - sha512 = "Yb23ESZZ/8QxiBvSpJ4atbVMVDx2CXrerzrtQzQ67eLqKg+zFIkYFTagk3xh6fdo+e/FvDtVuCD4QcuYDRR3hw=="; + url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.3.1.tgz"; + sha512 = "N0ddPAD8OZnoAHUYj1ZH4ZJVna+ucy7if777LrdeIV1ko8f46af4jbyM5EC1gN4xc9Wq5c3C38GnxRJ2gneXRA=="; }; }; "minipass-flush-1.0.5" = { @@ -29889,13 +30492,13 @@ let sha512 = "6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q=="; }; }; - "minizlib-2.1.0" = { + "minizlib-2.1.2" = { name = "minizlib"; packageName = "minizlib"; - version = "2.1.0"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.0.tgz"; - sha512 = "EzTZN/fjSvifSX0SlqUERCN39o6T40AMarPbv0MrarSFtIITCBh7bi+dU8nxGFHuqs9jdIAeoYoKuQAAASsPPA=="; + url = "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz"; + sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; "mired-0.0.0" = { @@ -30015,31 +30618,22 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-4.15.4" = { + "mobx-4.15.6" = { name = "mobx"; packageName = "mobx"; - version = "4.15.4"; + version = "4.15.6"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-4.15.4.tgz"; - sha512 = "nyuHPqmKnVOnbvkjR8OrijBtovxAHYC+JU8/qBqvBw4Dez/n+zzxqNHbZNFy7/07+wwc/Qz7JS9WSfy1LcYISA=="; + url = "https://registry.npmjs.org/mobx/-/mobx-4.15.6.tgz"; + sha512 = "eZVEHZLi/Fe+V4qurBBQoFHCqaGrfMuYK1Vy4t5MHYfy90f52ptAKsemHsJcYl+R5/sA3oeT3rMLiVsbB7bllA=="; }; }; - "mobx-react-6.2.5" = { + "mobx-react-5.4.4" = { name = "mobx-react"; packageName = "mobx-react"; - version = "6.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-6.2.5.tgz"; - sha512 = "LxtXXW0GkOAO6VOIg2m/6WL6ZuKlzOWwESIFdrWelI0ZMIvtKCMZVUuulcO5GAWSDsH0ApaMkGLoaPqKjzyziQ=="; - }; - }; - "mobx-react-lite-2.0.7" = { - name = "mobx-react-lite"; - packageName = "mobx-react-lite"; - version = "2.0.7"; + version = "5.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-2.0.7.tgz"; - sha512 = "YKAh2gThC6WooPnVZCoC+rV1bODAKFwkhxikzgH18wpBjkgTkkR9Sb0IesQAH5QrAEH/JQVmy47jcpQkf2Au3Q=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.4.tgz"; + sha512 = "2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ=="; }; }; "mocha-2.5.3" = { @@ -30051,13 +30645,13 @@ let sha1 = "161be5bdeb496771eb9b35745050b622b5aefc58"; }; }; - "mocha-8.1.1" = { + "mocha-8.1.2" = { name = "mocha"; packageName = "mocha"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.1.tgz"; - sha512 = "p7FuGlYH8t7gaiodlFreseLxEmxTgvyG9RgPHODFPySNhwUehu8NIb0vdSt3WFckSneswZ0Un5typYcWElk7HQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.2.tgz"; + sha512 = "I8FRAcuACNMLQn3lS4qeWLxXqLvGf6r2CaLstDpZmMUUSmvW6Cnm1AuHxgbc7ctZVRcfwspCRbDHymPsi3dkJw=="; }; }; "mock-require-3.0.3" = { @@ -30087,6 +30681,15 @@ let sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="; }; }; + "module-definition-3.3.0" = { + name = "module-definition"; + packageName = "module-definition"; + version = "3.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.0.tgz"; + sha512 = "HTplA9xwDzH67XJFC1YvZMUElWJD28DV0dUq7lhTs+JKJamUOWA/CcYWSlhW5amJO66uWtY7XdltT+LfX0wIVg=="; + }; + }; "module-deps-6.2.3" = { name = "module-deps"; packageName = "module-deps"; @@ -30096,6 +30699,15 @@ let sha512 = "fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA=="; }; }; + "moize-5.4.7" = { + name = "moize"; + packageName = "moize"; + version = "5.4.7"; + src = fetchurl { + url = "https://registry.npmjs.org/moize/-/moize-5.4.7.tgz"; + sha512 = "7PZH8QFJ51cIVtDv7wfUREBd3gL59JB0v/ARA3RI9zkSRa9LyGjS1Bdldii2J1/NQXRQ/3OOVOSdnZrCcVaZlw=="; + }; + }; "mold-source-map-0.4.0" = { name = "mold-source-map"; packageName = "mold-source-map"; @@ -30195,6 +30807,15 @@ let sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; }; }; + "move-file-1.2.0" = { + name = "move-file"; + packageName = "move-file"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/move-file/-/move-file-1.2.0.tgz"; + sha512 = "USHrRmxzGowUWAGBbJPdFjHzEqtxDU03pLHY0Rfqgtnq+q8FOIs8wvkkf+Udmg77SJKs47y9sI0jJvQeYsmiCA=="; + }; + }; "mp4-box-encoding-1.4.1" = { name = "mp4-box-encoding"; packageName = "mp4-box-encoding"; @@ -30933,13 +31554,13 @@ let sha1 = "ae603b36b134bcec347b452422b0bf98d5832ec8"; }; }; - "nearley-2.19.5" = { + "nearley-2.19.6" = { name = "nearley"; packageName = "nearley"; - version = "2.19.5"; + version = "2.19.6"; src = fetchurl { - url = "https://registry.npmjs.org/nearley/-/nearley-2.19.5.tgz"; - sha512 = "qoh1ZXXl0Kpn40tFhmgvffUAlbpRMcjLUagNVnT1JmliUIsB4tFabmCNhD97+tkf9FZ/SLhhYzNow0V3GitzDg=="; + url = "https://registry.npmjs.org/nearley/-/nearley-2.19.6.tgz"; + sha512 = "OV3Lx+o5iIGWVY38zs+7aiSnBqaHTFAOQiz83VHJje/wOOaSgzE3H0S/xfISxJhFSoPcX611OEDV9sCT8F283g=="; }; }; "neat-csv-2.1.0" = { @@ -31060,15 +31681,6 @@ let sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; }; }; - "nested-error-stacks-2.0.1" = { - name = "nested-error-stacks"; - packageName = "nested-error-stacks"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz"; - sha512 = "SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A=="; - }; - }; "nested-error-stacks-2.1.0" = { name = "nested-error-stacks"; packageName = "nested-error-stacks"; @@ -31078,6 +31690,33 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; + "netlify-4.3.12" = { + name = "netlify"; + packageName = "netlify"; + version = "4.3.12"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify/-/netlify-4.3.12.tgz"; + sha512 = "uHyKa0wPwhTJblqY4uoxhOkR34I72o3rItJCpBPL4g+7ELDt88qk//WoV3p9CT1TX+sgXvLZuN92HHAM5OPk/w=="; + }; + }; + "netlify-redirect-parser-2.5.0" = { + name = "netlify-redirect-parser"; + packageName = "netlify-redirect-parser"; + version = "2.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-redirect-parser/-/netlify-redirect-parser-2.5.0.tgz"; + sha512 = "pF8BiOr3Pa4kQLLiOu53I0d30EIUDM0DYqYvCQmKD96cMX2qLh/QsxT0Zh18IrL5a0IWQ236/o76lTe0yEEw6w=="; + }; + }; + "netlify-redirector-0.2.0" = { + name = "netlify-redirector"; + packageName = "netlify-redirector"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-redirector/-/netlify-redirector-0.2.0.tgz"; + sha512 = "5SSUu++MXvE/tik90Hx7lzISBHCl5k4TqpVeTuBEoHp5K7uWitY7c3MjPNiY3kB83GSZiTNLbuIY7bo6mpyU3Q=="; + }; + }; "netmask-1.0.6" = { name = "netmask"; packageName = "netmask"; @@ -31195,13 +31834,13 @@ let sha512 = "dWJ3XUoAoWoau24xOM59Y1FPozv7DyYWy+rdUaXj9Ow0hBCVuwqDQbXzTF7H+HskyTVpTkRPXYPu4YsMEScmRw=="; }; }; - "nlcst-search-1.5.1" = { + "nlcst-search-2.0.0" = { name = "nlcst-search"; packageName = "nlcst-search"; - version = "1.5.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-1.5.1.tgz"; - sha512 = "G3ws0fgNlVsUvHvA2G1PTjyxzGOJ0caI0+WOvlZzev5iSUTX+R1q4lnlL4Y7E+he4ZMUW/0FMn9rYwdYon/13g=="; + url = "https://registry.npmjs.org/nlcst-search/-/nlcst-search-2.0.0.tgz"; + sha512 = "+3xdctMFTcG+76vKAa0wObNg1EYq7IIQlZcL+HxSFXkHO1DgSPRjsPJrmelVIvMg7rk+wmBcdPEoScv/CTT1Zw=="; }; }; "nlcst-to-string-2.0.4" = { @@ -31249,13 +31888,13 @@ let sha512 = "iEOqDAOFl6uN5jZGRj39Jdo8qALzf2HPXtpFso8+BMaDylDrUMYMwhFbfYGgxdnMlsRnxYTwv68kaXEpsHIapg=="; }; }; - "node-abi-2.18.0" = { + "node-abi-2.19.1" = { name = "node-abi"; packageName = "node-abi"; - version = "2.18.0"; + version = "2.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-2.18.0.tgz"; - sha512 = "yi05ZoiuNNEbyT/xXfSySZE+yVnQW6fxPZuFbLyS1s6b5Kw3HzV2PHOM4XR+nsjzkHxByK+2Wg+yCQbe35l8dw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz"; + sha512 = "HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A=="; }; }; "node-addon-api-1.7.2" = { @@ -31267,6 +31906,15 @@ let sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg=="; }; }; + "node-addon-api-2.0.0" = { + name = "node-addon-api"; + packageName = "node-addon-api"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz"; + sha512 = "ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="; + }; + }; "node-appc-0.2.49" = { name = "node-appc"; packageName = "node-appc"; @@ -31412,6 +32060,24 @@ let sha512 = "7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ=="; }; }; + "node-forge-0.9.1" = { + name = "node-forge"; + packageName = "node-forge"; + version = "0.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/node-forge/-/node-forge-0.9.1.tgz"; + sha512 = "G6RlQt5Sb4GMBzXvhfkeFmbqR6MzhtnT7VTHuLadjkii3rdYHNdw0m8zA4BTxVIh68FicCQ2NSUANpsqkr9jvQ=="; + }; + }; + "node-gyp-3.8.0" = { + name = "node-gyp"; + packageName = "node-gyp"; + version = "3.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-3.8.0.tgz"; + sha512 = "3g8lYefrRRzvGeSowdJKAKyks8oUpLEd/DyPV4eMhVlhJ0aNaZqIrNUIPuEWWTAoPqyFkfGrM67MC69baqn6vA=="; + }; + }; "node-gyp-4.0.0" = { name = "node-gyp"; packageName = "node-gyp"; @@ -31637,6 +32303,15 @@ let sha512 = "gsO4vjEdQaTusZAEebUWp2a5d7dF5DYoIpDG7WySnk7BuZDW+GPpHXoXXuYawRBr/9t5q54tirPz79kFIWg4dA=="; }; }; + "node-source-walk-4.2.0" = { + name = "node-source-walk"; + packageName = "node-source-walk"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/node-source-walk/-/node-source-walk-4.2.0.tgz"; + sha512 = "hPs/QMe6zS94f5+jG3kk9E7TNm4P2SulrKiLWMzKszBfNZvL/V6wseHlTd7IvfW0NZWqPtK3+9yYNr+3USGteA=="; + }; + }; "node-ssdp-2.9.1" = { name = "node-ssdp"; packageName = "node-ssdp"; @@ -31763,6 +32438,15 @@ let sha1 = "94a2b1633c4f1317553007d8966fd0e841b6a4c2"; }; }; + "noop2-2.0.0" = { + name = "noop2"; + packageName = "noop2"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/noop2/-/noop2-2.0.0.tgz"; + sha1 = "4b636015e9882b54783c02b412f699d8c5cd0a5b"; + }; + }; "nopt-1.0.10" = { name = "nopt"; packageName = "nopt"; @@ -31817,6 +32501,15 @@ let sha512 = "CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg=="; }; }; + "nopt-5.0.0" = { + name = "nopt"; + packageName = "nopt"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz"; + sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ=="; + }; + }; "normalize-html-whitespace-1.0.0" = { name = "normalize-html-whitespace"; packageName = "normalize-html-whitespace"; @@ -32069,22 +32762,22 @@ let sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg=="; }; }; - "npm-registry-fetch-4.0.5" = { + "npm-registry-fetch-4.0.7" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "4.0.5"; + version = "4.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz"; - sha512 = "yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.7.tgz"; + sha512 = "cny9v0+Mq6Tjz+e0erFAB+RYJ/AVGzkjnISiobqP8OWj9c9FLoZZu8/SPSKJWE17F1tk4018wfjV+ZbIbqC7fQ=="; }; }; - "npm-registry-fetch-8.1.3" = { + "npm-registry-fetch-8.1.4" = { name = "npm-registry-fetch"; packageName = "npm-registry-fetch"; - version = "8.1.3"; + version = "8.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.3.tgz"; - sha512 = "xpBFcg13wkFR0SsscvemmrIe1Sxe1SPgGUOAb7+5Uo6fR8SIRMenMHeDSjfyulv1px66/y0Ib40rtKO20PcgPg=="; + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-8.1.4.tgz"; + sha512 = "UaLGFQP7VCuyBsb7S5P5od3av/Zy9JW6K5gbMigjZCYnEpIkWWRiLQTKVpxM4QocfPcsjm+xtyrDNm4jdqwNEg=="; }; }; "npm-run-path-2.0.2" = { @@ -32267,13 +32960,13 @@ let sha512 = "jFWBHjSoqODGo7cKA/VWqqWSLbHNtnyCEpa2nMMS64SzCUbZDk63Oe7LqQZ2qJA0K2VRreYLt6cVkYy6MqNRDg=="; }; }; - "oas-resolver-2.4.2" = { + "oas-resolver-2.4.3" = { name = "oas-resolver"; packageName = "oas-resolver"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.2.tgz"; - sha512 = "iJo7wE/MhuCJefkcpCS/NlE8MunRgRvgPozpeLSZUg0zmU8PBkzUwdtzpmjGDd7QjEuUi0SZ/y1wIrFIH+FNiA=="; + url = "https://registry.npmjs.org/oas-resolver/-/oas-resolver-2.4.3.tgz"; + sha512 = "+66lGk5GewIXoIkqxfeWp89M/SgQT67oITiuG6qNIUuq1gczIIy68ZrMiE+gyDZY2IAdVxY9k73o9nHBnKwHPA=="; }; }; "oas-schema-walker-1.1.5" = { @@ -32294,15 +32987,6 @@ let sha512 = "l/SxykuACi2U51osSsBXTxdsFc8Fw41xI7AsZkzgVgWJAzoEFaaNptt35WgY9C3757RUclsm6ye5GvSyYoozLQ=="; }; }; - "oas-validator-4.0.7" = { - name = "oas-validator"; - packageName = "oas-validator"; - version = "4.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-4.0.7.tgz"; - sha512 = "ppSW68iIIhvzFwSvY51NJPLM0uFjkHKAdoXKO+Pq6Ej1qU5Nvi9I3dQt6W8y/B+UYIP8yXr9YTEuvzG7sQH/ww=="; - }; - }; "oauth-0.9.15" = { name = "oauth"; packageName = "oauth"; @@ -32646,13 +33330,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.124.2" = { + "office-ui-fabric-react-7.132.0" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.124.2"; + version = "7.132.0"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.124.2.tgz"; - sha512 = "c/6KlNWImaI0N9w9azzTlI3/svkUroNvdZrYBSKHlGVf5CU/GQPEUSmkuaLq6aPZeU7pmr2qUKlZq2sPyrLIOQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.132.0.tgz"; + sha512 = "tyJyra4Ovp4fwmttLs/SwPln2zQCEYwS+FwqgdojCaudPnp/J8nGtF78hCBiEdap4KEdnIJb6MCfyVLBW+zs9Q=="; }; }; "omggif-1.0.10" = { @@ -32664,6 +33348,15 @@ let sha512 = "LMJTtvgc/nugXj0Vcrrs68Mn2D1r0zf630VNtqtpI1FEO7e+O9FP4gqs9AcnBaSEeoHIPm28u6qgPR0oyEpGSw=="; }; }; + "omit.js-2.0.2" = { + name = "omit.js"; + packageName = "omit.js"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/omit.js/-/omit.js-2.0.2.tgz"; + sha512 = "hJmu9D+bNB40YpL9jYebQl4lsTW6yEHRTroJzNLqQJYHm7c+NQnJGfZmIWh8S3q3KoaxV1aLhV6B3+0N0/kyJg=="; + }; + }; "on-change-network-0.0.2" = { name = "on-change-network"; packageName = "on-change-network"; @@ -32799,13 +33492,13 @@ let sha1 = "067428230fd67443b2794b22bba528b6867962d4"; }; }; - "onetime-5.1.1" = { + "onetime-5.1.2" = { name = "onetime"; packageName = "onetime"; - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/onetime/-/onetime-5.1.1.tgz"; - sha512 = "ZpZpjcJeugQfWsfyQlshVoowIIQ1qBGSVll4rfDq6JJVO//fesjoX808hXWfBjY+ROZgpKDI5TRSRBSoJiZ8eg=="; + url = "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"; + sha512 = "kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg=="; }; }; "ono-4.0.11" = { @@ -32871,6 +33564,15 @@ let sha512 = "lLPI5KgOwEYCDKXf4np7y1PBEkj7HYIyP2DY8mVDRnx0VIIu6bNrRB0R66TuO7Mack6EnTNLm4uvcl1UoklTpA=="; }; }; + "open-7.2.0" = { + name = "open"; + packageName = "open"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/open/-/open-7.2.0.tgz"; + sha512 = "4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ=="; + }; + }; "openapi-default-setter-2.1.0" = { name = "openapi-default-setter"; packageName = "openapi-default-setter"; @@ -32925,13 +33627,13 @@ let sha512 = "bIG8bpHT/vE+Dtz4aVyfQnweXtUdvxvJf5/D6Uu98UGf3T42Ez940ctwnlmDCQxTPqdu0yLFbMoiNf/A3jYCIg=="; }; }; - "openapi-sampler-1.0.0-beta.16" = { + "openapi-sampler-1.0.0-beta.14" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.0.0-beta.16"; + version = "1.0.0-beta.14"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.16.tgz"; - sha512 = "05+GvwMagTY7GxoDQoWJfmAUFlxfebciiEzqKmu4iq6+MqBEn62AMUkn0CTxyKhnUGIaR2KXjTeslxIeJwVIOw=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.14.tgz"; + sha512 = "NNmH9YAN5AaCE4w6MQXdCrmsOJJQTswHVSp075+h+iiG+OTonpZE8HzwocozovD2imx4lamkuxGLs4E4bO4Z+g=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -33006,13 +33708,13 @@ let sha512 = "goYSy5c2UXE4Ra1xixabeVh1guIX/ZV/YokJksb6q2lubWu6UbvPQ20p542/sFIll1nl8JnCyK9oBaOcCWXwvA=="; }; }; - "openid-2.0.6" = { + "openid-2.0.7" = { name = "openid"; packageName = "openid"; - version = "2.0.6"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-2.0.6.tgz"; - sha1 = "707375e59ab9f73025899727679b20328171c9aa"; + url = "https://registry.npmjs.org/openid/-/openid-2.0.7.tgz"; + sha512 = "xH6qaz/hS55rEX8xURz4HRUO96cpj821WY6UEG9rgcusZ8Jsq54jGWP1EMCjGvgngonw8vgSljM1i2OESv16Gw=="; }; }; "opentracing-0.14.4" = { @@ -33204,31 +33906,13 @@ let sha512 = "77iGeVU1cIdRhgFzCK8aw1fbtT1B/iZAvWjS+l/o1x0RShMgxHUZaD2yDpWsNCPwXg9z1ZA78Kbdvr8kBmG/Ww=="; }; }; - "ora-4.0.5" = { + "ora-5.0.0" = { name = "ora"; packageName = "ora"; - version = "4.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.0.5.tgz"; - sha512 = "jCDgm9DqvRcNIAEv2wZPrh7E5PcQiDUnbnWbAfu4NGAE2ZNqPFbDixmWldy1YG2QfLeQhuiu6/h5VRrk6cG50w=="; - }; - }; - "orchestrator-0.3.8" = { - name = "orchestrator"; - packageName = "orchestrator"; - version = "0.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/orchestrator/-/orchestrator-0.3.8.tgz"; - sha1 = "14e7e9e2764f7315fbac184e506c7aa6df94ad7e"; - }; - }; - "ordered-read-streams-0.1.0" = { - name = "ordered-read-streams"; - packageName = "ordered-read-streams"; - version = "0.1.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.1.0.tgz"; - sha1 = "fd565a9af8eb4473ba69b6ed8a34352cb552f126"; + url = "https://registry.npmjs.org/ora/-/ora-5.0.0.tgz"; + sha512 = "s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw=="; }; }; "ordered-read-streams-1.0.1" = { @@ -33546,6 +34230,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"; @@ -33600,13 +34293,13 @@ let sha512 = "3cRXXn3/O0o3+eVmUroJPSj/esxoEFIm0ZOno/T+NzG/VZgPOqQ8WKmlNqubSEpZmCIngEy34unkHGg83ZIBmg=="; }; }; - "p-queue-6.6.0" = { + "p-queue-6.6.1" = { name = "p-queue"; packageName = "p-queue"; - version = "6.6.0"; + version = "6.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.0.tgz"; - sha512 = "zPHXPNy9jZsiym0PpJjvnHQysx1fSd/QdaNVwiDRLU2KFChD6h9CkCB6b8i3U8lBwJyA+mHgNZCzcy77glUssQ=="; + url = "https://registry.npmjs.org/p-queue/-/p-queue-6.6.1.tgz"; + sha512 = "miQiSxLYPYBxGkrldecZC18OTLjdUqnlRebGzPRiVxB8mco7usCmm7hFuxiTvp93K18JnLtE4KMMycjAu/cQQg=="; }; }; "p-reduce-1.0.0" = { @@ -33618,6 +34311,15 @@ let sha1 = "18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"; }; }; + "p-reduce-2.1.0" = { + name = "p-reduce"; + packageName = "p-reduce"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-reduce/-/p-reduce-2.1.0.tgz"; + sha512 = "2USApvnsutq8uoxZBGbbWM0JIYLiEMJ9RlaN7fAzVNb9OZN0SHjjTTfIcb667XynS5Y1VhwDJVDa72TnPzAYWw=="; + }; + }; "p-retry-3.0.1" = { name = "p-retry"; packageName = "p-retry"; @@ -33681,6 +34383,24 @@ let sha512 = "R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ=="; }; }; + "p-wait-for-2.0.1" = { + name = "p-wait-for"; + packageName = "p-wait-for"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/p-wait-for/-/p-wait-for-2.0.1.tgz"; + sha512 = "edEuJC7eRokPf3AWycsS3lp8JimWLnVgCeGoWw67qFerUmsAHKyhRBj8rDvaBjPV2bTyzgTwmF+U8vNMMBEcyA=="; + }; + }; + "p-wait-for-3.1.0" = { + name = "p-wait-for"; + packageName = "p-wait-for"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/p-wait-for/-/p-wait-for-3.1.0.tgz"; + sha512 = "0Uy19uhxbssHelu9ynDMcON6BmMk6pH8551CvxROhiz3Vx+yC4RqxjyIDk2V4ll0g9177RKT++PK4zcV58uJ7A=="; + }; + }; "p-waterfall-1.0.0" = { name = "p-waterfall"; packageName = "p-waterfall"; @@ -33888,13 +34608,13 @@ let sha1 = "fedd4d2bf193a77745fe71e371d73c3307d9c751"; }; }; - "parse-asn1-5.1.5" = { + "parse-asn1-5.1.6" = { name = "parse-asn1"; packageName = "parse-asn1"; - version = "5.1.5"; + version = "5.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha512 = "jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ=="; + url = "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha512 = "RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw=="; }; }; "parse-english-4.1.3" = { @@ -33915,6 +34635,15 @@ let sha512 = "NzfpbxW/NPrzZ/yYSoQxyqUZMZXIdCfE0OIN4ESsnptHJECoUk3FZktxNuzQf4tjt5UEopnxpYJbvYuxIFDdsg=="; }; }; + "parse-entities-2.0.0" = { + name = "parse-entities"; + packageName = "parse-entities"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz"; + sha512 = "kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ=="; + }; + }; "parse-filepath-1.0.2" = { name = "parse-filepath"; packageName = "parse-filepath"; @@ -33942,6 +34671,15 @@ let sha1 = "9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"; }; }; + "parse-github-url-1.0.2" = { + name = "parse-github-url"; + packageName = "parse-github-url"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.2.tgz"; + sha512 = "kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw=="; + }; + }; "parse-gitignore-1.0.1" = { name = "parse-gitignore"; packageName = "parse-gitignore"; @@ -34014,6 +34752,15 @@ let sha512 = "ztoZ4/DYeXQq4E21v169sC8qWINGpcosGv9XhTDvg9/hWvx/zrFkc9BiWxR58OJLHGk28j5BL0SDLeV2WmFZlQ=="; }; }; + "parse-json-5.1.0" = { + name = "parse-json"; + packageName = "parse-json"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz"; + sha512 = "+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ=="; + }; + }; "parse-latin-4.2.1" = { name = "parse-latin"; packageName = "parse-latin"; @@ -34032,6 +34779,15 @@ let sha1 = "bedfe0d2118aeb84be75e7b025419ec8a61140a7"; }; }; + "parse-ms-2.1.0" = { + name = "parse-ms"; + packageName = "parse-ms"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz"; + sha512 = "kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA=="; + }; + }; "parse-node-version-1.0.1" = { name = "parse-node-version"; packageName = "parse-node-version"; @@ -34059,13 +34815,13 @@ let sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; }; }; - "parse-path-4.0.1" = { + "parse-path-4.0.2" = { name = "parse-path"; packageName = "parse-path"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.1.tgz"; - sha512 = "d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA=="; + url = "https://registry.npmjs.org/parse-path/-/parse-path-4.0.2.tgz"; + sha512 = "HSqVz6iuXSiL8C1ku5Gl1Z5cwDd9Wo0q8CoffdAghP6bz8pJa1tcMC+m4N+z6VAS8QdksnIGq1TB6EgR4vPR6w=="; }; }; "parse-semver-1.1.1" = { @@ -34113,13 +34869,13 @@ let sha1 = "32d4b6afde631420e5f415919a222b774b575707"; }; }; - "parse-url-5.0.1" = { + "parse-url-5.0.2" = { name = "parse-url"; packageName = "parse-url"; - version = "5.0.1"; + version = "5.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.1.tgz"; - sha512 = "flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg=="; + url = "https://registry.npmjs.org/parse-url/-/parse-url-5.0.2.tgz"; + sha512 = "Czj+GIit4cdWtxo3ISZCvLiUjErSo0iI3wJ+q9Oi3QuMYTI6OZu+7cewMWZ+C1YAnKhYTk6/TLuhIgCypLthPA=="; }; }; "parse5-1.5.1" = { @@ -34158,13 +34914,13 @@ let sha512 = "fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ=="; }; }; - "parse5-5.1.1" = { + "parse5-6.0.1" = { name = "parse5"; packageName = "parse5"; - version = "5.1.1"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz"; - sha512 = "ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug=="; + url = "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz"; + sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw=="; }; }; "parsejson-0.0.1" = { @@ -34356,6 +35112,15 @@ let sha512 = "bpuBhROdrhuN3E7G/koAju0WjVw9/uQOG5Co5mokNj0MiOSBVZS1JTwM4zl55hu0WFmIEFvO9cU9sJQiBIYeIA=="; }; }; + "patch-console-1.0.0" = { + name = "patch-console"; + packageName = "patch-console"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/patch-console/-/patch-console-1.0.0.tgz"; + sha512 = "nxl9nrnLQmh64iTzMfyylSlRozL7kAXIaxw1fVcLYdyhNkJCRUzirRZTikXGJsg+hc4fqpneTK6iU2H1Q8THSA=="; + }; + }; "patch-package-6.2.2" = { name = "patch-package"; packageName = "patch-package"; @@ -34851,13 +35616,13 @@ let sha512 = "TRDp5fJKRBtVlxd4CTox3rJL+TzwQztB/VNmT5n87zFgKVU7ztnmZkcX1zypPP+3ZZcveOTYKJy74UXdVBaXFQ=="; }; }; - "pino-std-serializers-2.4.2" = { + "pino-std-serializers-2.5.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; - version = "2.4.2"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.4.2.tgz"; - sha512 = "WaL504dO8eGs+vrK+j4BuQQq6GLKeCCcHaMB2ItygzVURcL1CycwNEUHTD/lHFHs/NL5qAz2UKrjYWXKSf4aMQ=="; + url = "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.5.0.tgz"; + sha512 = "wXqbqSrIhE58TdrxxlfLwU9eDhrzppQDvGhBEr1gYbzzM4KKo3Y63gSjiDXRKLVS2UOXdPNR2v+KnQgNrs+xUg=="; }; }; "pipe-functions-1.3.0" = { @@ -35022,24 +35787,6 @@ let sha1 = "868aae2e0df8989b026562b35cbc19cfd8bb780d"; }; }; - "plugin-error-0.1.2" = { - name = "plugin-error"; - packageName = "plugin-error"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz"; - sha1 = "3b9bb3335ccf00f425e07437e19276967da47ace"; - }; - }; - "plugin-error-1.0.1" = { - name = "plugin-error"; - packageName = "plugin-error"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/plugin-error/-/plugin-error-1.0.1.tgz"; - sha512 = "L1zP0dk7vGweZME2i+EeakvUNqSrdiI3F91TwEoYiGrAfUXmVv6fJIq4g82PAXxNsWOp0J7ZqQy/3Szz0ajTxA=="; - }; - }; "plur-2.1.2" = { name = "plur"; packageName = "plur"; @@ -35185,13 +35932,13 @@ let sha512 = "03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw=="; }; }; - "postcss-calc-7.0.2" = { + "postcss-calc-7.0.3" = { name = "postcss-calc"; packageName = "postcss-calc"; - version = "7.0.2"; + version = "7.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.2.tgz"; - sha512 = "rofZFHUg6ZIrvRwPeFktv06GdbDYLcGqh9EwiMutZg+a0oePCCw1zHOEiji6LCpyRcjTREtPASuUqeAvYlEVvQ=="; + url = "https://registry.npmjs.org/postcss-calc/-/postcss-calc-7.0.3.tgz"; + sha512 = "IB/EAEmZhIMEIhG7Ov4x+l47UaXOS1n2f4FBUk/aKllQhtSCxWhTzn0nJgkqN7fo/jcWySvWTSB6Syk9L+31bA=="; }; }; "postcss-colormin-4.0.3" = { @@ -35374,6 +36121,15 @@ let sha512 = "D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g=="; }; }; + "postcss-modules-3.2.2" = { + name = "postcss-modules"; + packageName = "postcss-modules"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules/-/postcss-modules-3.2.2.tgz"; + sha512 = "JQ8IAqHELxC0N6tyCg2UF40pACY5oiL6UpiqqcIFRWqgDYO8B0jnxzoQ0EOpPrWXvcpu6BSbQU/3vSiq7w8Nhw=="; + }; + }; "postcss-modules-extract-imports-1.1.0" = { name = "postcss-modules-extract-imports"; packageName = "postcss-modules-extract-imports"; @@ -35383,6 +36139,15 @@ let sha1 = "b614c9720be6816eaee35fb3a5faa1dba6a05ddb"; }; }; + "postcss-modules-extract-imports-2.0.0" = { + name = "postcss-modules-extract-imports"; + packageName = "postcss-modules-extract-imports"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz"; + sha512 = "LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ=="; + }; + }; "postcss-modules-local-by-default-1.2.0" = { name = "postcss-modules-local-by-default"; packageName = "postcss-modules-local-by-default"; @@ -35392,6 +36157,15 @@ let sha1 = "f7d80c398c5a393fa7964466bd19500a7d61c069"; }; }; + "postcss-modules-local-by-default-3.0.3" = { + name = "postcss-modules-local-by-default"; + packageName = "postcss-modules-local-by-default"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; + sha512 = "e3xDq+LotiGesympRlKNgaJ0PCzoUIdpH0dj47iWAui/kyTgh3CiAr1qP54uodmJhl6p9rN6BoNcdEDVJx9RDw=="; + }; + }; "postcss-modules-scope-1.1.0" = { name = "postcss-modules-scope"; packageName = "postcss-modules-scope"; @@ -35401,6 +36175,15 @@ let sha1 = "d6ea64994c79f97b62a72b426fbe6056a194bb90"; }; }; + "postcss-modules-scope-2.2.0" = { + name = "postcss-modules-scope"; + packageName = "postcss-modules-scope"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.2.0.tgz"; + sha512 = "YyEgsTMRpNd+HmyC7H/mh3y+MeFWevy7V1evVhJWewmMbjDHIbZbOXICC2y+m1xI1UVfIT1HMW/O04Hxyu9oXQ=="; + }; + }; "postcss-modules-values-1.3.0" = { name = "postcss-modules-values"; packageName = "postcss-modules-values"; @@ -35410,6 +36193,15 @@ let sha1 = "ecffa9d7e192518389f42ad0e83f72aec456ea20"; }; }; + "postcss-modules-values-3.0.0" = { + name = "postcss-modules-values"; + packageName = "postcss-modules-values"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz"; + sha512 = "1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg=="; + }; + }; "postcss-normalize-charset-4.0.1" = { name = "postcss-normalize-charset"; packageName = "postcss-normalize-charset"; @@ -35662,6 +36454,15 @@ let sha512 = "97DXOFbQJhk71ne5/Mt6cOu6yxsSfM0QGQyl0L25Gca4yGWEGJaig7l7gbCX623VqTBNGLRLaVUCnNkcedlRSQ=="; }; }; + "postcss-values-parser-1.5.0" = { + name = "postcss-values-parser"; + packageName = "postcss-values-parser"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz"; + sha512 = "3M3p+2gMp0AH3da530TlX8kiO1nxdTnc3C6vr8dMxRLIlh8UYkz0/wcwptSXjhtx2Fr0TySI7a+BHDQ8NL7LaQ=="; + }; + }; "posthtml-0.11.6" = { name = "posthtml"; packageName = "posthtml"; @@ -35671,13 +36472,13 @@ let sha512 = "C2hrAPzmRdpuL3iH0TDdQ6XCc9M7Dcc3zEW5BLerY65G4tWWszwv6nG/ksi6ul5i2mx22ubdljgktXCtNkydkw=="; }; }; - "posthtml-0.13.1" = { + "posthtml-0.13.3" = { name = "posthtml"; packageName = "posthtml"; - version = "0.13.1"; + version = "0.13.3"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml/-/posthtml-0.13.1.tgz"; - sha512 = "8aJZ63WYL9YsAZVcrIn6U0dSYbna7hcTceZjnbH7dilg01t4t3JDx0UovbhGFscFJg/++qhECCjGEQuJAqD7dA=="; + url = "https://registry.npmjs.org/posthtml/-/posthtml-0.13.3.tgz"; + sha512 = "5NL2bBc4ihAyoYnY0EAQrFQbJNE1UdvgC1wjYts0hph7jYeU2fa5ki3/9U45ce9V6M1vLMEgUX2NXe/bYL+bCQ=="; }; }; "posthtml-parser-0.4.2" = { @@ -35689,6 +36490,15 @@ let sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg=="; }; }; + "posthtml-parser-0.5.0" = { + name = "posthtml-parser"; + packageName = "posthtml-parser"; + version = "0.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.0.tgz"; + sha512 = "BsZFAqOeX9lkJJPKG2JmGgtm6t++WibU7FeS40FNNGZ1KS2szRSRQ8Wr2JLvikDgAecrQ/9V4sjugTAin2+KVw=="; + }; + }; "posthtml-render-1.2.3" = { name = "posthtml-render"; packageName = "posthtml-render"; @@ -35707,6 +36517,15 @@ let sha512 = "GV+nsUXuPW2p8Zy7SarF/2W/oiK8bFQgJcncoJ0d7kRpekEA0ftChjfEaF9/Y+QJEc/wFR7RAEa8lYByuUIe2g=="; }; }; + "precinct-6.3.1" = { + name = "precinct"; + packageName = "precinct"; + version = "6.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/precinct/-/precinct-6.3.1.tgz"; + sha512 = "JAwyLCgTylWminoD7V0VJwMElWmwrVSR6r9HaPWCoswkB4iFzX7aNtO7VBfAVPy+NhmjKb8IF8UmlWJXzUkOIQ=="; + }; + }; "precond-0.2.3" = { name = "precond"; packageName = "precond"; @@ -35779,6 +36598,15 @@ let sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; }; }; + "prettier-2.1.1" = { + name = "prettier"; + packageName = "prettier"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz"; + sha512 = "9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw=="; + }; + }; "prettier-bytes-1.0.4" = { name = "prettier-bytes"; packageName = "prettier-bytes"; @@ -35806,15 +36634,6 @@ let sha512 = "2UzApPuxi2yRoyMlXMazgR6UcH9DKJhNgCviIwY3ixZ9THWSSrUww5vkiZ3C48WvpFl1M1y/oU63deSy1puWEA=="; }; }; - "prettier-eslint-9.0.2" = { - name = "prettier-eslint"; - packageName = "prettier-eslint"; - version = "9.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-9.0.2.tgz"; - sha512 = "u6EQqxUhaGfra9gy9shcR7MT7r/2twwEfRGy1tfzyaJvLQwSg34M9IU5HuF7FsLW2QUgr5VIUc56EPWibw1pdw=="; - }; - }; "prettier-stylelint-0.4.2" = { name = "prettier-stylelint"; packageName = "prettier-stylelint"; @@ -35851,6 +36670,15 @@ let sha512 = "zf9NV1NSlDLDjycnwm6hpFATCGl/K1lt0R/GdkAK2O5LN/rwJoB+Mh93gGJjut4YbmecbfgLWVGSTCr0Ewvvbw=="; }; }; + "pretty-format-24.9.0" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "24.9.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-24.9.0.tgz"; + sha512 = "00ZMZUiHaJrNfk33guavqgvfJS30sLYf0f8+Srklv0AMPodGGHcoHgksZ3OThYnIvOd+8yMCn0YiEOogjlgsnA=="; + }; + }; "pretty-hash-1.0.1" = { name = "pretty-hash"; packageName = "pretty-hash"; @@ -35869,6 +36697,15 @@ let sha1 = "b7e3ea42435a4c9b2759d99e0f201eb195802ee1"; }; }; + "pretty-ms-5.1.0" = { + name = "pretty-ms"; + packageName = "pretty-ms"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-5.1.0.tgz"; + sha512 = "4gaK1skD2gwscCfkswYQRmddUb2GJZtzDGRjHWadVHtK/DIKFufa12MvES6/xu1tVbUYeia5bmLcwJtZJQUqnw=="; + }; + }; "prettyjson-1.2.1" = { name = "prettyjson"; packageName = "prettyjson"; @@ -35923,13 +36760,13 @@ let sha512 = "dG2w7WtovUa4SiYTdWn9H8Bd4JNdei2djtkP/Bk9fXq81j5Q15ZPHYSwhUVvBRbp5zMkGtu0Yk62HuMcly0pRw=="; }; }; - "prismjs-1.20.0" = { + "prismjs-1.21.0" = { name = "prismjs"; packageName = "prismjs"; - version = "1.20.0"; + version = "1.21.0"; src = fetchurl { - url = "https://registry.npmjs.org/prismjs/-/prismjs-1.20.0.tgz"; - sha512 = "AEDjSrVNkynnw6A+B1DsFkd6AVdTnp+/WoUixFRULlCLZVRZlVQMVWio/16jv7G1FscUxQxOQhWwApgbnxr6kQ=="; + url = "https://registry.npmjs.org/prismjs/-/prismjs-1.21.0.tgz"; + sha512 = "uGdSIu1nk3kej2iZsLyDoJ7e9bnPzIgY0naW/HdknGj61zScaprVEVGHrPoXqI+M9sP0NDnTK2jpkvmldpuqDw=="; }; }; "private-0.1.8" = { @@ -36274,13 +37111,13 @@ let sha512 = "SmjEuAf3hc3h3rWZ6V1YaaQw2MNJWK848gLJgzx/sefOJdNLujKinJVXIS0q2cBQpQn2Q32TinawZyDZPzm4kQ=="; }; }; - "protocols-1.4.7" = { + "protocols-1.4.8" = { name = "protocols"; packageName = "protocols"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://registry.npmjs.org/protocols/-/protocols-1.4.7.tgz"; - sha512 = "Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg=="; + url = "https://registry.npmjs.org/protocols/-/protocols-1.4.8.tgz"; + sha512 = "IgjKyaUSjsROSO8/D49Ab7hP8mJgTYcqApOqdPhLoPxAplXmkp+zRvsrSQjFn5by0rhm4VH0GAUELIPpx7B1yg=="; }; }; "protoduck-5.0.1" = { @@ -36337,15 +37174,6 @@ let sha1 = "a3fdf1befb730f951965872ac2f6074c61477a56"; }; }; - "prr-0.0.0" = { - name = "prr"; - packageName = "prr"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz"; - sha1 = "1a84b85908325501411853d0081ee3fa86e2926a"; - }; - }; "prr-1.0.1" = { name = "prr"; packageName = "prr"; @@ -36463,6 +37291,15 @@ let sha512 = "qE3YhESP2mRAWMFJgKdtT5D7ckThRScXRwkfo+Erqga7dyJdY3ZquspprMCj/9sJ2ijm5hXFWQE/A3l4poMWiQ=="; }; }; + "pug-error-2.0.0" = { + name = "pug-error"; + packageName = "pug-error"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz"; + sha512 = "sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ=="; + }; + }; "pug-filters-3.1.1" = { name = "pug-filters"; packageName = "pug-filters"; @@ -36481,6 +37318,15 @@ let sha512 = "i55yzEBtjm0mlplW4LoANq7k3S8gDdfC6+LThGEvsK4FuobcKfDAwt6V4jKPH9RtiE3a2Akfg5UpafZ1OksaPA=="; }; }; + "pug-lexer-5.0.0" = { + name = "pug-lexer"; + packageName = "pug-lexer"; + version = "5.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.0.tgz"; + sha512 = "52xMk8nNpuyQ/M2wjZBN5gXQLIylaGkAoTk5Y1pBhVqaopaoj8Z0iVzpbFZAqitL4RHNVDZRnJDsqEYe99Ti0A=="; + }; + }; "pug-linker-3.0.6" = { name = "pug-linker"; packageName = "pug-linker"; @@ -37345,13 +38191,13 @@ let sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; }; }; - "querystringify-2.1.1" = { + "querystringify-2.2.0" = { name = "querystringify"; packageName = "querystringify"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz"; - sha512 = "w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA=="; + url = "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz"; + sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ=="; }; }; "queue-4.5.1" = { @@ -37525,6 +38371,15 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; + "random-item-1.0.0" = { + name = "random-item"; + packageName = "random-item"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/random-item/-/random-item-1.0.0.tgz"; + sha1 = "16ee31626cb050c8a1686a5f0f42a6b99a2aaf11"; + }; + }; "random-iterate-1.0.1" = { name = "random-iterate"; packageName = "random-iterate"; @@ -37687,6 +38542,15 @@ let sha512 = "YMZQQq32xHLX0bz5Mnibv1/LHb3Sqzngu7xstSM+vrkE5Kzr9xE0yMByK5kMoTK30YVJE61WfbxIFFvfeDKT1w=="; }; }; + "react-devtools-core-4.8.2" = { + name = "react-devtools-core"; + packageName = "react-devtools-core"; + version = "4.8.2"; + src = fetchurl { + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.8.2.tgz"; + sha512 = "3Lv3nI8FPAwKqUco35oOlgf+4j8mgYNnIcDv2QTfxEqg2G69q17ZJ8ScU9aBnymS28YC1OW+kTxLmdIQeTN8yg=="; + }; + }; "react-dom-16.13.1" = { name = "react-dom"; packageName = "react-dom"; @@ -37696,13 +38560,22 @@ let sha512 = "81PIMmVLnCNLO/fFOQxdQkvEq/+Hfpv24XNJfpyZhTRfO0QcmQIF/PgCa1zCOj2w1hrn12MFLyaJ/G0+Mxtfag=="; }; }; - "react-dropdown-aria-2.0.7" = { - name = "react-dropdown-aria"; - packageName = "react-dropdown-aria"; - version = "2.0.7"; + "react-dropdown-1.8.0" = { + name = "react-dropdown"; + packageName = "react-dropdown"; + version = "1.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.8.0.tgz"; + sha512 = "B1vkFk2vkUOf5JFd+Gk8yJdZkSoE4F689Lb93vc0pLcu6cabqlGMYgIzLJuzT+BMy7guk+OXbLDs0pMX8BvEbw=="; + }; + }; + "react-hot-loader-4.12.21" = { + name = "react-hot-loader"; + packageName = "react-hot-loader"; + version = "4.12.21"; src = fetchurl { - url = "https://registry.npmjs.org/react-dropdown-aria/-/react-dropdown-aria-2.0.7.tgz"; - sha512 = "wRjmmMUmA/q33ZugY0lTka4b6jY1ehp8qgHG2yeda64z5I0gTOtyxUVI/tA9ZBlBqysDN22hMGHNMnPb2sg+Qw=="; + url = "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.12.21.tgz"; + sha512 = "Ynxa6ROfWUeKWsTHxsrL2KMzujxJVPjs385lmB2t5cHUxdoRPGind9F00tOkdc1l5WBleOF4XEAMILY1KPIIDA=="; }; }; "react-is-16.13.1" = { @@ -37714,6 +38587,15 @@ let sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; }; + "react-lifecycles-compat-3.0.4" = { + name = "react-lifecycles-compat"; + packageName = "react-lifecycles-compat"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; + sha512 = "fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="; + }; + }; "react-reconciler-0.24.0" = { name = "react-reconciler"; packageName = "react-reconciler"; @@ -37795,22 +38677,22 @@ let sha1 = "2724fd6a8113d73764ac288d4386270c1dbf17f0"; }; }; - "read-package-json-2.1.1" = { + "read-package-json-2.1.2" = { name = "read-package-json"; packageName = "read-package-json"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.1.tgz"; - sha512 = "dAiqGtVc/q5doFz6096CcnXhpYk0ZN8dEKVkGLU0CsASt8SrgF6SF7OTKAYubfvFhWaqofl+Y8HK19GR8jwW+A=="; + url = "https://registry.npmjs.org/read-package-json/-/read-package-json-2.1.2.tgz"; + sha512 = "D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA=="; }; }; - "read-package-json-fast-1.1.3" = { + "read-package-json-fast-1.2.1" = { name = "read-package-json-fast"; packageName = "read-package-json-fast"; - version = "1.1.3"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.1.3.tgz"; - sha512 = "MmFqiyfCXV2Dmm4jH24DEGhxdkUDFivJQj4oPZQPOKywxR7HWBE6WnMWDAapfFHi3wm1b+mhR+XHlUH0CL8axg=="; + url = "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-1.2.1.tgz"; + sha512 = "OFbpwnHcv74Oa5YN5WvbOBfLw6yPmPcwvyJJw/tj9cWFBF7juQUDLDSZiOjEcgzfweWeeROOmbPpNN1qm4hcRg=="; }; }; "read-package-tree-5.3.1" = { @@ -37885,6 +38767,15 @@ let sha512 = "XBQjqOBtTzyol2CpsQOw8LHV0XbDZVG7xMMjmXAJomlVY03WOBRmYgDJETlvcg0H63AJvPRwT7GFi5rvOzUOKg=="; }; }; + "read-pkg-up-6.0.0" = { + name = "read-pkg-up"; + packageName = "read-pkg-up"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-6.0.0.tgz"; + sha512 = "odtTvLl+EXo1eTsMnoUHRmg/XmXdTkwXVxy4VFE9Kp6cCq7b3l7QMdBndND3eAFzrbSAXC/WCUOQQ9rLjifKZw=="; + }; + }; "read-pkg-up-7.0.1" = { name = "read-pkg-up"; packageName = "read-pkg-up"; @@ -37993,15 +38884,6 @@ let sha512 = "1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ=="; }; }; - "readdirp-3.3.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.3.0.tgz"; - sha512 = "zz0pAkSPOXXm1viEwygWIPSPkcBYjW1xU5j/JBh5t9bGCJwa6f9+BJa6VaB2g+b55yVrmXzqkyLf4xaWYM0IkQ=="; - }; - }; "readdirp-3.4.0" = { name = "readdirp"; packageName = "readdirp"; @@ -38056,6 +38938,15 @@ let sha1 = "451fd3004ab1e4df9b4e4b66376b2a21912462d3"; }; }; + "recast-0.17.2" = { + name = "recast"; + packageName = "recast"; + version = "0.17.2"; + src = fetchurl { + url = "https://registry.npmjs.org/recast/-/recast-0.17.2.tgz"; + sha512 = "YHFvn4rBXl8eIjALjUiOV/AP3xFpyGNGNHDw9mAncAWuIdgnBKjbZQ9+P3VlsKcNaNapRVFlTEX1dvDRlYwyxg=="; + }; + }; "recast-0.18.10" = { name = "recast"; packageName = "recast"; @@ -38146,13 +39037,13 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; - "redoc-2.0.0-rc.36" = { + "redoc-2.0.0-rc.8-1" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.36"; + version = "2.0.0-rc.8-1"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.36.tgz"; - sha512 = "vTK1slMn1FcV4QwiBxFL6adIzYoOPzrkRsVyedGj4SrqjIJXuQ5HWVsxpMGoru45tgp3bs7Jy3TBOcEdOYjbbg=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.8-1.tgz"; + sha512 = "/YoCdcl2QtveKz4CTXaqtOfCIaVgZZgcnfUNC5xK7xBl/LxTiNj3tUbgFmrYMLTZGzNdQ9TUJpsa7lXDKcr8Pw=="; }; }; "reduce-component-1.0.1" = { @@ -38182,13 +39073,13 @@ let sha512 = "pNqnf9q1hI5HHZRBkj3bAngGZW/JMCmexDlOxw4XagXY2o1327nHH54LoTjiPJ0gizoqPDRqWyX/00g0hD6w+A=="; }; }; - "reftools-1.1.4" = { + "reftools-1.1.5" = { name = "reftools"; packageName = "reftools"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/reftools/-/reftools-1.1.4.tgz"; - sha512 = "Y8VEk3OXPwuU+ZAAPiR0YhYy9iBSO3NBRnXHGfqW6c2mo2V+fQ0cwRA38Ny6z9ZzcAo6HjmVvAri+wz3+8fsdQ=="; + url = "https://registry.npmjs.org/reftools/-/reftools-1.1.5.tgz"; + sha512 = "o7RX5wMzITYj+8P8oaccFH2xYu5nQ63TH0d73Ce5YgpiY9NyFytaQfeg1p1Z5T4yfjKSj0sYuUscBqZgkLsooQ=="; }; }; "regenerate-1.4.1" = { @@ -38371,13 +39262,13 @@ let sha512 = "64O87/dPDgfk8/RQqC4gkZoGyyWFIEUTTh80CU6CWuK5vkCGyekIx+oKcEIYtP/RAxSQltCZHCNu/mdd7fqlJw=="; }; }; - "rehype-parse-6.0.2" = { + "rehype-parse-7.0.1" = { name = "rehype-parse"; packageName = "rehype-parse"; - version = "6.0.2"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-6.0.2.tgz"; - sha512 = "0S3CpvpTAgGmnz8kiCyFLGuW5yA4OQhyNTm/nwPopZ7+PI11WnGl1TTWTGv/2hPEe/g2jRLlhVVSsoDH8waRug=="; + url = "https://registry.npmjs.org/rehype-parse/-/rehype-parse-7.0.1.tgz"; + sha512 = "fOiR9a9xH+Le19i4fGzIEowAbwG7idy2Jzs4mOrFWBSJ0sNUgy0ev871dwWnbOo371SjgjG4pwzrbgSVrKxecw=="; }; }; "rehype-retext-2.0.4" = { @@ -38488,6 +39379,15 @@ let sha512 = "fM5eZPBvu2pVNoq3ZPW22q+5Ativ1oLozq2qYt9I2oNyxiUd/tDl0iLLntEVAegpZIslPWg1brhcP1VsaSVUag=="; }; }; + "remark-frontmatter-2.0.0" = { + name = "remark-frontmatter"; + packageName = "remark-frontmatter"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-frontmatter/-/remark-frontmatter-2.0.0.tgz"; + sha512 = "uNOQt4tO14qBFWXenF0MLC4cqo3dv8qiHPGyjCl1rwOT0LomSHpcElbjjVh5CwzElInB38HD8aSRVugKQjeyHA=="; + }; + }; "remark-html-2.0.2" = { name = "remark-html"; packageName = "remark-html"; @@ -38497,13 +39397,22 @@ let sha1 = "592a347bdd3d5881f4f080c98b5b152fb1407a92"; }; }; - "remark-message-control-5.0.0" = { + "remark-mdx-2.0.0-next.7" = { + name = "remark-mdx"; + packageName = "remark-mdx"; + version = "2.0.0-next.7"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-mdx/-/remark-mdx-2.0.0-next.7.tgz"; + sha512 = "JHYCfxJzvjTw8h5y10f+mCvbfIt5klAkWlULqPu1nM/r6ghF3tzJl0AFQFj5b/m/7U553+yYb/y4n0julMERYA=="; + }; + }; + "remark-message-control-6.0.0" = { name = "remark-message-control"; packageName = "remark-message-control"; - version = "5.0.0"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-5.0.0.tgz"; - sha512 = "JQYGtMoMP2gUWzoR1rFU4GEr4HAieoDlD1jmwEYP82bnmHFPv2AK6ImVwFcrB4DcCFCM6bFBTOWMLzt06cz5vA=="; + url = "https://registry.npmjs.org/remark-message-control/-/remark-message-control-6.0.0.tgz"; + sha512 = "k9bt7BYc3G7YBdmeAhvd3VavrPa/XlKWR3CyHjr4sLO9xJyly8WHHT3Sp+8HPR8lEUv+/sZaffL7IjMLV0f6BA=="; }; }; "remark-parse-1.1.0" = { @@ -38542,22 +39451,22 @@ let sha512 = "QbDXWN4HfKTUC0hHa4teU463KclLAnwpn/FBn87j9cKYJWWawbiLgMfP2Q4XwhxxuuuOxHlw+pSN0OKuJwyVvg=="; }; }; - "remark-parse-7.0.2" = { + "remark-parse-8.0.3" = { name = "remark-parse"; packageName = "remark-parse"; - version = "7.0.2"; + version = "8.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/remark-parse/-/remark-parse-7.0.2.tgz"; - sha512 = "9+my0lQS80IQkYXsMA8Sg6m9QfXYJBnXjWYN5U+kFc5/n69t+XZVXU/ZBYr3cYH8FheEGf1v87rkFDhJ8bVgMA=="; + url = "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz"; + sha512 = "E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q=="; }; }; - "remark-retext-3.1.3" = { + "remark-retext-4.0.0" = { name = "remark-retext"; packageName = "remark-retext"; - version = "3.1.3"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/remark-retext/-/remark-retext-3.1.3.tgz"; - sha512 = "UujXAm28u4lnUvtOZQFYfRIhxX+auKI9PuA2QpQVTT7gYk1OgX6o0OUrSo1KOa6GNrFX+OODOtS5PWIHPxM7qw=="; + url = "https://registry.npmjs.org/remark-retext/-/remark-retext-4.0.0.tgz"; + sha512 = "cYCchalpf25bTtfXF24ribYvqytPKq0TiEhqQDBHvVEEsApebwruPWP1cTcvTFBidmpXyqzycm+y8ng7Kmvc8Q=="; }; }; "remark-stringify-1.1.0" = { @@ -38587,6 +39496,15 @@ let sha512 = "eRWGdEPMVudijE/psbIDNcnJLRVx3xhfuEsTDGgH4GsFF91dVhw5nhmnBppafJ7+NWINW6C7ZwWbi30ImJzqWg=="; }; }; + "remark-stringify-8.1.1" = { + name = "remark-stringify"; + packageName = "remark-stringify"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-8.1.1.tgz"; + sha512 = "q4EyPZT3PcA3Eq7vPpT6bIdokXzFGp9i85igjmhRyXWmPs0Y6/d2FYwUNotKAWyLch7g0ASZJn/KHHcHZQ163A=="; + }; + }; "remove-array-items-1.1.1" = { name = "remove-array-items"; packageName = "remove-array-items"; @@ -38839,6 +39757,15 @@ let sha512 = "NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg=="; }; }; + "require-package-name-2.0.1" = { + name = "require-package-name"; + packageName = "require-package-name"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz"; + sha1 = "c11e97276b65b8e2923f75dabf5fb2ef0c3841b9"; + }; + }; "require-relative-0.8.7" = { name = "require-relative"; packageName = "require-relative"; @@ -38857,15 +39784,6 @@ let sha1 = "4e0d56d6c9662fd31e43011c4b95aa49955421d3"; }; }; - "requireg-0.2.2" = { - name = "requireg"; - packageName = "requireg"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/requireg/-/requireg-0.2.2.tgz"; - sha512 = "nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg=="; - }; - }; "requirejs-2.3.6" = { name = "requirejs"; packageName = "requirejs"; @@ -38902,13 +39820,13 @@ let sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; - "resolve-1.7.1" = { + "resolve-2.0.0-next.1" = { name = "resolve"; packageName = "resolve"; - version = "1.7.1"; + version = "2.0.0-next.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz"; - sha512 = "c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.1.tgz"; + sha512 = "ZGTmuLZAW++TDjgslfUMRZcv7kXHv8z0zwxvuRWOPjnqc56HVsn1lVaqsWOZeQ8MwiilPVJLrcPVKG909QsAfA=="; }; }; "resolve-alpn-1.0.0" = { @@ -39118,22 +40036,22 @@ let sha512 = "yr1PgaBDde+25aJXrnt3p1jvT8FVLVat2Bx8XeAWX13KXo8OT+3nWGU3HWxM4YFJvmfqvJYJZG2d7xxaO774gw=="; }; }; - "retext-equality-4.3.0" = { + "retext-equality-5.2.0" = { name = "retext-equality"; packageName = "retext-equality"; - version = "4.3.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/retext-equality/-/retext-equality-4.3.0.tgz"; - sha512 = "jW+6X5BrxVEaZ71qLIaqK6/Y+jqlxijVOcPH2SdHtNaMIHJWvBf5fd1IgHmEp0UREth0YQSI7KNtJurrSPQyMA=="; + url = "https://registry.npmjs.org/retext-equality/-/retext-equality-5.2.0.tgz"; + sha512 = "qfyDsVvwI6RsbyBi5GDRnutDbRMQj5zzK5oVg6ddKhONle2ZmQ/DBg9mz9QLKdnGhp8aW5xoVskXgwHufSQa3g=="; }; }; - "retext-profanities-5.0.0" = { + "retext-profanities-6.1.0" = { name = "retext-profanities"; packageName = "retext-profanities"; - version = "5.0.0"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-5.0.0.tgz"; - sha512 = "zaPCKtrMDLs0U/2yN3V3rpYn1VZ3hW+AsEZdovWIRlEYZPCaUmkChOSob45LOQYJUnM+YZIahXuU9zHPm+aTKQ=="; + url = "https://registry.npmjs.org/retext-profanities/-/retext-profanities-6.1.0.tgz"; + sha512 = "40Ym0WOgy7rRY4tR2iL01g3Y5Ql+9NBV21hycIhNX3uv+6vjaWB30NWN+tTcxNIWBJEwXHoTDMiVdAMm6ZpHVA=="; }; }; "rethinkdb-2.4.2" = { @@ -39379,13 +40297,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.23.0" = { + "rollup-2.26.5" = { name = "rollup"; packageName = "rollup"; - version = "2.23.0"; + version = "2.26.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.23.0.tgz"; - sha512 = "vLNmZFUGVwrnqNAJ/BvuLk1MtWzu4IuoqsH9UWK5AIdO3rt8/CSiJNvPvCIvfzrbNsqKbNzPAG1V2O4eTe2XZg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.26.5.tgz"; + sha512 = "rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -39757,6 +40675,15 @@ let sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; }; + "safe-join-0.1.3" = { + name = "safe-join"; + packageName = "safe-join"; + version = "0.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-join/-/safe-join-0.1.3.tgz"; + sha512 = "Ylh1EWn4pmL57HRV/oi4Ye7ws5AxKkdGpyDdWsvZob5VLH8xnQpG8tqmHD5v4SdKlN7hyrBjYt7Jm3faeC+uJg=="; + }; + }; "safe-json-stringify-1.2.0" = { name = "safe-json-stringify"; packageName = "safe-json-stringify"; @@ -40297,15 +41224,6 @@ let sha1 = "ae02af3a424793d8ccbf212d69174e0c54dffe38"; }; }; - "sequencify-0.0.7" = { - name = "sequencify"; - packageName = "sequencify"; - version = "0.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/sequencify/-/sequencify-0.0.7.tgz"; - sha1 = "90cff19d02e07027fd767f5ead3e7b95d1e7380c"; - }; - }; "serialize-error-7.0.1" = { name = "serialize-error"; packageName = "serialize-error"; @@ -40315,15 +41233,6 @@ let sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw=="; }; }; - "serialize-javascript-3.1.0" = { - name = "serialize-javascript"; - packageName = "serialize-javascript"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz"; - sha512 = "JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg=="; - }; - }; "serialize-javascript-4.0.0" = { name = "serialize-javascript"; packageName = "serialize-javascript"; @@ -40738,13 +41647,13 @@ let sha1 = "c27415a9e458f2fed39b27cf8eb37c003782b431"; }; }; - "side-channel-1.0.2" = { + "side-channel-1.0.3" = { name = "side-channel"; packageName = "side-channel"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.2.tgz"; - sha512 = "7rL9YlPHg7Ancea1S96Pa8/QWb4BtXL/TZvS6B8XFetGBeuhAsfmUspK6DokBeZ64+Kj9TCNRD/30pVz1BvQNA=="; + url = "https://registry.npmjs.org/side-channel/-/side-channel-1.0.3.tgz"; + sha512 = "A6+ByhlLkksFoUepsGxfj5x1gTSrs+OydsRptUxeNCabQpCFUvcwIczgOigI8vhY/OJCnPnyE9rGiwgvr9cS1g=="; }; }; "sift-7.0.1" = { @@ -41215,13 +42124,22 @@ let sha512 = "3UlyogA67/9WOssJ7s4d7gqWQRWyO/LbgdBBNMhhmFDKa7eTUSW+A782CVHgyDSJZ2kNANcMWwMiOL+h3p6zQg=="; }; }; - "snyk-docker-plugin-3.16.0" = { + "snyk-cpp-plugin-1.4.0" = { + name = "snyk-cpp-plugin"; + packageName = "snyk-cpp-plugin"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-cpp-plugin/-/snyk-cpp-plugin-1.4.0.tgz"; + sha512 = "DaI2u42FRvASQpcu+p52nzDd3QPsrIHLN4JxnvcH32diPps9ynkx5CMNkarBgDo00GZfsWgz9RrDfDFCx3TSQQ=="; + }; + }; + "snyk-docker-plugin-3.18.1" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "3.16.0"; + version = "3.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.16.0.tgz"; - sha512 = "i11WxMhsZxcFKn123LeA+u77NN7uWqWgPfQ6dvkACJnvouWHZidkOAxBOmYU49x8VS7dEQSe2Ym0bgr6EHn4cQ=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-3.18.1.tgz"; + sha512 = "cuFv5nfVpnbUy9dCMJ2YDh7gnKMUUMGF665BUHcx2UyJASvnYt5GFf/fyrm652Va/qb3dIYaugg+Hv9EMeZTVw=="; }; }; "snyk-go-parser-1.4.1" = { @@ -41278,13 +42196,13 @@ let sha512 = "HHuOYEAACpUpkFgU8HT57mmxmonaJ4O3YADoSkVhnhkmJ+AowqZyJOau703dYHNrq2DvQ7qYw81H7yyxS1Nfjw=="; }; }; - "snyk-mvn-plugin-2.18.2" = { + "snyk-mvn-plugin-2.19.1" = { name = "snyk-mvn-plugin"; packageName = "snyk-mvn-plugin"; - version = "2.18.2"; + version = "2.19.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.18.2.tgz"; - sha512 = "A36YmfpeEXGsKoChm644DysKG40d5y5MZnldkpsbrLz37R3JMxkt4igMACZ9QJZAkiWjVs28hOKyyT1vuMPlHg=="; + url = "https://registry.npmjs.org/snyk-mvn-plugin/-/snyk-mvn-plugin-2.19.1.tgz"; + sha512 = "VXYJSdhUmOQAyxdsv5frAKbi3UOcHPabWEQxQ9wxhVBEEmx2lP5ajv1a+ntxwWwL7u3jdc+rnCIKHpLlQJ5nyw=="; }; }; "snyk-nodejs-lockfile-parser-1.22.0" = { @@ -41296,13 +42214,13 @@ let sha512 = "l6jLoJxqcIIkQopSdQuAstXdMw5AIgLu+uGc5CYpHyw8fYqOwna8rawwofNeGuwJAAv4nEiNiexeYaR88OCq6Q=="; }; }; - "snyk-nodejs-lockfile-parser-1.26.3" = { + "snyk-nodejs-lockfile-parser-1.27.0" = { name = "snyk-nodejs-lockfile-parser"; packageName = "snyk-nodejs-lockfile-parser"; - version = "1.26.3"; + version = "1.27.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.26.3.tgz"; - sha512 = "mBQ6vhnXAeyMxlnl9amjJWpA+/3qqXwM8Sj/P+9uH2TByOFLxdGzMNQFcl3q/H2yUdcs/epVdXJp09A2dK2glA=="; + url = "https://registry.npmjs.org/snyk-nodejs-lockfile-parser/-/snyk-nodejs-lockfile-parser-1.27.0.tgz"; + sha512 = "s1yEqEC8uxELzEXqXmnWKpoOIn0rM8StMjuy0X5U+FmxGvO3jRtFDU5hcVw9cAULLfrQYBHRowrO/5FaR79fxA=="; }; }; "snyk-nuget-plugin-1.18.1" = { @@ -41620,6 +42538,15 @@ let sha512 = "mbkiyA2clyfwAyOFIzMvsV6ny2KrKEIhFVASJxWfsmgfUEymgLIS2MLHHcGIQMkrcKhPErRaMR5Dzv0EEn+BWg=="; }; }; + "sodium-native-3.2.0" = { + name = "sodium-native"; + packageName = "sodium-native"; + version = "3.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sodium-native/-/sodium-native-3.2.0.tgz"; + sha512 = "8aq/vQSegLwsRch8Sb/Bpf9aAqlNe5dp0+NVhb9UjHv42zDZ0D5zX3wBRUbXK9Ejum9uZE6DUgT4vVLlUFRBWg=="; + }; + }; "sodium-universal-2.0.0" = { name = "sodium-universal"; packageName = "sodium-universal"; @@ -41629,13 +42556,13 @@ let sha512 = "csdVyakzHJRyCevY4aZC2Eacda8paf+4nmRGF2N7KxCLKY2Ajn72JsExaQlJQ2BiXJncp44p3T+b80cU+2TTsg=="; }; }; - "sonic-boom-1.0.2" = { + "sonic-boom-1.1.0" = { name = "sonic-boom"; packageName = "sonic-boom"; - version = "1.0.2"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.0.2.tgz"; - sha512 = "sRMmXu7uFDXoniGvtLHuQk5KWovLWoi6WKASn7rw0ro41mPf0fOolkGp4NE6680CbxvNh26zWNyFQYYWXe33EA=="; + url = "https://registry.npmjs.org/sonic-boom/-/sonic-boom-1.1.0.tgz"; + sha512 = "JyOf+Xt7GBN4tAic/DD1Bitw6OMgSHAnswhPeOiLpfRoSjPNjEIi73UF3OxHzhSNn9WavxGuCZzprFCGFSNwog=="; }; }; "sorcery-0.10.0" = { @@ -41683,13 +42610,13 @@ let sha512 = "e2RHeY1iM6dT9od3RoqeJSyz3O7naNFsGy34+EFEcwghjAncuOXC2/Xwq87S4FbypqLVp6PcizYEsGEGsGIDXA=="; }; }; - "sorted-array-functions-1.2.0" = { + "sorted-array-functions-1.3.0" = { name = "sorted-array-functions"; packageName = "sorted-array-functions"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.2.0.tgz"; - sha512 = "sWpjPhIZJtqO77GN+LD8dDsDKcWZ9GCOJNqKzi1tvtjGIzwfoyuRH8S0psunmc6Z5P+qfDqztSbwYR5X/e1UTg=="; + url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.3.0.tgz"; + sha512 = "2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA=="; }; }; "sorted-immutable-list-1.1.0" = { @@ -42097,6 +43024,15 @@ let sha1 = "825236a78d52a18ff912a631ad3034c15ded5fe3"; }; }; + "split2-1.1.1" = { + name = "split2"; + packageName = "split2"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/split2/-/split2-1.1.1.tgz"; + sha1 = "162d9b18865f02ab2f2ad9585522db9b54c481f9"; + }; + }; "split2-2.2.0" = { name = "split2"; packageName = "split2"; @@ -42106,13 +43042,13 @@ let sha512 = "RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw=="; }; }; - "split2-3.1.1" = { + "split2-3.2.2" = { name = "split2"; packageName = "split2"; - version = "3.1.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/split2/-/split2-3.1.1.tgz"; - sha512 = "emNzr1s7ruq4N+1993yht631/JH+jaj0NYBosuKmLcq+JkGQ9MmTw1RB1fGaTCzUuseRIClrlSLHRNYGwWQ58Q=="; + url = "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz"; + sha512 = "9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg=="; }; }; "sprintf-0.1.5" = { @@ -42151,22 +43087,22 @@ let sha512 = "/0d2YTn8ZFVpIPAU230S9ZLF8WDkSSRWvh/UOLM7zzvkCchum1TtouRgyV8OfgOaYilSGU4lSSqzwBXJVlAwUw=="; }; }; - "sqlite3-4.1.1" = { + "sqlite3-4.2.0" = { name = "sqlite3"; packageName = "sqlite3"; - version = "4.1.1"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.1.1.tgz"; - sha512 = "CvT5XY+MWnn0HkbwVKJAyWEMfzpAPwnTiB3TobA5Mri44SrTovmmh499NPQP+gatkeOipqPlBLel7rn4E/PCQg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz"; + sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; }; }; - "sqlite3-4.2.0" = { + "sqlite3-5.0.0" = { name = "sqlite3"; packageName = "sqlite3"; - version = "4.2.0"; + version = "5.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/sqlite3/-/sqlite3-4.2.0.tgz"; - sha512 = "roEOz41hxui2Q7uYnWsjMOTry6TcNUNmp8audCx18gF10P2NknwdpF+E+HKvz/F2NvPKGGBF4NGc+ZPQ+AABwg=="; + url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.0.0.tgz"; + sha512 = "rjvqHFUaSGnzxDy2AHCwhHy6Zp6MNJzCPGYju4kD8yi6bze4d1/zMTg6C7JI49b7/EM7jKMTvyfN/4ylBKdwfw=="; }; }; "srt2vtt-1.3.1" = { @@ -42286,13 +43222,13 @@ let sha512 = "lbizlDBCtOOnbnz7zS81NOtnAyHnXu9E3gxrAJHZe7oyxINRI7IpQ8J79to9aXzkb8+2M32R8K4whmsAHGvJAg=="; }; }; - "ssb-invite-2.1.5" = { + "ssb-invite-2.1.6" = { name = "ssb-invite"; packageName = "ssb-invite"; - version = "2.1.5"; + version = "2.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/ssb-invite/-/ssb-invite-2.1.5.tgz"; - sha512 = "nihgFMmw+OVz8X/ES47wcfY2at0E9MdSPjHm1yUpG8E5sgORLcdrtOXSRKs6Nd2EXk7FcP49EUr0trUt3G9cFw=="; + url = "https://registry.npmjs.org/ssb-invite/-/ssb-invite-2.1.6.tgz"; + sha512 = "cR2sMFu27K7JNAiHCJ5qsp5kihlxi0/KftJ58gFzQbC8kLQ9iLLFUVDvQMi/Qxubf6Xs37Qh49FH3RzPLGt9ag=="; }; }; "ssb-issues-1.0.0" = { @@ -42619,6 +43555,15 @@ let sha1 = "e923598a9be51e617682cb21cf1b2818a449ada2"; }; }; + "stack-generator-2.0.5" = { + name = "stack-generator"; + packageName = "stack-generator"; + version = "2.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-generator/-/stack-generator-2.0.5.tgz"; + sha512 = "/t1ebrbHkrLrDuNMdeAcsvynWgoH/i4o8EGGfX7dEYDoTXOYVAkEpFdtshlvabzc6JlJ8Kf9YdFEoz7JkzGN9Q=="; + }; + }; "stack-trace-0.0.10" = { name = "stack-trace"; packageName = "stack-trace"; @@ -42637,6 +43582,24 @@ let sha1 = "a8f6eaeca90674c333e7c43953f275b451510695"; }; }; + "stack-utils-2.0.2" = { + name = "stack-utils"; + packageName = "stack-utils"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.2.tgz"; + sha512 = "0H7QK2ECz3fyZMzQ8rH0j2ykpfbnd20BFtfg/SqVC2+sCTtcw0aDTGB7dk+de4U4uUeuz6nOtJcrkFFLG1B0Rg=="; + }; + }; + "stackframe-1.2.0" = { + name = "stackframe"; + packageName = "stackframe"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/stackframe/-/stackframe-1.2.0.tgz"; + sha512 = "GrdeshiRmS1YLMYgzF16olf2jJ/IzxXY9lhKOskuVziubpTYcYqyOwYeJKzQkwy7uN0fYSsbsC4RQaXf9LCrYA=="; + }; + }; "stampit-1.2.0" = { name = "stampit"; packageName = "stampit"; @@ -42691,6 +43654,15 @@ let sha512 = "D8vv82E/Kpmz3TXHKG8PPsCPg+RAX6cbCOyvjM6x04qZtQ47EtJFVwRsdov3n5d6/6ynrOY9XB4JkaZwB2xoRQ=="; }; }; + "static-server-2.2.1" = { + name = "static-server"; + packageName = "static-server"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/static-server/-/static-server-2.2.1.tgz"; + sha512 = "j5eeW6higxYNmXMIT8iHjsdiViTpQDthg7o+SHsRtqdbxscdHqBHXwrXjHC8hL3F0Tsu34ApUpDkwzMBPBsrLw=="; + }; + }; "statistics-3.3.0" = { name = "statistics"; packageName = "statistics"; @@ -42700,6 +43672,15 @@ let sha1 = "ec7b4750ff03ab24a64dd9b357a78316bead78aa"; }; }; + "statsd-client-0.4.5" = { + name = "statsd-client"; + packageName = "statsd-client"; + version = "0.4.5"; + src = fetchurl { + url = "https://registry.npmjs.org/statsd-client/-/statsd-client-0.4.5.tgz"; + sha512 = "tmTpFMxpBcq92CTMq81d1W47GEazy76Hi+aNKvKJloMplQZe+L1jekSg95YG8ieq6j2Q9MboCaLIMdsF20+eGg=="; + }; + }; "statsd-parser-0.0.4" = { name = "statsd-parser"; packageName = "statsd-parser"; @@ -42853,15 +43834,6 @@ let sha1 = "fb4d8a1420ea362764e21ad4780397bebcb41cbe"; }; }; - "stream-consume-0.1.1" = { - name = "stream-consume"; - packageName = "stream-consume"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-consume/-/stream-consume-0.1.1.tgz"; - sha512 = "tNa3hzgkjEP7XbCkbRXe1jpg+ievoa0O4SCFlMOYEscGSS4JJsckGL8swUyAa/ApGU3Ae4t6Honor4HhL+tRyg=="; - }; - }; "stream-counter-0.2.0" = { name = "stream-counter"; packageName = "stream-counter"; @@ -43105,6 +44077,15 @@ let sha512 = "78lwMoCcn0nNu8LszbP1UA7g55OeE4v7rCeWnM5B453rnNr4aq+5it3FEYtZrSEiMvHZOZ9Jlqb0OD0M2VInqg=="; }; }; + "string-hash-1.1.3" = { + name = "string-hash"; + packageName = "string-hash"; + version = "1.1.3"; + src = fetchurl { + url = "https://registry.npmjs.org/string-hash/-/string-hash-1.1.3.tgz"; + sha1 = "e8aafc0ac1855b4666929ed7dd1275df5d6c811b"; + }; + }; "string-kit-0.11.8" = { name = "string-kit"; packageName = "string-kit"; @@ -43285,6 +44266,15 @@ let sha512 = "fqqhZzXyAM6pGD9lky/GOPq6V4X0SeTAFBl0iXb/BzOegl40gpf/bV3QQP7zULNYvjr6+Dx8SCaDULjVoOru0A=="; }; }; + "stringify-entities-3.0.1" = { + name = "stringify-entities"; + packageName = "stringify-entities"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/stringify-entities/-/stringify-entities-3.0.1.tgz"; + sha512 = "Lsk3ISA2++eJYqBMPKcr/8eby1I6L0gP0NlxF8Zja6c05yr/yCYyb2c9PwXjd08Ib3If1vn1rbs1H5ZtVuOfvQ=="; + }; + }; "stringify-package-1.0.1" = { name = "stringify-package"; packageName = "stringify-package"; @@ -43375,13 +44365,13 @@ let sha512 = "AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w=="; }; }; - "strip-bom-1.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "1.0.0"; + "strip-ansi-control-characters-2.0.0" = { + name = "strip-ansi-control-characters"; + packageName = "strip-ansi-control-characters"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-1.0.0.tgz"; - sha1 = "85b8862f3844b5a6d5ec8467a93598173a36f794"; + url = "https://registry.npmjs.org/strip-ansi-control-characters/-/strip-ansi-control-characters-2.0.0.tgz"; + sha512 = "Q0/k5orrVGeaOlIOUn1gybGU0IcAbgHQT1faLo5hik4DqClKVSaka5xOhNNoRgtfztHVxCYxi7j71mrWom0bIw=="; }; }; "strip-bom-2.0.0" = { @@ -43447,15 +44437,6 @@ let sha512 = "0ApK3iAkHv6WbgLICw/J4nhwHeDZsBxIIsOD+gHgZICL6SeJ0S9f/WZqemka9cjkTyMN5geId6e8U5WGFAn3cQ=="; }; }; - "strip-bom-string-1.0.0" = { - name = "strip-bom-string"; - packageName = "strip-bom-string"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz"; - sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92"; - }; - }; "strip-dirs-2.1.0" = { name = "strip-dirs"; packageName = "strip-dirs"; @@ -43690,24 +44671,6 @@ let sha512 = "luHn2OAMGJouOnadm6Fim6WXodQ2AWDkWjYq0rMdyEwzO5PdE4LzoXAEn9LL2snmBAlwUp1URVOTF7lZR3KU+Q=="; }; }; - "stylis-3.5.4" = { - name = "stylis"; - packageName = "stylis"; - version = "3.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/stylis/-/stylis-3.5.4.tgz"; - sha512 = "8/3pSmthWM7lsPBKv7NXkzn2Uc9W7NotcwGNpJaa3k7WMM1XDCA4MgT5k/8BIexd5ydZdboXtU90XH9Ec4Bv/Q=="; - }; - }; - "stylis-rule-sheet-0.0.10" = { - name = "stylis-rule-sheet"; - packageName = "stylis-rule-sheet"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/stylis-rule-sheet/-/stylis-rule-sheet-0.0.10.tgz"; - sha512 = "nTbZoaqoBnmK+ptANthb10ZRZOGC+EmTLLUxeYIuHNkEKcmKgXX1XWKkUBT2Ac4es3NybooPe0SmvKdhKJZAuw=="; - }; - }; "stylus-0.54.8" = { name = "stylus"; packageName = "stylus"; @@ -43744,13 +44707,13 @@ let sha512 = "cm7TQq9I8dA5LKUr+r8W7RzQlLsmTdCr6wXmjYueOoh/bQu55ODEw7GFhT42pUyoaLtO2rgmx1+8cSIjY9lR9g=="; }; }; - "subscriptions-transport-ws-0.9.17" = { + "subscriptions-transport-ws-0.9.18" = { name = "subscriptions-transport-ws"; packageName = "subscriptions-transport-ws"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { - url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.17.tgz"; - sha512 = "hNHi2N80PBz4T0V0QhnnsMGvG3XDFDS9mS6BhZ3R12T6EBywC8d/uJscsga0cVO4DKtXCkCRrWm2sOYrbOdhEA=="; + url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.18.tgz"; + sha512 = "tztzcBTNoEbuErsVQpTN2xUNN/efAZXyCyL5m3x4t6SKrEiTL2N8SaKWBFWM4u56pL79ULif3zjyeq+oV+nOaA=="; }; }; "sudo-block-1.2.0" = { @@ -43771,13 +44734,13 @@ let sha512 = "0znmYibLknX0bWsnqW9rzM8IvKux3rTSnW52l5teIC+QAgS/StUl5f4WyLPBw+posfbOgoX+03xHPV4sMxY64Q=="; }; }; - "suf-node-1.1.1" = { + "suf-node-1.2.1" = { name = "suf-node"; packageName = "suf-node"; - version = "1.1.1"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/suf-node/-/suf-node-1.1.1.tgz"; - sha512 = "XiyPqLdiHJ3CMphADCJg/JVQYcj3JfO8NomlLubSdGYgppfzE+g/7Fyusza/Kr7lC919BdwbfIqFxK8VO7+l4w=="; + url = "https://registry.npmjs.org/suf-node/-/suf-node-1.2.1.tgz"; + sha512 = "LFLshqEwm1bXd3fEl0STYXZzEHbAz8HwsyItA8vvxhMZrIo+CpB7RrtLvor6mk+7SdfgJhmV3RdIdDIcPAJTTg=="; }; }; "suf-regex-0.0.22" = { @@ -44041,13 +45004,13 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.31.1" = { + "swagger-ui-dist-3.32.4" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.31.1"; + version = "3.32.4"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.31.1.tgz"; - sha512 = "+IuIxXX8grZcDVLaC12WCGy62iHJ2v8kTptU4H4EgY/ue6tKeMu/jzIAs+pLFOuYwfG4+VQ+CrC9UeHR9oNKBw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.32.4.tgz"; + sha512 = "3qUqK131a5nqGdDJhLflTNzvrjZgjBlINYNx+Jm5lw/Va88Lcu5iyjUupY3Js/Kf326z1XtXkrr6TbvE6r925g=="; }; }; "swagger2openapi-5.4.0" = { @@ -44059,15 +45022,6 @@ let sha512 = "f5QqfXawiVijhjMtYqWZ55ESHPZFqrPC8L9idhIiuSX8O2qsa1i4MVGtCM3TQF+Smzr/6WfT/7zBuzG3aTgPAA=="; }; }; - "swagger2openapi-6.2.2" = { - name = "swagger2openapi"; - packageName = "swagger2openapi"; - version = "6.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-6.2.2.tgz"; - sha512 = "A8RWwzkymhF/ZfO0AylEZ2eCaN2jvAJU3bdtXQzkW5QvuyBMUBcyfB2tkHMTpXWYDmt7uKHwPGRZ0doPejtARA=="; - }; - }; "sway-1.0.0" = { name = "sway"; packageName = "sway"; @@ -44140,13 +45094,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.26.10" = { + "systeminformation-4.27.3" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.26.10"; + version = "4.27.3"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.26.10.tgz"; - sha512 = "bO4FIzrjESAfh4KHwkUJym3jvKtJ4oJ2PG0BBQGBmKa0pF2oanpkB7CF4ZsSX7vfp3+GKaLzioVwpV/3Tyk+lQ=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.3.tgz"; + sha512 = "0Nc8AYEK818h7FI+bbe/kj7xXsMD5zOHvO9alUqQH/G4MHXu5tHQfWqC/bzWOk4JtoQPhnyLgxMYncDA2eeSBw=="; }; }; "syswide-cas-5.3.0" = { @@ -44339,13 +45293,13 @@ let sha512 = "MNIgJddrV2TkuwChwcSNds/5E9VijOiw7kAc1y5hTNJoLDSuIyid2QtLYiCYNnICebpuvjhPQZsXwUL0O3l7OQ=="; }; }; - "tar-6.0.2" = { + "tar-6.0.5" = { name = "tar"; packageName = "tar"; - version = "6.0.2"; + version = "6.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/tar/-/tar-6.0.2.tgz"; - sha512 = "Glo3jkRtPcvpDlAs/0+hozav78yoXKFr+c4wgw62NNMO3oo4AaJdCo21Uu7lcwr55h39W2XD1LMERc64wtbItg=="; + url = "https://registry.npmjs.org/tar/-/tar-6.0.5.tgz"; + sha512 = "0b4HOimQHj9nXNEAA7zWwMM91Zhhba3pspja6sQbgTpynOJf+bkjBnfybNYzbpLbnwXnbyB4LOREvlyXLkCHSg=="; }; }; "tar-fs-2.1.0" = { @@ -44519,6 +45473,15 @@ let sha512 = "LB83o9bfZGrntdqPuRdanIVCPReam9SOZKW0fOy5I9X3A854GGWi0tjCqoXEk84XIEYBc/x9Hq3EFop/H5wJaw=="; }; }; + "tempy-0.3.0" = { + name = "tempy"; + packageName = "tempy"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz"; + sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ=="; + }; + }; "term-canvas-0.0.5" = { name = "term-canvas"; packageName = "term-canvas"; @@ -44546,13 +45509,13 @@ let sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; }; }; - "terminal-kit-1.42.0" = { + "terminal-kit-1.43.0" = { name = "terminal-kit"; packageName = "terminal-kit"; - version = "1.42.0"; + version = "1.43.0"; src = fetchurl { - url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.42.0.tgz"; - sha512 = "l9GCV47Gm+A+nshoOhvEpcUSQE27k0gRRSxowQodI2nc6uOw/RVr0U3zgj61zLQStCLDqQ6JVfV1vAdlF0lFjA=="; + url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.43.0.tgz"; + sha512 = "OuPvQzx6oxr3oE2Y78NgRy0TetmurGa/vshYV02Kd6XDWctHO/sHpjnLe3Jhi8FrUkL0XAZMGlxjLeDtRFL4wg=="; }; }; "terser-3.17.0" = { @@ -44573,13 +45536,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-webpack-plugin-1.4.4" = { + "terser-webpack-plugin-1.4.5" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "1.4.4"; + version = "1.4.5"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.4.tgz"; - sha512 = "U4mACBHIegmfoEe5fdongHESNJWqsGU+W0S/9+BmYGVQDw1+c2Ow05TpMhxjPK1sRb7cuYq1BPl1e5YHJMTCqA=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; + sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; }; }; "test-exclude-6.0.0" = { @@ -44771,15 +45734,6 @@ let sha1 = "f41a1c31df5e129e4314446f66eca05cd6a30480"; }; }; - "through2-2.0.3" = { - name = "through2"; - packageName = "through2"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz"; - sha1 = "0004569b37c7c74ba39c43f3ced78d1ad94140be"; - }; - }; "through2-2.0.5" = { name = "through2"; packageName = "through2"; @@ -44807,6 +45761,15 @@ let sha512 = "jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA=="; }; }; + "through2-map-3.0.0" = { + name = "through2-map"; + packageName = "through2-map"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/through2-map/-/through2-map-3.0.0.tgz"; + sha1 = "a6c3026ce63b4898a997d540506b66ffd970f271"; + }; + }; "thunkify-2.1.2" = { name = "thunkify"; packageName = "thunkify"; @@ -44870,6 +45833,15 @@ let sha1 = "764a5a11af50561921b133f3b44e618687e0f5c3"; }; }; + "time-zone-1.0.0" = { + name = "time-zone"; + packageName = "time-zone"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz"; + sha1 = "99c5bf55958966af6d06d83bdf3800dc82faec5d"; + }; + }; "timed-out-4.0.1" = { name = "timed-out"; packageName = "timed-out"; @@ -44978,13 +45950,13 @@ let sha512 = "W/YVH/QczLUxVjnQhFC61Iq232NWu3TqDdO0S/MtXVz4xybejBov4ud+CIwN9aYqjOecEqIy0PscGkwpG9ZyTw=="; }; }; - "tlds-1.207.0" = { + "tlds-1.208.0" = { name = "tlds"; packageName = "tlds"; - version = "1.207.0"; + version = "1.208.0"; src = fetchurl { - url = "https://registry.npmjs.org/tlds/-/tlds-1.207.0.tgz"; - sha512 = "k7d7Q1LqjtAvhtEOs3yN14EabsNO8ZCoY6RESSJDB9lst3bTx3as/m1UuAeCKzYxiyhR1qq72ZPhpSf+qlqiwg=="; + url = "https://registry.npmjs.org/tlds/-/tlds-1.208.0.tgz"; + sha512 = "6kbY7GJpRQXwBddSOAbVUZXjObbCGFXliWWN+kOSEoRWIOyRWLB6zdeKC/Tguwwenl/KsUx016XR50EdHYsxZw=="; }; }; "tmp-0.0.29" = { @@ -45302,6 +46274,15 @@ let sha512 = "y/mWCZinnvxjTKYhJ+pYxwD0mRLVvOtdS2Awbgxln6iEnt4rk0yBxeSBHkGJcPucRiG0e55mwWp+g/05rsrd6w=="; }; }; + "tomlify-j0.4-3.0.0" = { + name = "tomlify-j0.4"; + packageName = "tomlify-j0.4"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tomlify-j0.4/-/tomlify-j0.4-3.0.0.tgz"; + sha512 = "2Ulkc8T7mXJ2l0W476YC/A209PR38Nw8PuaCNtk9uI3t1zzFdGQeWYGQvmj2PZkVvRC/Yoi4xQKMRnWc/N29tQ=="; + }; + }; "too-wordy-0.1.6" = { name = "too-wordy"; packageName = "too-wordy"; @@ -45383,15 +46364,6 @@ let sha1 = "42d88dd116618bcf00d6106dd5446f3427902ff1"; }; }; - "touch-2.0.2" = { - name = "touch"; - packageName = "touch"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/touch/-/touch-2.0.2.tgz"; - sha512 = "qjNtvsFXTRq7IuMLweVgFxmEuQ6gLbRs2jQxL80TtZ31dEKWYIxRXquij6w6VimyDek5hD3PytljHmEtAs2u0A=="; - }; - }; "touch-3.1.0" = { name = "touch"; packageName = "touch"; @@ -45707,13 +46679,13 @@ let sha512 = "dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw=="; }; }; - "tsconfig-paths-webpack-plugin-3.2.0" = { + "tsconfig-paths-webpack-plugin-3.3.0" = { name = "tsconfig-paths-webpack-plugin"; packageName = "tsconfig-paths-webpack-plugin"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.2.0.tgz"; - sha512 = "S/gOOPOkV8rIL4LurZ1vUdYCVgo15iX9ZMJ6wx6w2OgcpT/G4wMyHB6WM+xheSqGMrWKuxFul+aXpCju3wmj/g=="; + url = "https://registry.npmjs.org/tsconfig-paths-webpack-plugin/-/tsconfig-paths-webpack-plugin-3.3.0.tgz"; + sha512 = "MpQeZpwPY4gYASCUjY4yt2Zj8yv86O8f++3Ai4o0yI0fUC6G1syvnL9VuY71PBgimRYDQU47f12BEmJq9wRaSw=="; }; }; "tslib-1.11.1" = { @@ -45734,13 +46706,13 @@ let sha512 = "i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q=="; }; }; - "tslib-2.0.0" = { + "tslib-2.0.1" = { name = "tslib"; packageName = "tslib"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/tslib/-/tslib-2.0.0.tgz"; - sha512 = "lTqkx847PI7xEDYJntxZH89L2/aXInsyF2luSafe/+0fHOMjlBNXdH6th7f70qxLDhul7KZK0zC8V5ZIyHl0/g=="; + url = "https://registry.npmjs.org/tslib/-/tslib-2.0.1.tgz"; + sha512 = "SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ=="; }; }; "tslint-5.20.1" = { @@ -45914,13 +46886,13 @@ let sha1 = "b75bc2df15649bb84e8b9aa3c0669c6c4bce0d25"; }; }; - "twig-1.15.1" = { + "twig-1.15.2" = { name = "twig"; packageName = "twig"; - version = "1.15.1"; + version = "1.15.2"; src = fetchurl { - url = "https://registry.npmjs.org/twig/-/twig-1.15.1.tgz"; - sha512 = "SPGkUM0p7hjgo+y5Dlm/XCSuZe0G3kfcgRPrxkMFln5e8bvQbxDOsia8QEo8xqXfjLR1Emp9FGkVYHya2b8qdA=="; + url = "https://registry.npmjs.org/twig/-/twig-1.15.2.tgz"; + sha512 = "n7w76E8gzguhcLyKcjlT3sYWGdBTgZY2DO/frcbZ5Fk7LwMRoTathvWMFxZyJ2HYRJ+rEzccw6nu3fsy7ceGGQ=="; }; }; "twitter-1.7.1" = { @@ -45950,13 +46922,13 @@ let sha512 = "+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg=="; }; }; - "type-2.0.0" = { + "type-2.1.0" = { name = "type"; packageName = "type"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/type/-/type-2.0.0.tgz"; - sha512 = "KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow=="; + url = "https://registry.npmjs.org/type/-/type-2.1.0.tgz"; + sha512 = "G9absDWvhAWCV2gmF1zKud3OyC61nZDwWvBL2DApaVFogI07CprggiQAOOjvp2NRjYWFzPyu7vwtDrQFq8jeSA=="; }; }; "type-check-0.3.2" = { @@ -45986,22 +46958,22 @@ let sha512 = "0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g=="; }; }; - "type-fest-0.10.0" = { + "type-fest-0.11.0" = { name = "type-fest"; packageName = "type-fest"; - version = "0.10.0"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.10.0.tgz"; - sha512 = "EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"; + sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; }; }; - "type-fest-0.11.0" = { + "type-fest-0.12.0" = { name = "type-fest"; packageName = "type-fest"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz"; - sha512 = "OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ=="; + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.12.0.tgz"; + sha512 = "53RyidyjvkGpnWPMF9bQgFtWp+Sl8O2Rp13VavmJgfAP9WWG6q6TkrKU8iyJdnwnfgHI6k2hTlgqH4aSdjoTbg=="; }; }; "type-fest-0.13.1" = { @@ -46013,6 +46985,15 @@ let sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="; }; }; + "type-fest-0.15.1" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.15.1"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.15.1.tgz"; + sha512 = "n+UXrN8i5ioo7kqT/nF8xsEzLaqFra7k32SEsSPwvXVGyAcRgV/FUQN/sgfptJTR1oRmmq7z4IXMFSM7im7C9A=="; + }; + }; "type-fest-0.3.1" = { name = "type-fest"; packageName = "type-fest"; @@ -46022,6 +47003,15 @@ let sha512 = "cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ=="; }; }; + "type-fest-0.5.2" = { + name = "type-fest"; + packageName = "type-fest"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/type-fest/-/type-fest-0.5.2.tgz"; + sha512 = "DWkS49EQKVX//Tbupb9TFa19c7+MK1XmzkrZUR8TAktmE/DizXoaoJV6TZ/tSIPXipqNiRI6CyAe7x69Jb6RSw=="; + }; + }; "type-fest-0.6.0" = { name = "type-fest"; packageName = "type-fest"; @@ -46094,15 +47084,6 @@ let sha512 = "kk80vLW9iGtjMnIv11qyxLqZm20UklzuR2tL0QAnDIygIUIemcZMxlMWudl9OOt76H3ntVzcTiddQ1/pAAJMYg=="; }; }; - "typescript-3.9.5" = { - name = "typescript"; - packageName = "typescript"; - version = "3.9.5"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz"; - sha512 = "hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ=="; - }; - }; "typescript-3.9.7" = { name = "typescript"; packageName = "typescript"; @@ -46139,24 +47120,6 @@ let sha512 = "CQEfGC+p0SoBARI4N2LrGsWJsp4/OE+uKZ68xsWYKHWqMFq4DFQHqOVlK0deEricSN01NmDTqjap63Pw/DHieg=="; }; }; - "typewise-1.0.3" = { - name = "typewise"; - packageName = "typewise"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/typewise/-/typewise-1.0.3.tgz"; - sha1 = "1067936540af97937cc5dcf9922486e9fa284651"; - }; - }; - "typewise-core-1.2.0" = { - name = "typewise-core"; - packageName = "typewise-core"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/typewise-core/-/typewise-core-1.2.0.tgz"; - sha1 = "97eb91805c7f55d2f941748fa50d315d991ef195"; - }; - }; "typewiselite-1.0.0" = { name = "typewiselite"; packageName = "typewiselite"; @@ -46220,13 +47183,13 @@ let sha512 = "Esj5HG5WAyrLIdYU74Z3JdG2PxdIusvj6IWHMtlyESxc7kcDz7zYlYjpnSokn1UbpV0d/QX9fan7gkCNd/9BQA=="; }; }; - "uglify-js-3.10.1" = { + "uglify-js-3.10.2" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz"; - sha512 = "RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz"; + sha512 = "GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow=="; }; }; "uglify-js-3.4.10" = { @@ -46454,13 +47417,13 @@ let sha1 = "71c08bf6b428b1133f37e78fa3a21c82f7329b0d"; }; }; - "undertaker-1.2.1" = { + "undertaker-1.3.0" = { name = "undertaker"; packageName = "undertaker"; - version = "1.2.1"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/undertaker/-/undertaker-1.2.1.tgz"; - sha512 = "71WxIzDkgYk9ZS+spIB8iZXchFhAdEo2YU8xYqBYJ39DIUIqziK78ftm26eecoIY49X0J2MLhG4hr18Yp6/CMA=="; + url = "https://registry.npmjs.org/undertaker/-/undertaker-1.3.0.tgz"; + sha512 = "/RXwi5m/Mu3H6IHQGww3GNt1PNXlbeCuclF2QYR14L/2CHPz3DFZkvB5hZ0N/QUkiXWCACML2jXViIQEQc2MLg=="; }; }; "undertaker-registry-1.0.1" = { @@ -46589,13 +47552,13 @@ let sha512 = "lbk82UOIGuCEsZhPj8rNAkXSDXd6p0QLzIuSsCdxrqnqU56St4eyOB+AlXsVgVeRmetPTYydIuvFfpDIed8mqw=="; }; }; - "unified-8.4.2" = { + "unified-9.2.0" = { name = "unified"; packageName = "unified"; - version = "8.4.2"; + version = "9.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified/-/unified-8.4.2.tgz"; - sha512 = "JCrmN13jI4+h9UAyKEoGcDZV+i1E7BLFuG7OsaDvTXI5P0qhHX+vZO/kOhz9jn8HGENDKbwSeB0nVOg4gVStGA=="; + url = "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz"; + sha512 = "vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg=="; }; }; "unified-diff-3.0.1" = { @@ -46616,22 +47579,22 @@ let sha512 = "iDJYH82TgcezQA4IZzhCNJQx7vBsGk4h9s4Q7Fscrb3qcPsxBqVrVNYez2W3sBVTxuU1bFAhyRpA6ba/R4j93A=="; }; }; - "unified-engine-7.0.0" = { + "unified-engine-8.0.0" = { name = "unified-engine"; packageName = "unified-engine"; - version = "7.0.0"; + version = "8.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/unified-engine/-/unified-engine-7.0.0.tgz"; - sha512 = "zH/MvcISpWg3JZtCoY/GYBw1WnVHkhnPoMBWpmuvAifCPSS9mzT9EbtimesJp6t2nnr/ojI0mg3TmkO1CjIwVA=="; + url = "https://registry.npmjs.org/unified-engine/-/unified-engine-8.0.0.tgz"; + sha512 = "vLUezxCnjzz+ya4pYouRQVMT8k82Rk4fIj406UidRnSFJdGXFaQyQklAnalsQHJrLqAlaYPkXPUa1upfVSHGCA=="; }; }; - "unified-message-control-2.0.0" = { + "unified-message-control-3.0.1" = { name = "unified-message-control"; packageName = "unified-message-control"; - version = "2.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-2.0.0.tgz"; - sha512 = "6TE36M/YIQhUr+XlG+YKXDCCTC2FPtCgXIwtdJcHLnrRGR1ZjYwZMH2pnp7a4OaE7sST9GUqQPjVHM7TRTTlyQ=="; + url = "https://registry.npmjs.org/unified-message-control/-/unified-message-control-3.0.1.tgz"; + sha512 = "K2Kvvp1DBzeuxYLLsumZh/gDWUTl4e2z/P3VReFirC78cfHKtQifbhnfRrSBtKtd1Uc6cvYTW0/SZIUaMAEcTg=="; }; }; "union-0.5.0" = { @@ -46697,15 +47660,6 @@ let sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w=="; }; }; - "unique-stream-1.0.0" = { - name = "unique-stream"; - packageName = "unique-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unique-stream/-/unique-stream-1.0.0.tgz"; - sha1 = "d59a4a75427447d9aa6c91e70263f8d26a4b104b"; - }; - }; "unique-stream-2.3.1" = { name = "unique-stream"; packageName = "unique-stream"; @@ -46769,6 +47723,15 @@ let sha512 = "7xxyvKiZ1SC9vL5qrMqKub1T31gRHfau4242F69CcaOrXt//5PmRVOmDZ36UAEgiT+tZWzmQmbNZn+mVtnR9HQ=="; }; }; + "unist-util-inspect-5.0.1" = { + name = "unist-util-inspect"; + packageName = "unist-util-inspect"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-5.0.1.tgz"; + sha512 = "fPNWewS593JSmg49HbnE86BJKuBi1/nMWhDSccBvbARfxezEuJV85EaARR9/VplveiwCoLm2kWq+DhP8TBaDpw=="; + }; + }; "unist-util-is-1.0.0" = { name = "unist-util-is"; packageName = "unist-util-is"; @@ -46841,6 +47804,15 @@ let sha512 = "tLqd653ArxJIPnKII6LMZwH+mb5q+n/GtXQZo6S6csPRs5zB0u79Yw8ouR3wTw8wxvdJFhpP6Y7jorWdCgLO0A=="; }; }; + "unist-util-remove-position-2.0.1" = { + name = "unist-util-remove-position"; + packageName = "unist-util-remove-position"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz"; + sha512 = "fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA=="; + }; + }; "unist-util-stringify-position-1.1.2" = { name = "unist-util-stringify-position"; packageName = "unist-util-stringify-position"; @@ -47138,6 +48110,15 @@ let sha512 = "w3doE1qtI0/ZmgeoDoARmI5fjDoT93IfKgEGqm26dGUOh8oNpaSTsGNdYRN/SjOuo10jcJGwkEL3mroKzktkew=="; }; }; + "update-notifier-4.1.1" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.1.tgz"; + sha512 = "9y+Kds0+LoLG6yN802wVXoIfxYEwh3FlZwzMwpCZp62S2i1/Jzeqb9Eeeju3NSHccGGasfGlK5/vEHbAifYRDg=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -47300,15 +48281,6 @@ let sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; }; }; - "url-template-2.0.8" = { - name = "url-template"; - packageName = "url-template"; - version = "2.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz"; - sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; - }; - }; "url-to-options-1.0.1" = { name = "url-to-options"; packageName = "url-to-options"; @@ -47345,15 +48317,6 @@ let sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="; }; }; - "user-home-1.1.1" = { - name = "user-home"; - packageName = "user-home"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz"; - sha1 = "2b5be23a32b63a7c9deb8d0f28d485724a3df190"; - }; - }; "user-home-2.0.0" = { name = "user-home"; packageName = "user-home"; @@ -47588,15 +48551,6 @@ let sha512 = "HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A=="; }; }; - "uuid-7.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "7.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-7.0.1.tgz"; - sha512 = "yqjRXZzSJm9Dbl84H2VDHpM3zMjzSJQ+hn6C4zqd5ilW+7P4ZmLEEqwho9LjP+tGuZlF4xrHQXT0h9QZUS/pWA=="; - }; - }; "uuid-8.1.0" = { name = "uuid"; packageName = "uuid"; @@ -47642,15 +48596,6 @@ let sha1 = "e8381cbebb5b5fd0ca8d2b09f6a0181a158db34d"; }; }; - "v8flags-2.1.1" = { - name = "v8flags"; - packageName = "v8flags"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/v8flags/-/v8flags-2.1.1.tgz"; - sha1 = "aab1a1fa30d45f88dd321148875ac02c0b55e5b4"; - }; - }; "v8flags-3.1.3" = { name = "v8flags"; packageName = "v8flags"; @@ -47840,13 +48785,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.1.0" = { + "verda-1.1.1" = { name = "verda"; packageName = "verda"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.1.0.tgz"; - sha512 = "6f3bwfXNkjDivAsPFIfCXtCstEh08Q15C6aGnF9wRNfaYhJCXuHRLh39V3b+vjCvvLOeFZ/MeBDZVx81f6dktg=="; + url = "https://registry.npmjs.org/verda/-/verda-1.1.1.tgz"; + sha512 = "8nki9HjTh39EFuIYY2snCCdIDU0z4LmFN7tQ9oZByW2AQpPYpWDHwRqewWgUt9PVcDsXDSZbJWSuJwGnyAj8gg=="; }; }; "verror-1.1.0" = { @@ -47966,6 +48911,15 @@ let sha512 = "sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA=="; }; }; + "vfile-location-3.1.0" = { + name = "vfile-location"; + packageName = "vfile-location"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.1.0.tgz"; + sha512 = "FCZ4AN9xMcjFIG1oGmZKo61PjwJHRVA+0/tPUP2ul4uIwjGGndIxavEMRpWn5p4xwm/ZsdXp9YNygf1ZyE4x8g=="; + }; + }; "vfile-message-1.1.1" = { name = "vfile-message"; packageName = "vfile-message"; @@ -48047,15 +49001,6 @@ let sha512 = "Z4EcsX9aYNJZD1M+0jCeQ0t+5ETlHE88B2SF1fCuVxfn+XxHGJVec6tbHGqpULk4esOOLJEipAScOCDGHk+teQ=="; }; }; - "vinyl-0.4.6" = { - name = "vinyl"; - packageName = "vinyl"; - version = "0.4.6"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; - sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; - }; - }; "vinyl-0.5.3" = { name = "vinyl"; packageName = "vinyl"; @@ -48083,15 +49028,6 @@ let sha1 = "b104d9e4409ffa325faadd520642d0a3b488b365"; }; }; - "vinyl-fs-0.3.14" = { - name = "vinyl-fs"; - packageName = "vinyl-fs"; - version = "0.3.14"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-0.3.14.tgz"; - sha1 = "9a6851ce1cac1c1cea5fe86c0931d620c2cfa9e6"; - }; - }; "vinyl-fs-3.0.3" = { name = "vinyl-fs"; packageName = "vinyl-fs"; @@ -48110,15 +49046,6 @@ let sha1 = "92a800593a38703a8cdb11d8b300ad4be63b3e16"; }; }; - "vinyl-sourcemaps-apply-0.2.1" = { - name = "vinyl-sourcemaps-apply"; - packageName = "vinyl-sourcemaps-apply"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz"; - sha1 = "ab6549d61d172c2b1b87be5c508d239c8ef87705"; - }; - }; "vlc-command-1.2.0" = { name = "vlc-command"; packageName = "vlc-command"; @@ -48137,13 +49064,13 @@ let sha512 = "DRibZL6DsNhIgYQ+wNdWDL2SL3bKPlVrRiBqV5yuMm++op8W4kGFtaQfCs4KEJn0wBZcHVHJ3eoywX8983k1ow=="; }; }; - "vls-0.2.0" = { + "vls-0.4.2" = { name = "vls"; packageName = "vls"; - version = "0.2.0"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.2.0.tgz"; - sha512 = "B6xMWi3sOVSitcLx4zKWB5vh1DLL0Okkqy5Fa7rHSmqvPhDDn7idU+vwjWZW8IzHQO1T+brxvDjbKuSnEXNPRw=="; + url = "https://registry.npmjs.org/vls/-/vls-0.4.2.tgz"; + sha512 = "iH1MUOMaLwv5Lewkt/mYppy/UdBLh8MonL4CSiKh4GNj0GfEJHQfk2s8d0WixVooD++UGCa/dzpGB8CRzGnBtA=="; }; }; "vm-browserify-1.1.2" = { @@ -48173,13 +49100,13 @@ let sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; }; }; - "vsce-1.77.0" = { + "vsce-1.79.3" = { name = "vsce"; packageName = "vsce"; - version = "1.77.0"; + version = "1.79.3"; src = fetchurl { - url = "https://registry.npmjs.org/vsce/-/vsce-1.77.0.tgz"; - sha512 = "8vOTCI3jGmOm0JJFu/BMAbqxpaSuka4S3hV9E6K5aWBUsDM1SGFExkIxHblnsI8sls43xP61DHorYT+K0F+GFA=="; + url = "https://registry.npmjs.org/vsce/-/vsce-1.79.3.tgz"; + sha512 = "TZb0XrLPDAm/Ns8McayGS2S8XCCMuQPwdUOluKC/0LopyEH7/NnTkM09hF4kOzfvIITuFWy4PT2R1apeLQw3kQ=="; }; }; "vscode-css-languageservice-3.0.13" = { @@ -48191,13 +49118,13 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.3.1" = { + "vscode-css-languageservice-4.3.3" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; - version = "4.3.1"; + version = "4.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.1.tgz"; - sha512 = "Vdz2cyoTP2tLWikhFdouK8dAQ3gVhLPxsFkIscM30Quh6rd/YejTeZEYC/W+b0iKumHYebDeo1GUFbf0ptySRw=="; + url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.3.tgz"; + sha512 = "b2b+0oHvPmBHygDtOXX3xBvpQCa6eIQSvXnGDNSDmIC1894ZTJ2yX10vjplOO/PvV7mwhyvGPwHyY4X2HGxtKw=="; }; }; "vscode-emmet-helper-1.2.17" = { @@ -48218,13 +49145,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.8.0" = { + "vscode-json-languageservice-3.8.1" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.8.0"; + version = "3.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.0.tgz"; - sha512 = "sYz5JElJMIlPoqhrRfG3VKnDjnPinLdblIiEVsJgTz1kj2hWD2q5BSbo+evH/5/jKDXDLfA8kb0lHC4vd5g5zg=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.8.1.tgz"; + sha512 = "PYckar/Vgpa/YTthbSnqbxbawxwcGQ+xs/M48muw89uJWe4nZm5yto0oCKMMZHIFD8r3nN6BrmDzXQEaeQ1bBQ=="; }; }; "vscode-jsonrpc-3.6.0" = { @@ -48488,13 +49415,13 @@ let sha512 = "8TEXQxlldWAuIODdukIb+TR5s+9Ds40eSJrw+1iDDA9IFORPjMELarNQE3myz5XIkWWpdprmJjm1/SxMlWOC8A=="; }; }; - "vscode-web-custom-data-0.1.4" = { + "vscode-web-custom-data-0.3.1" = { name = "vscode-web-custom-data"; packageName = "vscode-web-custom-data"; - version = "0.1.4"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-web-custom-data/-/vscode-web-custom-data-0.1.4.tgz"; - sha512 = "EFS8t2g3gMjvYY3sTknzHaURQ5AnemMcnKriZx43w97bsmEfEPaBJwJpuj/Zx9k4SwK+97dRtkKb2lvWQ2v0rw=="; + url = "https://registry.npmjs.org/vscode-web-custom-data/-/vscode-web-custom-data-0.3.1.tgz"; + sha512 = "pFWfUyoJoROfzk7l8+QK1aHsAcfb8fJP8iaEghMbASbYieaGOOnfovNjPIrJmhNf84RGn36R6r2030i9Eld7vA=="; }; }; "vstream-0.1.0" = { @@ -48506,13 +49433,22 @@ let sha1 = "13587190f34e72ba7a07ebbaa7e70ac147b1fb7d"; }; }; - "vue-2.6.11" = { + "vue-2.6.12" = { name = "vue"; packageName = "vue"; - version = "2.6.11"; + version = "2.6.12"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz"; - sha512 = "VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ=="; + url = "https://registry.npmjs.org/vue/-/vue-2.6.12.tgz"; + sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; + }; + }; + "vue-3.0.0-rc.9" = { + name = "vue"; + packageName = "vue"; + version = "3.0.0-rc.9"; + src = fetchurl { + url = "https://registry.npmjs.org/vue/-/vue-3.0.0-rc.9.tgz"; + sha512 = "bimvpl5q/sKy1dAOE+KNX9T3p6Qq8kuNRmOYwaxtacI91ksjS7nVGse1FANhTL+XTQgl8+ySrd3f67xWi26nxw=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -48524,6 +49460,15 @@ let sha512 = "8CzRVrAsFkB9lpl600cRCNR9OUnrSYYAIVF9/qW4pP0TMXbhrd1F1wEAAN6E0CPimjTLB+qSt6zWS4vb2wC8Wg=="; }; }; + "vue-codemod-0.0.4" = { + name = "vue-codemod"; + packageName = "vue-codemod"; + version = "0.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vue-codemod/-/vue-codemod-0.0.4.tgz"; + sha512 = "mAI9g4CcY3GJOOt/fTOC8Cz9lYtBEuSiDizQHgvcX0HpoKw1bNZBPaNUqFoNxnk6+nGZVgt0/CXYnq80rRK9vg=="; + }; + }; "vue-eslint-parser-2.0.3" = { name = "vue-eslint-parser"; packageName = "vue-eslint-parser"; @@ -48551,15 +49496,6 @@ let sha512 = "Kr21uPfthDc63nDl27AGQEhtt9VrZ9nkYk/NTftJ2ws9XiJwzJJCnCr3AITQ2jpRMA0XPGDECxYH8E027qMK9Q=="; }; }; - "vue-jscodeshift-adapter-2.1.0" = { - name = "vue-jscodeshift-adapter"; - packageName = "vue-jscodeshift-adapter"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-jscodeshift-adapter/-/vue-jscodeshift-adapter-2.1.0.tgz"; - sha512 = "xDn8kpZ0/yG9Z1Z+osrfnd1k1y5AJIdUtqHWNJY2eRz37Gs1tftiZ8BUK89Pab0ddnwhZqh5eNFfOT0SFlZnWQ=="; - }; - }; "vue-onsenui-helper-json-1.0.2" = { name = "vue-onsenui-helper-json"; packageName = "vue-onsenui-helper-json"; @@ -48569,24 +49505,6 @@ let sha512 = "ikg8ruE17tIXF9mrVvKoOR3oyM9nk0TcmUHyeBWod5ILEH9DRN0+seX4gwsSbjdxMYlIIvmnCFPQeMdlcJqPJQ=="; }; }; - "vue-sfc-descriptor-to-string-1.0.0" = { - name = "vue-sfc-descriptor-to-string"; - packageName = "vue-sfc-descriptor-to-string"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-sfc-descriptor-to-string/-/vue-sfc-descriptor-to-string-1.0.0.tgz"; - sha512 = "VYNMsrIPZQZau5Gk8IVtgonN1quOznP9/pLIF5m2c4R30KCDDe3NwthrsM7lSUY2K4lezcb8j3Wu8cQhBuZEMQ=="; - }; - }; - "vue-template-compiler-2.6.11" = { - name = "vue-template-compiler"; - packageName = "vue-template-compiler"; - version = "2.6.11"; - src = fetchurl { - url = "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.6.11.tgz"; - sha512 = "KIq15bvQDrcCjpGjrAhx4mUlyyHfdmTaoNfeoATHLAiWB+MU3cx4lOzMwrnUh9cCxy0Lt1T11hAFY6TQgroUAA=="; - }; - }; "w3c-hr-time-1.0.2" = { name = "w3c-hr-time"; packageName = "w3c-hr-time"; @@ -48605,6 +49523,15 @@ let sha512 = "p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg=="; }; }; + "wait-port-0.2.9" = { + name = "wait-port"; + packageName = "wait-port"; + version = "0.2.9"; + src = fetchurl { + url = "https://registry.npmjs.org/wait-port/-/wait-port-0.2.9.tgz"; + sha512 = "hQ/cVKsNqGZ/UbZB/oakOGFqic00YAMM5/PEj3Bt4vKarv2jWIWzDbqlwT94qMs/exAQAsvMOq99sZblV92zxQ=="; + }; + }; "walk-2.3.14" = { name = "walk"; packageName = "walk"; @@ -48713,13 +49640,13 @@ let sha512 = "wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw=="; }; }; - "web-push-3.4.3" = { + "web-push-3.4.4" = { name = "web-push"; packageName = "web-push"; - version = "3.4.3"; + version = "3.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/web-push/-/web-push-3.4.3.tgz"; - sha512 = "nt/hRSlfRDTwvem//7jle1+cy62lBoxFshad8ai2Q4SlHZS00oHnrw5Dul3jSWXR+bOcnZkwnRs3tW+daNTuyA=="; + url = "https://registry.npmjs.org/web-push/-/web-push-3.4.4.tgz"; + sha512 = "tB0F+ccobsfw5jTWBinWJKyd/YdCdRbKj+CFSnsJeEgFYysOULvWFYyeCxn9KuQvG/3UF1t3cTAcJzBec5LCWA=="; }; }; "web-tree-sitter-0.16.4" = { @@ -48767,15 +49694,6 @@ let sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA=="; }; }; - "webpack-4.43.0" = { - name = "webpack"; - packageName = "webpack"; - version = "4.43.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.43.0.tgz"; - sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; - }; - }; "webpack-4.44.1" = { name = "webpack"; packageName = "webpack"; @@ -48821,13 +49739,13 @@ let sha512 = "cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg=="; }; }; - "webpack-node-externals-1.7.2" = { + "webpack-node-externals-2.5.1" = { name = "webpack-node-externals"; packageName = "webpack-node-externals"; - version = "1.7.2"; + version = "2.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz"; - sha512 = "ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg=="; + url = "https://registry.npmjs.org/webpack-node-externals/-/webpack-node-externals-2.5.1.tgz"; + sha512 = "RWxKGibUU5kuJT6JDYmXGa3QsZskqIaiBvZ2wBxHlJzWVJPOyBMnroXf23uxEHnj1rYS8jNdyUfrNAXJ2bANNw=="; }; }; "webpack-sources-1.4.3" = { @@ -48893,6 +49811,15 @@ let sha512 = "hkwjMQTbBiwdJn3vEVjOyNwKZISp6r4GEl/J0N6Ukw2oeaETIylvAlf7G0o+a9FcFMThBIle0iCPYLTwumCOaQ=="; }; }; + "well-known-symbols-2.0.0" = { + name = "well-known-symbols"; + packageName = "well-known-symbols"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz"; + sha512 = "ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q=="; + }; + }; "whatwg-encoding-1.0.5" = { name = "whatwg-encoding"; packageName = "whatwg-encoding"; @@ -48911,13 +49838,13 @@ let sha512 = "9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="; }; }; - "whatwg-fetch-3.3.1" = { + "whatwg-fetch-3.4.0" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.3.1"; + version = "3.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.3.1.tgz"; - sha512 = "faXTmGDcLuEPBpJwb5LQfyxvubKiE+RlbmmweFGKjvIPFj4uHTTfdtTIkdTRhC6OSH9S9eyYbx8kZ0UEaQqYTA=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.4.0.tgz"; + sha512 = "rsum2ulz2iuZH08mJkT0Yi6JnKhwdw4oeyMjokgxd+mmqYSd9cPpOQf01TIWgjxG/U4+QR+AwKq6lSbXVxkyoQ=="; }; }; "whatwg-mimetype-2.3.0" = { @@ -49172,13 +50099,13 @@ let sha1 = "91e5129088330a0fe248520cee12d1ad6bb4ddfb"; }; }; - "windows-release-3.3.1" = { + "windows-release-3.3.3" = { name = "windows-release"; packageName = "windows-release"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/windows-release/-/windows-release-3.3.1.tgz"; - sha512 = "Pngk/RDCaI/DkuHPlGTdIkDiTAnAkyMjoQMZqRsxydNl1qGXNIoZrB7RK8g53F2tEgQBMqQJHQdYZuQEEAu54A=="; + url = "https://registry.npmjs.org/windows-release/-/windows-release-3.3.3.tgz"; + sha512 = "OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg=="; }; }; "winreg-0.0.12" = { @@ -49974,15 +50901,6 @@ let sha1 = "6efecc2a4dad8e6962c4901b337ce7ba87b5d28b"; }; }; - "xtend-3.0.0" = { - name = "xtend"; - packageName = "xtend"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz"; - sha1 = "5cce7407baf642cba7becda568111c493f59665a"; - }; - }; "xtend-4.0.2" = { name = "xtend"; packageName = "xtend"; @@ -50091,13 +51009,13 @@ let sha1 = "87cfa5a9613f48e26005420d6a8ee0da6fe8daec"; }; }; - "yaml-language-server-0.7.2" = { + "yaml-language-server-0.10.0" = { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.7.2"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.7.2.tgz"; - sha512 = "3jBsYrtnlaI5H6psW+0qzVh9LoQ21fuvC8KIupjPbQURb6cAMUGH5aElKREAevSSpgs7VIoqU1ZMCglIHm32OA=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.0.tgz"; + sha512 = "d2/7eGgonEIRcnW9kK+k+ERG4gTOk5BXHr9KjTVv8gEarXKa62Kk+nyFE4AXgMDZ0LXTu8nTuN/AdboJiGN+pQ=="; }; }; "yamljs-0.3.0" = { @@ -50325,15 +51243,6 @@ let sha512 = "qZV14lK9MWsGCmcr7u5oXGH0dbGqZAIxTDrWXZDo5zUr6b6iUmelNKO6x6R1dQT24AH3LgRxJpr8meWy2unolA=="; }; }; - "yarn-1.22.0" = { - name = "yarn"; - packageName = "yarn"; - version = "1.22.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yarn/-/yarn-1.22.0.tgz"; - sha512 = "KMHP/Jq53jZKTY9iTUt3dIVl/be6UPs2INo96+BnZHLKxYNTfwMmlgHTaMWyGZoO74RI4AIFvnWhYrXq2USJkg=="; - }; - }; "yarn-1.22.4" = { name = "yarn"; packageName = "yarn"; @@ -50538,17 +51447,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.0.5"; + version = "10.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.5.tgz"; - sha512 = "Qsa90IGPApJS9HL6Ih7Z8S8mIdriWYEintsT9cfI0WMVYyjvSNZQBf1SvnNU3IEboV4RFnpfXJNmQz1Q4KsRFQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.0.8.tgz"; + sha512 = "unTteffLepsFw7qQulHOLLyLqCpQMOaZo0WO4x6cQGcW2mc0WgwnwBW2JDYMx1U2434t/Q13LqYMPNYWyCGsog=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1000.5" - sources."@angular-devkit/core-10.0.5" - sources."@angular-devkit/schematics-10.0.5" - sources."@schematics/angular-10.0.5" - sources."@schematics/update-0.1000.5" + sources."@angular-devkit/architect-0.1000.8" + sources."@angular-devkit/core-10.0.8" + sources."@angular-devkit/schematics-10.0.8" + sources."@schematics/angular-10.0.8" + sources."@schematics/update-0.1000.8" sources."@types/color-name-1.1.1" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" @@ -50565,7 +51474,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bluebird-3.7.2" @@ -50685,12 +51594,13 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."log-symbols-3.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -50742,7 +51652,7 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-1.4.8" sources."npm-pick-manifest-6.1.0" - (sources."npm-registry-fetch-4.0.5" // { + (sources."npm-registry-fetch-4.0.7" // { dependencies = [ sources."hosted-git-info-2.8.8" sources."lru-cache-5.1.1" @@ -50757,7 +51667,7 @@ in sources."object.assign-4.1.0" sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."open-7.0.4" sources."ora-4.0.4" sources."os-homedir-1.0.2" @@ -50791,7 +51701,7 @@ in }) sources."punycode-2.1.1" sources."qs-6.5.2" - sources."read-package-json-2.1.1" + sources."read-package-json-2.1.2" sources."read-package-tree-5.3.1" (sources."readable-stream-2.3.7" // { dependencies = [ @@ -50961,7 +51871,7 @@ in sources."async-lock-1.2.4" sources."balanced-match-1.0.0" sources."base64-js-0.0.2" - sources."bl-4.0.2" + sources."bl-4.0.3" sources."bops-0.0.7" sources."brace-expansion-1.1.11" sources."braces-3.0.2" @@ -50975,7 +51885,7 @@ in sources."cache-directory-2.0.0" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" sources."pump-3.0.0" ]; @@ -51207,7 +52117,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.2" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -51258,7 +52168,7 @@ in sources."acorn-globals-4.3.4" sources."acorn-walk-6.2.0" sources."agent-base-5.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-escapes-3.2.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -51268,7 +52178,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" sources."browser-process-hrtime-1.0.0" @@ -51326,7 +52236,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" sources."lowdb-1.0.0" sources."lunr-2.3.3" @@ -51410,19 +52320,19 @@ in "@nestjs/cli" = nodeEnv.buildNodePackage { name = "_at_nestjs_slash_cli"; packageName = "@nestjs/cli"; - version = "7.4.1"; + version = "7.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.4.1.tgz"; - sha512 = "90IWWqDIPX3M0vwkmnZ0Ct/EY2b75DYbsw2ZbVxaj57ASdbajhS7Pxhc7MC/L+07nBge+xMRHvQRoKdcfWHd0w=="; + url = "https://registry.npmjs.org/@nestjs/cli/-/cli-7.5.1.tgz"; + sha512 = "18EfBO48ojVm7YzwyPc8PRjas9KcIVjdlD+v7tIImKzrf5THcpAYxvzUvZUspSbLIIIqwTgKj/loqamkwOk/XA=="; }; dependencies = [ - sources."@angular-devkit/core-9.1.9" - (sources."@angular-devkit/schematics-9.1.9" // { + sources."@angular-devkit/core-10.0.7" + (sources."@angular-devkit/schematics-10.0.7" // { dependencies = [ - sources."ora-4.0.3" + sources."ora-4.0.4" ]; }) - (sources."@angular-devkit/schematics-cli-0.901.9" // { + (sources."@angular-devkit/schematics-cli-0.1000.7" // { dependencies = [ sources."inquirer-7.1.0" ]; @@ -51434,18 +52344,20 @@ in sources."chalk-2.4.2" ]; }) - (sources."@nestjs/schematics-7.0.1" // { + (sources."@nestjs/schematics-7.1.1" // { dependencies = [ - sources."@angular-devkit/core-9.1.7" - sources."@angular-devkit/schematics-9.1.7" + sources."@angular-devkit/core-9.1.12" + sources."@angular-devkit/schematics-9.1.12" sources."ora-4.0.3" + sources."rxjs-6.5.4" ]; }) - sources."@schematics/schematics-0.901.9" + sources."@schematics/schematics-0.1000.7" sources."@types/anymatch-1.3.1" sources."@types/color-name-1.1.1" + sources."@types/json-schema-7.0.5" sources."@types/json5-0.0.29" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" @@ -51454,7 +52366,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.17" // { + (sources."@types/webpack-4.41.21" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -51481,7 +52393,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" - sources."ajv-6.12.0" + sources."ajv-6.12.3" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."ansi-escapes-4.3.1" @@ -51493,7 +52405,7 @@ in sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-unique-0.3.2" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -51519,7 +52431,7 @@ in sources."binary-extensions-2.1.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."brorand-1.1.0" @@ -51559,7 +52471,7 @@ in ]; }) sources."chardet-0.7.0" - sources."chokidar-3.4.0" + sources."chokidar-3.4.2" sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" @@ -51618,7 +52530,11 @@ in }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."crypto-browserify-3.12.0" sources."cyclist-1.0.1" sources."debug-2.6.9" @@ -51692,14 +52608,19 @@ in sources."find-up-3.0.0" sources."flush-write-stream-1.1.1" sources."for-in-1.0.2" - (sources."fork-ts-checker-webpack-plugin-5.0.4" // { + (sources."fork-ts-checker-webpack-plugin-5.1.0" // { dependencies = [ - sources."chalk-2.4.2" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" ]; }) sources."fragment-cache-0.2.1" sources."from2-2.3.0" - sources."fs-extra-9.0.0" + sources."fs-extra-9.0.1" sources."fs-monkey-1.0.1" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" @@ -51738,7 +52659,18 @@ in sources."infer-owner-1.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."inquirer-7.2.0" + (sources."inquirer-7.3.3" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."cli-width-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."rxjs-6.6.2" + sources."supports-color-7.1.0" + ]; + }) sources."interpret-1.4.0" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" @@ -51761,6 +52693,7 @@ in sources."isobject-3.0.1" sources."js-tokens-4.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-traverse-0.4.1" sources."json5-1.0.1" sources."jsonfile-6.0.1" @@ -51769,7 +52702,7 @@ in sources."loader-runner-2.4.0" sources."loader-utils-1.4.0" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" (sources."log-symbols-3.0.0" // { dependencies = [ @@ -51779,7 +52712,11 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."magic-string-0.25.7" - sources."make-dir-2.1.0" + (sources."make-dir-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."md5.js-1.3.5" @@ -51858,8 +52795,18 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.1" - sources."ora-4.0.4" + sources."onetime-5.1.2" + (sources."ora-5.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."log-symbols-4.0.0" + sources."supports-color-7.1.0" + ]; + }) sources."os-browserify-0.3.0" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -51870,8 +52817,8 @@ in sources."pako-1.0.11" sources."parallel-transform-1.2.0" sources."parent-module-1.0.1" - sources."parse-asn1-5.1.5" - sources."parse-json-5.0.1" + sources."parse-asn1-5.1.6" + sources."parse-json-5.1.0" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -51884,6 +52831,7 @@ in sources."picomatch-2.2.2" sources."pify-4.0.1" sources."pkg-dir-3.0.0" + sources."pluralize-8.0.0" sources."posix-character-classes-0.1.1" sources."process-0.11.10" sources."process-nextick-args-2.0.1" @@ -51921,13 +52869,13 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."run-queue-1.0.3" - sources."rxjs-6.5.4" + sources."rxjs-6.5.5" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."schema-utils-1.0.0" - sources."semver-5.7.1" - sources."serialize-javascript-3.1.0" + sources."schema-utils-2.7.0" + sources."semver-7.3.2" + sources."serialize-javascript-4.0.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -52015,8 +52963,9 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.4" // { + (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ + sources."schema-utils-1.0.0" sources."source-map-0.6.1" ]; }) @@ -52034,7 +52983,7 @@ in sources."to-regex-range-5.0.1" sources."tree-kill-1.2.2" sources."tsconfig-paths-3.9.0" - (sources."tsconfig-paths-webpack-plugin-3.2.0" // { + (sources."tsconfig-paths-webpack-plugin-3.3.0" // { dependencies = [ sources."chalk-2.4.2" ]; @@ -52074,11 +53023,7 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - (sources."watchpack-1.7.4" // { - dependencies = [ - sources."chokidar-3.4.1" - ]; - }) + sources."watchpack-1.7.4" (sources."watchpack-chokidar2-2.0.0" // { dependencies = [ sources."anymatch-2.0.0" @@ -52099,19 +53044,20 @@ in ]; }) sources."wcwidth-1.0.1" - (sources."webpack-4.43.0" // { + (sources."webpack-4.44.1" // { dependencies = [ sources."memory-fs-0.4.1" + sources."schema-utils-1.0.0" ]; }) - sources."webpack-node-externals-1.7.2" + sources."webpack-node-externals-2.5.1" (sources."webpack-sources-1.4.3" // { dependencies = [ sources."source-map-0.6.1" ]; }) sources."which-1.3.1" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" sources."worker-farm-1.7.0" sources."wrappy-1.0.2" sources."xtend-4.0.2" @@ -52132,15 +53078,15 @@ in "@vue/cli" = nodeEnv.buildNodePackage { name = "_at_vue_slash_cli"; packageName = "@vue/cli"; - version = "4.4.6"; + version = "4.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/cli/-/cli-4.4.6.tgz"; - sha512 = "IaLrnZ80BrBLPAkBup8bn363S1NHfNf8jfCJLWoXad598cUm6byMqntWtDFeTq0c3KohXcsIbT+nqLc5S9vz0w=="; + url = "https://registry.npmjs.org/@vue/cli/-/cli-4.5.4.tgz"; + sha512 = "UFhxsmiKtXxZwvuW0HB+35bEIovAjYg9oiA9uyOMkDh3ZTf90FmyPre09xKviLn0B+0WnzD35P+ZB/bgJZ/HOA=="; }; dependencies = [ sources."@akryum/winattr-3.0.0" sources."@apollo/federation-0.19.0" - (sources."@apollo/protobufjs-1.0.4" // { + (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ sources."@types/node-10.17.28" ]; @@ -52152,35 +53098,73 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.1" - sources."@babel/generator-7.11.0" + (sources."@babel/compat-data-7.11.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + (sources."@babel/core-7.11.4" // { + dependencies = [ + sources."@babel/generator-7.11.4" + sources."@babel/types-7.11.0" + sources."semver-5.7.1" + ]; + }) + (sources."@babel/generator-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.0" + ]; + }) sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.10.4" + (sources."@babel/helper-compilation-targets-7.10.4" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" - sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.10.4" + (sources."@babel/helper-define-map-7.10.5" // { + dependencies = [ + sources."@babel/types-7.11.0" + ]; + }) + sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" - sources."@babel/helper-member-expression-to-functions-7.11.0" + (sources."@babel/helper-member-expression-to-functions-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.0" + ]; + }) sources."@babel/helper-module-imports-7.10.4" - sources."@babel/helper-module-transforms-7.11.0" + (sources."@babel/helper-module-transforms-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.0" + ]; + }) sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.11.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" - sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" - sources."@babel/helper-split-export-declaration-7.11.0" + (sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.0" + ]; + }) + (sources."@babel/helper-split-export-declaration-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.0" + ]; + }) sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.4" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" @@ -52242,7 +53226,12 @@ in sources."@babel/plugin-transform-typescript-7.11.0" sources."@babel/plugin-transform-unicode-escapes-7.10.4" sources."@babel/plugin-transform-unicode-regex-7.10.4" - sources."@babel/preset-env-7.11.0" + (sources."@babel/preset-env-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.0" + sources."semver-5.7.1" + ]; + }) sources."@babel/preset-flow-7.10.4" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-typescript-7.10.4" @@ -52250,12 +53239,17 @@ in dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" + sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.11.1" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.11.0" - sources."@babel/types-7.11.0" + (sources."@babel/traverse-7.11.0" // { + dependencies = [ + sources."@babel/types-7.11.0" + ]; + }) + sources."@babel/types-7.10.4" sources."@endemolshinegroup/cosmiconfig-typescript-loader-1.0.2" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" @@ -52283,6 +53277,7 @@ in (sources."@oclif/command-1.7.0" // { dependencies = [ sources."@oclif/plugin-help-3.2.0" + sources."semver-5.7.1" ]; }) (sources."@oclif/config-1.16.0" // { @@ -52324,6 +53319,7 @@ in dependencies = [ sources."cli-ux-4.9.3" sources."indent-string-3.2.0" + sources."semver-5.7.1" sources."strip-ansi-5.2.0" ]; }) @@ -52332,10 +53328,14 @@ in sources."npm-run-path-3.1.0" sources."path-key-3.1.1" sources."semver-7.3.2" - sources."tslib-2.0.0" + sources."tslib-2.0.1" + ]; + }) + (sources."@oclif/plugin-warn-if-update-available-1.7.0" // { + dependencies = [ + sources."semver-5.7.1" ]; }) - sources."@oclif/plugin-warn-if-update-available-1.7.0" sources."@oclif/screen-1.0.4" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" @@ -52347,7 +53347,7 @@ in sources."@protobufjs/path-1.1.2" sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" - sources."@samverschueren/stream-to-observable-0.3.0" + sources."@samverschueren/stream-to-observable-0.3.1" sources."@sindresorhus/is-0.7.0" sources."@types/accepts-1.3.5" sources."@types/body-parser-1.19.0" @@ -52356,19 +53356,29 @@ in sources."@types/content-disposition-0.5.3" sources."@types/cookies-0.7.4" sources."@types/cors-2.8.7" + sources."@types/ejs-2.7.0" sources."@types/express-4.17.7" sources."@types/express-serve-static-core-4.17.9" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" sources."@types/graphql-upload-8.0.3" sources."@types/http-assert-1.5.1" + sources."@types/http-errors-1.8.0" + sources."@types/inquirer-6.5.0" + (sources."@types/jscodeshift-0.7.1" // { + dependencies = [ + sources."ast-types-0.12.1" + sources."recast-0.17.2" + sources."source-map-0.6.1" + ]; + }) sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.3" + sources."@types/koa-2.11.4" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -52378,26 +53388,39 @@ in sources."@types/qs-6.9.4" sources."@types/range-parser-1.2.3" sources."@types/serve-static-1.13.5" + sources."@types/through-0.0.30" sources."@types/ws-7.2.6" sources."@types/zen-observable-0.8.0" - (sources."@vue/cli-shared-utils-4.5.0" // { + sources."@vue/cli-shared-utils-4.5.4" + (sources."@vue/cli-ui-4.5.4" // { dependencies = [ - sources."semver-6.3.0" + sources."clone-2.1.2" ]; }) - (sources."@vue/cli-ui-4.5.0" // { + sources."@vue/cli-ui-addon-webpack-4.5.4" + sources."@vue/cli-ui-addon-widgets-4.5.4" + (sources."@vue/compiler-core-3.0.0-rc.9" // { dependencies = [ - sources."clone-2.1.2" + sources."source-map-0.6.1" + ]; + }) + sources."@vue/compiler-dom-3.0.0-rc.9" + (sources."@vue/compiler-sfc-3.0.0-rc.9" // { + dependencies = [ + sources."source-map-0.6.1" ]; }) - sources."@vue/cli-ui-addon-webpack-4.5.0" - sources."@vue/cli-ui-addon-widgets-4.5.0" + sources."@vue/compiler-ssr-3.0.0-rc.9" + sources."@vue/reactivity-3.0.0-rc.9" + sources."@vue/runtime-core-3.0.0-rc.9" + sources."@vue/runtime-dom-3.0.0-rc.9" + sources."@vue/shared-3.0.0-rc.9" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."aggregate-error-3.0.1" - sources."ajv-6.12.3" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.4" (sources."ansi-align-2.0.0" // { dependencies = [ sources."ansi-regex-3.0.0" @@ -52447,23 +53470,18 @@ in sources."apollo-client-2.6.10" (sources."apollo-codegen-core-0.37.8" // { dependencies = [ - sources."@babel/types-7.10.4" - sources."recast-0.19.1" + (sources."recast-0.19.1" // { + dependencies = [ + sources."ast-types-0.13.3" + ]; + }) sources."source-map-0.6.1" ]; }) - (sources."apollo-codegen-flow-0.35.8" // { - dependencies = [ - sources."@babel/types-7.10.4" - ]; - }) + sources."apollo-codegen-flow-0.35.8" sources."apollo-codegen-scala-0.36.8" sources."apollo-codegen-swift-0.37.8" - (sources."apollo-codegen-typescript-0.37.8" // { - dependencies = [ - sources."@babel/types-7.10.4" - ]; - }) + sources."apollo-codegen-typescript-0.37.8" sources."apollo-datasource-0.7.2" (sources."apollo-engine-reporting-2.3.0" // { dependencies = [ @@ -52510,7 +53528,11 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."ast-types-0.13.3" + (sources."ast-types-0.13.4" // { + dependencies = [ + sources."tslib-2.0.1" + ]; + }) sources."astral-regex-1.0.0" sources."async-2.6.3" sources."async-each-1.0.3" @@ -52521,7 +53543,7 @@ in sources."atob-2.1.2" sources."await-to-js-2.1.1" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" sources."backo2-1.0.2" @@ -52533,9 +53555,11 @@ in }) sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" + sources."big.js-5.2.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" sources."bl-1.2.2" + sources."bluebird-3.7.2" (sources."body-parser-1.19.0" // { dependencies = [ sources."debug-2.6.9" @@ -52545,7 +53569,6 @@ in sources."setprototypeof-1.1.1" ]; }) - sources."boolbase-1.0.0" (sources."boxen-4.2.0" // { dependencies = [ (sources."ansi-align-3.0.0" // { @@ -52570,7 +53593,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.13.0" + sources."browserslist-4.14.0" sources."buffer-5.6.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" @@ -52597,7 +53620,7 @@ in sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001118" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -52606,11 +53629,6 @@ in sources."chalk-2.4.2" sources."change-case-4.1.1" sources."chardet-0.7.0" - (sources."cheerio-1.0.0-rc.3" // { - dependencies = [ - sources."entities-1.1.2" - ]; - }) (sources."chokidar-2.1.8" // { dependencies = [ sources."braces-2.3.2" @@ -52669,14 +53687,23 @@ in sources."fs-extra-9.0.1" sources."has-flag-4.0.0" sources."is-wsl-2.2.0" + sources."semver-5.7.1" sources."strip-ansi-5.2.0" sources."supports-color-7.1.0" - sources."tslib-2.0.0" + sources."tslib-2.0.1" sources."type-fest-0.11.0" ]; }) sources."cli-width-3.0.0" sources."clipboard-2.0.6" + (sources."cliui-6.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."wrap-ansi-6.2.0" + ]; + }) sources."clone-1.0.4" sources."clone-response-1.0.2" sources."cmd-shim-3.0.3" @@ -52692,7 +53719,8 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."config-chain-1.1.12" - sources."configstore-3.1.2" + sources."configstore-3.1.5" + sources."consolidate-0.15.1" sources."constant-case-3.0.3" (sources."content-disposition-0.5.3" // { dependencies = [ @@ -52722,20 +53750,24 @@ in ]; }) sources."create-error-class-3.0.2" - sources."cross-spawn-6.0.5" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."crypto-random-string-1.0.0" - sources."css-select-1.2.0" - sources."css-what-2.1.3" + sources."cssesc-3.0.0" sources."cssfilter-0.0.10" + sources."csstype-2.6.13" sources."csv-parser-1.12.1" sources."dashdash-1.14.1" sources."date-fns-1.30.1" - sources."de-indent-1.0.2" (sources."debug-4.2.0" // { dependencies = [ sources."ms-2.1.2" ]; }) + sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" (sources."decompress-4.2.1" // { dependencies = [ @@ -52775,20 +53807,11 @@ in sources."depd-1.1.2" sources."deprecated-decorator-0.1.6" sources."destroy-1.0.4" - sources."detect-indent-6.0.0" sources."dicer-0.3.0" sources."diff-4.0.2" sources."dir-glob-3.0.1" - (sources."dom-serializer-0.1.1" // { - dependencies = [ - sources."entities-1.1.2" - ]; - }) - sources."domelementtype-1.3.1" - sources."domhandler-2.4.2" - sources."domutils-1.5.1" sources."dot-case-3.0.3" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."dotenv-8.2.0" (sources."download-7.1.0" // { dependencies = [ @@ -52805,14 +53828,15 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.520" + sources."electron-to-chromium-1.3.549" sources."elegant-spinner-1.0.1" 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."entities-2.0.3" sources."env-ci-3.2.2" - sources."envinfo-7.7.2" + sources."envinfo-7.7.3" sources."error-ex-1.3.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" @@ -52821,6 +53845,7 @@ in sources."escape-string-regexp-1.0.5" sources."esm-3.2.25" sources."esprima-4.0.1" + sources."estree-walker-2.0.1" sources."esutils-2.0.3" sources."etag-1.8.1" sources."event-pubsub-4.3.0" @@ -52889,11 +53914,12 @@ in dependencies = [ sources."make-dir-2.1.0" sources."pify-4.0.1" + sources."semver-5.7.1" ]; }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.130.0" + sources."flow-parser-0.132.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -52917,7 +53943,9 @@ in sources."gaze-1.1.3" sources."generate-function-1.1.0" sources."generate-object-property-1.2.0" + sources."generic-names-2.0.1" sources."gensync-1.0.0-beta.1" + sources."get-caller-file-2.0.5" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -52930,7 +53958,7 @@ in sources."graceful-fs-4.1.15" ]; }) - sources."git-up-4.0.1" + sources."git-up-4.0.2" sources."git-url-parse-11.1.2" sources."glob-7.1.5" sources."glob-parent-5.1.1" @@ -53015,17 +54043,11 @@ in sources."kind-of-4.0.0" ]; }) + sources."hash-sum-2.0.0" sources."hash.js-1.1.7" - sources."he-1.2.0" sources."header-case-2.0.3" sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.8" - (sources."htmlparser2-3.10.1" // { - dependencies = [ - sources."entities-1.1.2" - sources."readable-stream-3.6.0" - ]; - }) sources."http-cache-semantics-3.8.1" (sources."http-call-5.3.0" // { dependencies = [ @@ -53038,6 +54060,8 @@ in sources."human-signals-1.1.1" sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" + sources."icss-replace-symbols-1.1.0" + sources."icss-utils-4.1.1" sources."ieee754-1.1.13" sources."ignore-5.1.8" sources."ignore-by-default-1.0.1" @@ -53046,6 +54070,7 @@ in sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."indent-string-4.0.0" + sources."indexes-of-1.0.1" sources."inflected-2.0.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -53061,7 +54086,7 @@ in sources."figures-3.2.0" sources."has-flag-4.0.0" sources."mimic-fn-2.1.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."restore-cursor-3.1.0" sources."supports-color-7.1.0" sources."type-fest-0.11.0" @@ -53101,7 +54126,7 @@ in sources."is-redirect-1.0.0" sources."is-regex-1.1.1" sources."is-retry-allowed-1.2.0" - sources."is-ssh-1.3.1" + sources."is-ssh-1.3.2" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" @@ -53144,6 +54169,7 @@ in sources."jsesc-2.5.2" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -53182,9 +54208,15 @@ in sources."type-fest-0.3.1" ]; }) + (sources."loader-utils-1.4.0" // { + dependencies = [ + sources."json5-1.0.1" + ]; + }) sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" + sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" sources."lodash.debounce-4.0.8" sources."lodash.get-4.4.2" @@ -53205,7 +54237,7 @@ in sources."wrap-ansi-3.0.1" ]; }) - sources."loglevel-1.6.8" + sources."loglevel-1.7.0" sources."long-4.0.0" sources."loose-envify-1.4.0" sources."lowdb-1.0.0" @@ -53216,6 +54248,7 @@ in sources."yallist-3.1.1" ]; }) + sources."magic-string-0.25.7" sources."make-dir-1.3.0" sources."make-error-1.3.6" sources."map-cache-0.2.2" @@ -53223,6 +54256,11 @@ in sources."media-typer-0.3.0" sources."merge-1.2.1" sources."merge-descriptors-1.0.1" + (sources."merge-source-map-1.1.0" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."methods-1.1.2" @@ -53270,7 +54308,6 @@ in (sources."node-notifier-6.0.0" // { dependencies = [ sources."is-wsl-2.2.0" - sources."semver-6.3.0" ]; }) sources."node-releases-1.1.60" @@ -53278,15 +54315,19 @@ in dependencies = [ sources."debug-3.2.6" sources."ms-2.1.2" + sources."semver-5.7.1" ]; }) sources."nopt-1.0.10" - sources."normalize-package-data-2.5.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."npm-conf-1.1.3" sources."npm-run-path-2.0.2" - sources."nth-check-1.0.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" @@ -53331,14 +54372,17 @@ in sources."p-map-2.1.0" sources."p-timeout-2.0.1" sources."p-try-2.2.0" - sources."package-json-4.0.1" + (sources."package-json-4.0.1" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."param-case-3.0.3" sources."parse-git-config-2.0.3" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."parse-passwd-1.0.0" - sources."parse-path-4.0.1" - sources."parse-url-5.0.1" - sources."parse5-3.0.3" + sources."parse-path-4.0.2" + sources."parse-url-5.0.2" sources."parseurl-1.3.3" sources."pascal-case-3.1.1" sources."pascalcase-0.1.1" @@ -53375,13 +54419,26 @@ in ]; }) sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.32" // { + dependencies = [ + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-modules-3.2.2" + sources."postcss-modules-extract-imports-2.0.0" + sources."postcss-modules-local-by-default-3.0.3" + sources."postcss-modules-scope-2.2.0" + sources."postcss-modules-values-3.0.0" + sources."postcss-selector-parser-6.0.2" + sources."postcss-value-parser-4.1.0" sources."prepend-http-1.0.4" - sources."prismjs-1.20.0" + sources."prismjs-1.21.0" sources."private-0.1.8" sources."process-exists-3.1.0" sources."process-nextick-args-2.0.1" sources."proto-list-1.2.4" - sources."protocols-1.4.7" + sources."protocols-1.4.8" sources."proxy-addr-2.0.6" sources."ps-list-4.1.0" sources."pseudomap-1.0.2" @@ -53428,6 +54485,7 @@ in }) (sources."recast-0.18.10" // { dependencies = [ + sources."ast-types-0.13.3" sources."source-map-0.6.1" ]; }) @@ -53456,6 +54514,8 @@ in sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" sources."request-2.88.2" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" sources."resolve-1.17.0" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" @@ -53476,8 +54536,12 @@ in sources."sec-1.0.0" sources."seek-bzip-1.0.6" sources."select-1.1.2" - sources."semver-5.7.1" - sources."semver-diff-2.1.0" + sources."semver-6.3.0" + (sources."semver-diff-2.1.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) (sources."send-0.17.1" // { dependencies = [ (sources."debug-2.6.9" // { @@ -53492,6 +54556,7 @@ in }) sources."sentence-case-3.0.3" sources."serve-static-1.14.1" + sources."set-blocking-2.0.0" sources."set-value-2.0.1" sources."setprototypeof-1.2.0" sources."sha.js-2.4.11" @@ -53543,6 +54608,7 @@ in ]; }) sources."source-map-url-0.4.0" + sources."sourcemap-codec-1.4.8" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -53577,6 +54643,7 @@ in sources."steno-0.4.4" sources."streamsearch-0.1.2" sources."strict-uri-encode-1.1.0" + sources."string-hash-1.1.3" sources."string-width-4.2.0" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" @@ -53596,7 +54663,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - (sources."subscriptions-transport-ws-0.9.17" // { + (sources."subscriptions-transport-ws-0.9.18" // { dependencies = [ sources."ws-5.2.2" ]; @@ -53622,11 +54689,11 @@ in dependencies = [ sources."cross-spawn-7.0.3" sources."execa-3.4.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."is-stream-2.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -53696,6 +54763,7 @@ in sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" sources."union-value-1.0.1" + sources."uniq-1.0.1" sources."unique-string-1.0.0" sources."universalify-1.0.0" sources."unpipe-1.0.0" @@ -53741,18 +54809,18 @@ in sources."vscode-languageserver-protocol-3.14.1" sources."vscode-languageserver-types-3.14.0" sources."vscode-uri-1.0.6" - sources."vue-2.6.11" + sources."vue-2.6.12" (sources."vue-cli-plugin-apollo-0.21.3" // { dependencies = [ sources."cross-spawn-7.0.3" sources."execa-3.4.0" sources."fs-extra-8.1.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."is-stream-2.0.0" sources."jsonfile-4.0.0" sources."mimic-fn-2.1.0" sources."npm-run-path-4.0.1" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."p-finally-2.0.1" sources."path-key-3.1.1" sources."shebang-command-2.0.0" @@ -53761,16 +54829,16 @@ in sources."which-2.0.2" ]; }) - sources."vue-jscodeshift-adapter-2.1.0" - (sources."vue-sfc-descriptor-to-string-1.0.0" // { + (sources."vue-codemod-0.0.4" // { dependencies = [ - sources."indent-string-3.2.0" + sources."globby-10.0.2" + sources."vue-3.0.0-rc.9" ]; }) - sources."vue-template-compiler-2.6.11" sources."watch-1.0.2" sources."wcwidth-1.0.1" sources."which-1.3.1" + sources."which-module-2.0.0" sources."widest-line-3.1.0" (sources."wrap-ansi-4.0.0" // { dependencies = [ @@ -53788,12 +54856,26 @@ in sources."xmlbuilder-11.0.1" sources."xss-1.0.8" sources."xtend-4.0.2" + sources."y18n-4.0.0" sources."yallist-2.1.2" (sources."yaml-front-matter-3.4.1" // { dependencies = [ sources."commander-1.0.0" ]; }) + (sources."yargs-15.4.1" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + ]; + }) + (sources."yargs-parser-18.1.3" // { + dependencies = [ + sources."camelcase-5.3.1" + ]; + }) sources."yarn-1.22.4" sources."yauzl-2.10.0" sources."yn-3.1.1" @@ -53935,10 +55017,10 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.11.0" + sources."@babel/generator-7.11.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.4" sources."@babel/template-7.10.4" sources."@babel/types-7.11.0" sources."@webassemblyjs/ast-1.9.0" @@ -53965,7 +55047,7 @@ in sources."has-flag-3.0.0" sources."js-tokens-4.0.0" sources."jsesc-2.5.2" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."source-map-0.5.7" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" @@ -54013,19 +55095,19 @@ in alloy = nodeEnv.buildNodePackage { name = "alloy"; packageName = "alloy"; - version = "1.14.6"; + version = "1.15.1"; src = fetchurl { - url = "https://registry.npmjs.org/alloy/-/alloy-1.14.6.tgz"; - sha512 = "M+DxWKG35yfUrJj58i6ohTrf8EaRkk9mFj/QSXxUvmqsyYrBmpQT1RnITzk7HY0QVxW1Oiw9zjxGVrQeozJL/w=="; + url = "https://registry.npmjs.org/alloy/-/alloy-1.15.1.tgz"; + sha512 = "exbloxT1pbivXVDOKYG9sG6mu7dv1ppn6pgkqYsKRtwBEqgNFKi9AlR7Gr8DL2wZOxQNExv4MoGYdPvoc6sGpg=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/core-7.11.1" // { + (sources."@babel/core-7.11.4" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.11.0" // { + (sources."@babel/generator-7.11.4" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -54042,7 +55124,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.4" sources."@babel/template-7.10.4" sources."@babel/traverse-7.11.0" sources."@babel/types-7.11.0" @@ -54093,7 +55175,7 @@ in sources."json5-2.1.3" sources."jsonfile-4.0.0" sources."jsonlint-1.6.2" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."matcher-collection-1.1.2" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -54146,7 +55228,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -54174,10 +55256,10 @@ in bash-language-server = nodeEnv.buildNodePackage { name = "bash-language-server"; packageName = "bash-language-server"; - version = "1.16.1"; + version = "1.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.16.1.tgz"; - sha512 = "IS1Ix7qyRq7GTMXqhHUF44yY89i/1Ucn5KFLimEfDpwU1f3GvbV9VnDpqpG6kedJsl2LigEthSnoVlzaOwgt0g=="; + url = "https://registry.npmjs.org/bash-language-server/-/bash-language-server-1.17.0.tgz"; + sha512 = "t80ktUFL9DPaTO7yydoNYXIDKINweWbFvvUXesltmWj7UaIyepIVRAWUp4+62udJtor1VxVFEAXnsVDA640flw=="; }; dependencies = [ sources."abab-2.0.4" @@ -54188,14 +55270,14 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."array-equal-1.0.0" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -54248,7 +55330,7 @@ in sources."jsprim-1.4.1" sources."left-pad-1.3.0" sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.sortby-4.7.0" sources."mime-db-1.44.0" sources."mime-types-2.1.27" @@ -54472,7 +55554,7 @@ in sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -54485,7 +55567,7 @@ in }) sources."balanced-match-1.0.0" sources."base64-js-1.3.1" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."browser-pack-6.1.0" @@ -54588,7 +55670,7 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parents-1.0.1" - sources."parse-asn1-5.1.5" + sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -54616,6 +55698,7 @@ in sources."resolve-1.17.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."sha.js-2.4.11" sources."shasum-1.0.2" sources."shasum-object-1.0.0" @@ -54688,7 +55771,7 @@ in sources."@types/node-13.13.15" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-1.1.1" sources."ansi-styles-2.2.1" sources."append-0.1.1" @@ -54700,7 +55783,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -54822,7 +55905,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.1" + sources."ipaddr.js-2.0.0" sources."is-arrayish-0.2.1" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" @@ -55011,7 +56094,11 @@ in sources."srt2vtt-1.3.1" sources."sshpk-1.16.1" sources."stream-transcoder-0.0.5" - sources."string2compact-1.3.0" + (sources."string2compact-1.3.0" // { + dependencies = [ + sources."ipaddr.js-1.9.1" + ]; + }) sources."string_decoder-0.10.31" sources."strip-ansi-2.0.1" sources."strip-bom-2.0.0" @@ -55173,10 +56260,10 @@ in coc-git = nodeEnv.buildNodePackage { name = "coc-git"; packageName = "coc-git"; - version = "1.8.1"; + version = "1.8.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-git/-/coc-git-1.8.1.tgz"; - sha512 = "C9un9MiSk9rZ2ATOdBeTTH/39sHzQJf5rJnuVqNNyjTECIdzsL0Hbb8/CffFrB82z4tDfru2dncjd5fnz/OTOQ=="; + url = "https://registry.npmjs.org/coc-git/-/coc-git-1.8.3.tgz"; + sha512 = "wXUzr9EvZ4booUhGSXbuvwiRivQ8CJd/TtEpff/XHQTxGrst6t7Kevs1PAf8q7tKioH2Nu+T0FWw30tN9PTXuQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -55191,15 +56278,15 @@ in coc-go = nodeEnv.buildNodePackage { name = "coc-go"; packageName = "coc-go"; - version = "0.9.2"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-go/-/coc-go-0.9.2.tgz"; - sha512 = "2w3kFR0SG4zBJ1mEd4eaCXB+LIdbZxkaSpivojRbiwNBc6Z6gfcqcAl841lGxr9Ry4R4jPGjnGH0N+08Ectg1Q=="; + url = "https://registry.npmjs.org/coc-go/-/coc-go-0.10.0.tgz"; + sha512 = "BBx3JsU9SLXnRrNy+2a5gFKNu0g8r2uKHlfKLmcFpc7x4PW0RS7gTgW3DGL2ye2tXUcFfcOvXkkTQd5urY+M4Q=="; }; dependencies = [ sources."isexe-2.0.0" sources."node-fetch-2.6.0" - sources."tslib-2.0.0" + sources."tslib-2.0.1" sources."which-2.0.2" ]; buildInputs = globalBuildInputs; @@ -55269,10 +56356,10 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.4.11"; + version = "1.4.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.11.tgz"; - sha512 = "Dh6q45+NKNqFxWXWOMD5eq74Egr0iuWq9nO6T/+L3yd4FL+b+whFFSdWiehifJQwx83lAGQ3TjdEjLnUT29+/Q=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.12.tgz"; + sha512 = "kKvT5ESFDOVPZ2iO4MQ2FkWj88kZqcczpQDqYD1tBgrLAGD0YnEzSzK6paI+kJYqk945X/k66Kcq5YbercvmqA=="; }; buildInputs = globalBuildInputs; meta = { @@ -55340,10 +56427,10 @@ in coc-metals = nodeEnv.buildNodePackage { name = "coc-metals"; packageName = "coc-metals"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { - url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.1.tgz"; - sha512 = "BMM8RIPR7HPAqOeQ+tqf+emtuUFATz5Kam9TUN3I4g1URFrI3pthnx6N5s6h/sdtRiwdCLo8vPie58y+Bhx4EQ=="; + url = "https://registry.npmjs.org/coc-metals/-/coc-metals-0.9.2.tgz"; + sha512 = "zfDFLxwOI6MSR/DIXWRUBtdcllVCduQPnCL7J5PIZX8y+TALshGwsSJCv2TY1wrRB9gxuVhaoBwr0kb2WRS8JA=="; }; dependencies = [ sources."@chemzqm/neovim-5.1.9" @@ -55363,8 +56450,8 @@ in sources."fast-diff-1.2.0" sources."fb-watchman-2.0.1" sources."flatted-2.0.2" - sources."follow-redirects-1.12.1" - sources."fp-ts-2.8.1" + sources."follow-redirects-1.13.0" + sources."fp-ts-2.8.2" sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" @@ -55385,9 +56472,9 @@ in sources."semver-5.7.1" ]; }) - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."log4js-5.3.0" - (sources."metals-languageclient-0.2.8" // { + (sources."metals-languageclient-0.3.0" // { dependencies = [ sources."mkdirp-1.0.4" sources."semver-7.3.2" @@ -55478,14 +56565,14 @@ in sources."@types/color-name-1.1.1" sources."@types/eslint-visitor-keys-1.0.0" sources."@types/json-schema-7.0.5" - sources."@typescript-eslint/experimental-utils-3.8.0" - sources."@typescript-eslint/parser-3.8.0" - sources."@typescript-eslint/types-3.8.0" - sources."@typescript-eslint/typescript-estree-3.8.0" - sources."@typescript-eslint/visitor-keys-3.8.0" + sources."@typescript-eslint/experimental-utils-3.10.1" + sources."@typescript-eslint/parser-3.10.1" + sources."@typescript-eslint/types-3.10.1" + sources."@typescript-eslint/typescript-estree-3.10.1" + sources."@typescript-eslint/visitor-keys-3.10.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ajv-keywords-3.5.2" (sources."ansi-align-2.0.0" // { dependencies = [ @@ -55545,7 +56632,7 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001118" sources."capture-stack-trace-1.0.1" sources."ccount-1.0.5" sources."chalk-2.4.2" @@ -55595,9 +56682,9 @@ in sources."common-tags-1.8.0" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" - (sources."configstore-3.1.2" // { + (sources."configstore-3.1.5" // { dependencies = [ - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."is-obj-1.0.1" ]; }) @@ -55642,7 +56729,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.2.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.520" + sources."electron-to-chromium-1.3.549" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -55661,7 +56748,7 @@ in sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -55906,10 +56993,10 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.merge-4.6.2" sources."log-symbols-2.2.0" - sources."loglevel-1.6.8" + sources."loglevel-1.7.0" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -55999,7 +57086,7 @@ in ]; }) sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."optionator-0.8.3" (sources."os-locale-3.1.0" // { dependencies = [ @@ -56074,7 +57161,7 @@ in sources."prelude-ls-1.1.2" sources."prepend-http-1.0.4" sources."preserve-0.2.0" - sources."prettier-2.0.5" + sources."prettier-2.1.1" (sources."prettier-eslint-10.1.1" // { dependencies = [ sources."prettier-1.19.1" @@ -56472,10 +57559,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.7.14"; + version = "0.7.15"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.14.tgz"; - sha512 = "nTS7mcGTbo+5bLdhod4GOVTODb/wDdnKgVNLpU75q//kwQuf0psUPp3t/XFcYXxzbskMwAcaEXyC27cGek7+Cw=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.7.15.tgz"; + sha512 = "PYnLYoY2w0dsco/EmjjnVodQKsKOgbtDHdokjGphhK66J733ctg4Jww5I8WXAAuCkfUpQmALXdBvNg45PL7C9g=="; }; buildInputs = globalBuildInputs; meta = { @@ -56549,8 +57636,8 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.1" - sources."@babel/generator-7.11.0" + sources."@babel/core-7.11.4" + sources."@babel/generator-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.11.0" @@ -56563,7 +57650,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.4" sources."@babel/template-7.10.4" sources."@babel/traverse-7.11.0" sources."@babel/types-7.11.0" @@ -56571,11 +57658,11 @@ in sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -56614,7 +57701,7 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."browserslist-4.13.0" + sources."browserslist-4.14.0" sources."cache-base-1.0.1" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" @@ -56622,7 +57709,7 @@ in sources."callsites-2.0.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001118" sources."ccount-1.0.5" sources."chalk-2.4.2" sources."character-entities-1.2.4" @@ -56682,7 +57769,7 @@ in sources."domhandler-2.4.2" sources."domutils-1.7.0" sources."dot-prop-5.2.0" - sources."electron-to-chromium-1.3.520" + sources."electron-to-chromium-1.3.549" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -56832,7 +57919,7 @@ in ]; }) sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."log-symbols-3.0.0" sources."longest-streak-2.0.4" sources."loud-rejection-1.6.0" @@ -57227,13 +58314,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.5.3"; + version = "1.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.3.tgz"; - sha512 = "8izLeNvlIted2ilje94KmEh/yGX4pTHajWuPBjP9GeM4JZI0RK7VS+SlkRSJB6IjJkubs7VvTnp3ahVYJecZvw=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.5.tgz"; + sha512 = "pfRHS22Ves4wmooLo92b57iHHVPdITQwPStx0IKe2Ld69MlrnqJbx/YuU9wsKoHhwnjt09CIzXgs+4mLKFQrsg=="; }; dependencies = [ - sources."typescript-3.9.5" + sources."typescript-3.9.7" ]; buildInputs = globalBuildInputs; meta = { @@ -57248,10 +58335,10 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.1.11"; + version = "1.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.11.tgz"; - sha512 = "a1yV0MtIe6uV0hIhIVUonFTqrykV5wmio8NRlIPYxYgmYq05t0glBK1P8AOPkHi9o4K0kJB4XGLiOJXnTOBNig=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.1.12.tgz"; + sha512 = "QKMD9vPxzTfP1CxSZW3lWxb6ABL06eoYRGs9bq3uwXn1qIAfOOp7JkmsdehD6H8hVP5dbFsudjahb27bvw/OpA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -57266,12 +58353,21 @@ in }) sources."@nodelib/fs.stat-1.1.3" sources."@nodelib/fs.walk-1.2.4" + sources."@prettier/plugin-pug-1.5.1" sources."@sindresorhus/is-0.14.0" - sources."@sorg/log-2.1.0" + sources."@sorg/log-2.2.0" sources."@starptech/expression-parser-0.10.0" sources."@starptech/hast-util-from-webparser-0.10.0" - sources."@starptech/prettyhtml-0.10.0" - sources."@starptech/prettyhtml-formatter-0.10.0" + (sources."@starptech/prettyhtml-0.10.0" // { + dependencies = [ + sources."prettier-1.19.1" + ]; + }) + (sources."@starptech/prettyhtml-formatter-0.10.0" // { + dependencies = [ + sources."prettier-1.19.1" + ]; + }) sources."@starptech/prettyhtml-hast-to-html-0.10.0" sources."@starptech/prettyhtml-hastscript-0.10.0" sources."@starptech/prettyhtml-sort-attributes-0.10.0" @@ -57285,31 +58381,30 @@ in sources."@types/json-schema-7.0.5" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" - (sources."@typescript-eslint/experimental-utils-1.13.0" // { + sources."@typescript-eslint/experimental-utils-3.10.1" + sources."@typescript-eslint/parser-3.10.1" + sources."@typescript-eslint/types-3.10.1" + (sources."@typescript-eslint/typescript-estree-3.10.1" // { dependencies = [ - sources."eslint-scope-4.0.3" - ]; - }) - sources."@typescript-eslint/parser-1.13.0" - (sources."@typescript-eslint/typescript-estree-1.13.0" // { - dependencies = [ - sources."semver-5.5.0" + sources."debug-4.2.0" + sources."semver-7.3.2" ]; }) + sources."@typescript-eslint/visitor-keys-3.10.1" sources."abbrev-1.1.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" - (sources."aggregate-error-3.0.1" // { + (sources."aggregate-error-3.1.0" // { dependencies = [ sources."indent-string-4.0.0" ]; }) - sources."ajv-6.12.3" + sources."ajv-6.12.4" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -57317,6 +58412,7 @@ in sources."strip-ansi-5.2.0" ]; }) + sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -57362,13 +58458,12 @@ in sources."extend-shallow-2.0.1" ]; }) - sources."buefy-helper-json-1.0.3" sources."buffer-from-1.1.1" sources."builtin-modules-1.1.1" sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -57381,6 +58476,7 @@ in sources."character-entities-1.2.4" sources."character-entities-html4-1.1.4" sources."character-entities-legacy-1.1.4" + sources."character-parser-2.2.0" sources."character-reference-invalid-1.1.4" sources."chardet-0.7.0" (sources."chokidar-3.0.2" // { @@ -57437,7 +58533,6 @@ in sources."config-chain-1.1.12" sources."configstore-4.0.0" sources."copy-descriptor-0.1.1" - sources."core-js-3.6.5" sources."core-util-is-1.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -57502,38 +58597,49 @@ in sources."dir-glob-2.0.0" sources."dlv-1.1.3" sources."doctrine-3.0.0" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."duplexer3-0.1.4" sources."editorconfig-0.15.3" sources."element-helper-json-2.0.6" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" + sources."enquirer-2.3.6" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-6.8.0" // { + (sources."eslint-7.7.0" // { dependencies = [ - sources."ansi-regex-4.1.0" - (sources."cross-spawn-6.0.5" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."cross-spawn-7.0.3" sources."debug-4.2.0" + sources."has-flag-4.0.0" sources."ignore-4.0.6" - sources."semver-6.3.0" - sources."strip-ansi-5.2.0" + sources."path-key-3.1.1" + sources."semver-7.3.2" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."strip-ansi-6.0.0" sources."strip-json-comments-3.1.1" + sources."supports-color-7.1.0" + sources."which-2.0.2" + ]; + }) + (sources."eslint-plugin-vue-7.0.0-beta.2" // { + dependencies = [ + sources."semver-7.3.2" ]; }) - sources."eslint-plugin-vue-6.2.2" sources."eslint-scope-5.1.0" - sources."eslint-utils-1.4.3" + sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-6.2.1" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -57634,6 +58740,7 @@ in ]; }) sources."has-flag-3.0.0" + sources."has-symbols-1.0.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -57645,7 +58752,7 @@ in sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.0.4" + sources."hast-util-is-element-1.1.0" sources."hast-util-parse-selector-2.2.4" sources."hast-util-to-string-1.0.4" sources."hast-util-whitespace-1.0.4" @@ -57693,6 +58800,7 @@ in sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" sources."is-empty-1.2.0" + sources."is-expression-4.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -57713,6 +58821,7 @@ in sources."is-path-inside-1.0.1" sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" + sources."is-regex-1.1.1" sources."is-stream-1.1.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -57720,7 +58829,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-beautify-1.11.0" // { + (sources."js-beautify-1.13.0" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -57729,6 +58838,7 @@ in sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."json5-2.1.3" @@ -57737,18 +58847,17 @@ in sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."lcid-2.0.0" - sources."levn-0.3.0" + sources."levn-0.4.1" sources."lines-and-columns-1.1.6" sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.assign-4.2.0" sources."lodash.defaults-4.2.0" sources."lodash.iteratee-4.7.0" sources."lodash.merge-4.6.2" - sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.8" + sources."loglevel-1.7.0" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -57795,7 +58904,7 @@ in sources."natural-compare-1.4.0" sources."nice-try-1.0.5" sources."node-fetch-2.6.0" - sources."nopt-4.0.3" + sources."nopt-5.0.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" @@ -57821,8 +58930,8 @@ in sources."object-visit-1.0.1" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.1" - sources."optionator-0.8.3" + sources."onetime-5.1.2" + sources."optionator-0.9.1" sources."os-homedir-1.0.2" (sources."os-locale-3.1.0" // { dependencies = [ @@ -57832,7 +58941,6 @@ in ]; }) sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" @@ -57873,44 +58981,32 @@ in ]; }) sources."posix-character-classes-0.1.1" - sources."prelude-ls-1.1.2" + sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" - sources."prettier-1.19.1" - (sources."prettier-eslint-9.0.2" // { + sources."prettier-2.1.1" + (sources."prettier-eslint-10.1.1" // { dependencies = [ - sources."acorn-6.4.1" - (sources."acorn-jsx-3.0.1" // { + sources."ansi-regex-4.1.0" + (sources."cross-spawn-6.0.5" // { dependencies = [ - sources."acorn-3.3.0" + sources."semver-5.7.1" ]; }) - sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" - sources."cli-cursor-2.1.0" - sources."cli-width-2.2.1" - sources."cross-spawn-6.0.5" sources."debug-4.2.0" - sources."eslint-5.16.0" - sources."eslint-scope-4.0.3" - sources."espree-5.0.1" - sources."figures-2.0.0" - sources."globals-11.12.0" + sources."eslint-6.8.0" + sources."eslint-utils-1.4.3" + sources."espree-6.2.1" sources."ignore-4.0.6" sources."indent-string-4.0.0" - sources."inquirer-6.5.2" - sources."mimic-fn-1.2.0" - sources."mute-stream-0.0.7" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" + sources."levn-0.3.0" + sources."optionator-0.8.3" + sources."prelude-ls-1.1.2" + sources."prettier-1.19.1" + sources."regexpp-2.0.1" + sources."semver-6.3.0" sources."strip-ansi-5.2.0" - (sources."vue-eslint-parser-2.0.3" // { - dependencies = [ - sources."acorn-5.7.4" - sources."debug-3.2.6" - sources."eslint-scope-3.7.3" - sources."espree-3.5.4" - ]; - }) + sources."strip-json-comments-3.1.1" + sources."type-check-0.3.2" ]; }) sources."prettier-tslint-0.4.2" @@ -57920,6 +59016,8 @@ in sources."property-information-5.5.0" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" + sources."pug-error-2.0.0" + sources."pug-lexer-5.0.0" sources."pump-3.0.0" sources."punycode-2.1.1" sources."quick-lru-1.1.0" @@ -57932,7 +59030,7 @@ in sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -57946,7 +59044,7 @@ in sources."readdirp-3.4.0" sources."redent-2.0.0" sources."regex-not-1.0.2" - sources."regexpp-2.0.1" + sources."regexpp-3.1.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."rehype-sort-attribute-values-2.0.1" @@ -58109,7 +59207,7 @@ in }) sources."stylus-supremacy-2.14.5" sources."suf-cli-0.1.1" - sources."suf-node-1.1.1" + sources."suf-node-1.2.1" sources."suf-regex-0.0.22" sources."supports-color-5.5.0" sources."symbol-0.2.3" @@ -58139,9 +59237,13 @@ in sources."trim-trailing-lines-1.1.3" sources."trough-1.0.5" sources."tslib-1.13.0" - sources."tslint-5.20.1" - sources."tsutils-2.29.0" - sources."type-check-0.3.2" + (sources."tslint-5.20.1" // { + dependencies = [ + sources."tsutils-2.29.0" + ]; + }) + sources."tsutils-3.17.1" + sources."type-check-0.4.0" sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."typescript-3.9.7" @@ -58215,11 +59317,10 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - sources."vls-0.2.0" - (sources."vscode-css-languageservice-4.3.1" // { + sources."vls-0.4.2" + (sources."vscode-css-languageservice-4.3.3" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" - sources."vscode-uri-2.1.2" ]; }) sources."vscode-emmet-helper-1.2.17" @@ -58229,11 +59330,12 @@ in sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.15.1" sources."vscode-nls-4.1.2" - sources."vscode-uri-1.0.8" - sources."vscode-web-custom-data-0.1.4" + sources."vscode-uri-2.1.2" + sources."vscode-web-custom-data-0.3.1" (sources."vue-eslint-parser-7.1.0" // { dependencies = [ sources."debug-4.2.0" + sources."espree-6.2.1" ]; }) sources."vue-onsenui-helper-json-1.0.2" @@ -58314,10 +59416,10 @@ in coc-yaml = nodeEnv.buildNodePackage { name = "coc-yaml"; packageName = "coc-yaml"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.0.4.tgz"; - sha512 = "ChwFqLSF0C/c/LIhJR6ycOc7JZreFkGeNOol/+oPw+OFvY5Zgz8vjdDzmwXZlKwQMIuZAnDUFZOJaYUyCRJzsw=="; + url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.0.5.tgz"; + sha512 = "BMtE+UB9mmChn9bD6Nd7fuWVgEPwaa48QQLyE0nxQK2PXozLsPpRx7micYNpMB/LUh786oe/Gn1NPVwzNE2iEw=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -58331,10 +59433,10 @@ in sources."js-yaml-3.14.0" sources."jsonc-parser-2.3.0" sources."ms-2.0.0" - sources."prettier-1.19.1" + sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.0" + sources."vscode-json-languageservice-3.8.1" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -58351,7 +59453,7 @@ in sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" sources."yaml-ast-parser-custom-tags-0.0.43" - sources."yaml-language-server-0.7.2" + sources."yaml-language-server-0.10.0" ]; buildInputs = globalBuildInputs; meta = { @@ -58467,17 +59569,17 @@ in sources."diagnostics-1.1.1" sources."enabled-1.0.2" sources."env-variable-0.0.6" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.6" sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."kuler-1.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."logform-2.2.0" sources."lynx-0.2.0" sources."mersenne-0.0.4" @@ -58532,7 +59634,7 @@ in sources."@types/color-name-1.1.1" sources."abbrev-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-0.3.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -58551,7 +59653,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -58598,7 +59700,7 @@ in sources."concat-map-0.0.1" (sources."conf-1.4.0" // { dependencies = [ - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."is-obj-1.0.1" sources."make-dir-1.3.0" sources."pify-3.0.0" @@ -58684,7 +59786,7 @@ in sources."fresh-0.5.2" sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -58766,7 +59868,7 @@ in sources."isstream-0.1.2" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -58779,7 +59881,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.debounce-4.0.8" sources."loud-rejection-2.2.0" sources."lowercase-keys-1.0.1" @@ -58824,8 +59926,8 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."onetime-5.1.1" - sources."open-7.1.0" + sources."onetime-5.1.2" + sources."open-7.2.0" sources."os-homedir-1.0.2" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -58876,7 +59978,7 @@ in sources."rc-1.2.8" sources."read-1.0.7" sources."read-chunk-3.2.0" - sources."read-package-json-2.1.1" + sources."read-package-json-2.1.2" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" (sources."request-2.88.2" // { @@ -58941,7 +60043,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.1.0" - sources."systeminformation-4.26.10" + sources."systeminformation-4.27.3" sources."term-size-2.2.0" sources."through-2.3.8" sources."tmp-0.2.1" @@ -58959,7 +60061,7 @@ in sources."unique-string-2.0.0" sources."universalify-1.0.0" sources."unpipe-1.0.0" - sources."update-notifier-4.1.0" + sources."update-notifier-4.1.1" sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" @@ -58979,7 +60081,7 @@ in sources."strip-ansi-6.0.0" ]; }) - (sources."windows-release-3.3.1" // { + (sources."windows-release-3.3.3" // { dependencies = [ sources."cross-spawn-6.0.5" sources."execa-1.0.0" @@ -59028,9 +60130,9 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/normalize-package-data-2.4.0" - sources."aggregate-error-3.0.1" + sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" sources."arr-diff-4.0.0" sources."arr-flatten-1.1.0" @@ -59182,7 +60284,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."js-tokens-4.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."junk-3.1.0" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" @@ -59247,7 +60349,7 @@ in sources."p-map-3.0.0" sources."p-timeout-3.2.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-4.0.0" @@ -59396,7 +60498,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.1" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -59438,7 +60540,7 @@ in sources."event-emitter-0.3.5" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -59459,7 +60561,7 @@ in sources."is-fullwidth-code-point-2.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._baseiteratee-4.7.0" sources."lodash._basetostring-4.12.0" sources."lodash._baseuniq-4.6.0" @@ -59598,7 +60700,7 @@ in sources."isarray-0.0.1" sources."isexe-2.0.0" sources."jsonfile-4.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -59606,7 +60708,7 @@ in sources."ms-2.0.0" sources."mute-stream-0.0.8" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" @@ -59719,7 +60821,7 @@ in }; dependencies = [ sources."abstract-random-access-1.1.2" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-align-2.0.0" sources."ansi-diff-1.1.1" sources."ansi-regex-3.0.0" @@ -59746,7 +60848,7 @@ in sources."atob-2.1.2" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -59823,7 +60925,7 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."configstore-3.1.2" + sources."configstore-3.1.5" sources."connections-1.4.2" sources."content-types-0.1.0" sources."copy-descriptor-0.1.1" @@ -59882,7 +60984,7 @@ in sources."dns-packet-4.2.0" sources."dns-socket-3.0.0" sources."dom-walk-0.1.2" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."duplexer3-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" @@ -60225,7 +61327,7 @@ in ]; }) sources."sodium-universal-2.0.0" - sources."sorted-array-functions-1.2.0" + sources."sorted-array-functions-1.3.0" sources."sorted-indexof-1.0.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" @@ -60367,10 +61469,10 @@ in dhcp = nodeEnv.buildNodePackage { name = "dhcp"; packageName = "dhcp"; - version = "0.2.18"; + version = "0.2.19"; src = fetchurl { - url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.18.tgz"; - sha512 = "VqsWI0zHgX+i4rDmqXqqDv3T++z21osaOencXrMVwlF8P75tKlEnZ72WlONNE1UAxtAvlPIG2zmGMoa7guqDyw=="; + url = "https://registry.npmjs.org/dhcp/-/dhcp-0.2.19.tgz"; + sha512 = "RQhzFYjO955zR6YUqP2NbaE6owt9sq33ACWydyKS0v7Tec71Gf2+ewNLyE91UqCtw3wmQhTAYDsWdrqzsxVNig=="; }; dependencies = [ sources."minimist-1.2.5" @@ -60419,21 +61521,21 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.33.2"; + version = "6.33.3"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.2.tgz"; - sha512 = "zdVxNUeI3Ywj3ls8K+NcssOn4KjfJ5QdSyTsgIf9AsOlDCioGh5//qE5/c4HH0Bn14J/WETEcSW62YJKlMFN0w=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.3.tgz"; + sha512 = "m/zeWqH/JXZvR/7D2j0TjK2jyDf8SFeAi0IWW92+elx28krC66lvzhVgoNiG8PpCLuT6rZk1yLhYAjMVEB4YyA=="; }; dependencies = [ sources."JSONStream-1.3.5" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.726.0" + sources."aws-sdk-2.740.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" @@ -60447,7 +61549,7 @@ in sources."delay-4.4.0" sources."delayed-stream-1.0.0" sources."ecc-jsbn-0.1.2" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.6" sources."events-1.1.1" sources."extend-3.0.2" sources."extsprintf-1.3.0" @@ -60478,14 +61580,14 @@ in sources."json-stringify-safe-5.0.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lossless-json-1.0.4" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimist-1.2.5" sources."oauth-sign-0.9.0" sources."p-finally-1.0.0" - sources."p-queue-6.6.0" + sources."p-queue-6.6.1" sources."p-timeout-3.2.0" sources."performance-now-2.1.0" sources."process-nextick-args-2.0.1" @@ -60568,15 +61670,15 @@ in emoj = nodeEnv.buildNodePackage { name = "emoj"; packageName = "emoj"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/emoj/-/emoj-3.0.1.tgz"; - sha512 = "ZZfCT5/+XXomHI7O+frUJfKeqEnxXYq8SL45s0uR6KMRZpFlckzMlLpyBFKVUNd+VWjgVwmc9d/fe/YhU1N5Ng=="; + url = "https://registry.npmjs.org/emoj/-/emoj-3.1.0.tgz"; + sha512 = "ohjlUXM2v39rDqGIrlyxdcn9ql+4b+X1u90CXNWjYw5wX6C3wTHRfqFfeV8jajYD6Xc+ufn2X1QeZZWhRBXTlA=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/core-7.11.1" - sources."@babel/generator-7.11.0" + sources."@babel/core-7.11.4" + sources."@babel/generator-7.11.4" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" sources."@babel/helper-builder-react-jsx-experimental-7.10.5" @@ -60593,7 +61695,7 @@ in sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.4" sources."@babel/plugin-proposal-object-rest-spread-7.11.0" sources."@babel/plugin-syntax-jsx-7.10.4" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" @@ -60603,18 +61705,18 @@ in sources."@babel/template-7.10.4" sources."@babel/traverse-7.11.0" sources."@babel/types-7.11.0" - sources."@sindresorhus/is-2.1.1" + sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/color-name-1.1.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" - sources."ajv-6.12.3" + sources."ajv-6.12.4" (sources."ansi-escapes-4.3.1" // { dependencies = [ sources."type-fest-0.11.0" @@ -60623,40 +61725,48 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."arch-2.1.2" - sources."arrify-2.0.1" + sources."arrify-1.0.1" sources."astral-regex-2.0.0" + sources."atomically-1.3.2" sources."auto-bind-4.0.0" - sources."cacheable-lookup-2.0.1" + sources."balanced-match-1.0.0" + sources."brace-expansion-1.1.11" + sources."cacheable-lookup-5.0.3" (sources."cacheable-request-7.0.1" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.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" + (sources."camelcase-keys-6.2.2" // { + dependencies = [ + sources."quick-lru-4.0.1" + ]; + }) sources."chalk-2.4.2" sources."ci-info-2.0.0" + sources."cli-boxes-2.2.0" sources."cli-cursor-3.1.0" sources."cli-truncate-2.1.0" sources."clipboardy-2.3.0" - (sources."clone-response-1.0.2" // { - dependencies = [ - sources."mimic-response-1.0.1" - ]; - }) + 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."conf-6.2.4" // { + sources."commondir-1.0.1" + sources."concat-map-0.0.1" + (sources."conf-7.1.2" // { dependencies = [ - sources."semver-6.3.0" + sources."semver-7.3.2" ]; }) sources."convert-source-map-1.7.0" + sources."convert-to-spaces-1.0.2" sources."cross-spawn-6.0.5" - sources."debounce-fn-3.0.1" + sources."debounce-fn-4.0.0" sources."debug-4.2.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -60664,10 +61774,13 @@ in sources."map-obj-1.0.1" ]; }) - sources."decompress-response-5.0.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."defer-to-connect-2.0.0" sources."dot-prop-5.2.0" - sources."duplexer3-0.1.4" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -60677,40 +61790,42 @@ 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-up-3.0.0" + sources."fs.realpath-1.0.0" sources."gensync-1.0.0-beta.1" sources."get-stream-4.1.0" + sources."glob-7.1.6" sources."globals-11.12.0" - (sources."got-10.7.0" // { - dependencies = [ - sources."get-stream-5.1.0" - ]; - }) + sources."got-11.5.2" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-cache-semantics-4.1.0" - sources."import-jsx-3.1.0" - sources."imurmurhash-0.1.4" + sources."http2-wrapper-1.0.0-beta.5.2" + sources."import-jsx-4.0.0" sources."indent-string-4.0.0" - (sources."ink-2.7.1" // { + sources."inflight-1.0.6" + sources."inherits-2.0.4" + (sources."ink-3.0.4" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.1.0" ]; }) - (sources."ink-text-input-3.3.0" // { + (sources."ink-text-input-4.0.0" // { dependencies = [ sources."ansi-styles-4.2.1" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.1.0" + sources."type-fest-0.15.1" ]; }) sources."is-arrayish-0.2.1" @@ -60720,13 +61835,12 @@ in sources."is-obj-2.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-1.1.0" - sources."is-typedarray-1.0.0" sources."is-wsl-2.2.0" 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-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."json5-2.1.3" @@ -60734,24 +61848,8 @@ in sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" - sources."lodash-4.17.19" - sources."lodash.debounce-4.0.8" + sources."lodash-4.17.20" sources."lodash.throttle-4.1.1" - (sources."log-update-3.4.0" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-regex-4.1.0" - sources."cli-cursor-2.1.0" - sources."emoji-regex-7.0.3" - sources."is-fullwidth-code-point-2.0.0" - sources."mimic-fn-1.2.0" - sources."onetime-2.0.1" - sources."restore-cursor-2.0.0" - sources."string-width-3.1.0" - sources."strip-ansi-5.2.0" - sources."wrap-ansi-5.1.0" - ]; - }) sources."loose-envify-1.4.0" sources."lowercase-keys-2.0.0" (sources."make-dir-3.1.0" // { @@ -60761,25 +61859,18 @@ in }) sources."map-age-cleaner-0.1.3" sources."map-obj-4.1.0" - (sources."mem-6.1.0" // { - dependencies = [ - sources."mimic-fn-3.1.0" - ]; - }) - (sources."meow-6.1.1" // { + sources."mem-6.1.0" + (sources."meow-7.1.0" // { dependencies = [ sources."type-fest-0.13.1" ]; }) - sources."mimic-fn-2.1.0" - sources."mimic-response-2.1.0" + 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" - (sources."minimist-options-4.1.0" // { - dependencies = [ - sources."arrify-1.0.1" - ]; - }) + sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nice-try-1.0.5" sources."normalize-package-data-2.5.0" @@ -60787,25 +61878,38 @@ in sources."npm-run-path-2.0.2" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.1" + (sources."onetime-5.1.2" // { + dependencies = [ + sources."mimic-fn-2.1.0" + ]; + }) sources."p-cancelable-2.0.0" sources."p-defer-1.0.0" - sources."p-event-4.2.0" sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" - sources."p-timeout-3.2.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" + sources."patch-console-1.0.0" sources."path-exists-3.0.0" + sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."path-parse-1.0.6" + (sources."pkg-dir-4.2.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + ]; + }) sources."pkg-up-3.1.0" sources."prop-types-15.7.2" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."quick-lru-4.0.1" + sources."quick-lru-5.1.1" sources."react-16.13.1" + sources."react-devtools-core-4.8.2" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -60824,14 +61928,17 @@ in }) sources."redent-3.0.0" sources."resolve-1.17.0" + sources."resolve-alpn-1.0.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" sources."scheduler-0.18.0" sources."semver-5.7.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" + sources."shell-quote-1.7.2" sources."signal-exit-3.0.3" sources."skin-tone-1.0.0" (sources."slice-ansi-3.0.0" // { @@ -60846,6 +61953,11 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.5" + (sources."stack-utils-2.0.2" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) (sources."string-length-3.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -60859,10 +61971,8 @@ in sources."strip-indent-3.0.0" sources."supports-color-5.5.0" sources."to-fast-properties-2.0.0" - sources."to-readable-stream-2.1.0" sources."trim-newlines-3.0.0" - sources."type-fest-0.10.0" - sources."typedarray-to-buffer-3.1.5" + sources."type-fest-0.12.0" sources."unicode-emoji-modifier-base-1.0.0" sources."uri-js-4.2.2" sources."validate-npm-package-license-3.0.4" @@ -60876,7 +61986,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" + sources."ws-7.3.1" sources."yargs-parser-18.1.3" sources."yoga-layout-prebuilt-1.9.6" ]; @@ -60928,10 +62038,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.6.0"; + version = "7.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.6.0.tgz"; - sha512 = "QlAManNtqr7sozWm5TF4wIH9gmUm2hE3vNRUvyoYAa4y1l5/jxD/PQStEjBMQtCqZmSep8UxrcecI60hOpe61w=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.7.0.tgz"; + sha512 = "1KUxLzos0ZVsyL81PnRN335nDtQ8/vZUD6uMtWbF+5zDtjKcsklIi78XoE0MVL93QvWTu+E5y44VyyCsOMBrIg=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -60944,7 +62054,7 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -60975,11 +62085,11 @@ in sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.0" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -61011,7 +62121,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -61082,7 +62192,7 @@ in sources."@types/color-name-1.1.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -61111,15 +62221,15 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.6.0" + sources."eslint-7.7.0" sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.0" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -61151,7 +62261,7 @@ in sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-without-jsonify-1.0.1" sources."levn-0.4.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -61213,7 +62323,7 @@ in sha1 = "81f5f98043cc2517053f96ba5d61ef5db430c010"; }; dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -61222,7 +62332,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" @@ -61410,7 +62520,7 @@ in sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."aggregate-error-3.0.1" + sources."aggregate-error-3.1.0" sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" @@ -61447,7 +62557,7 @@ in sources."ps-list-7.2.0" ]; }) - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."hard-rejection-2.1.0" sources."has-flag-4.0.0" sources."hosted-git-info-2.8.8" @@ -61459,16 +62569,9 @@ in sources."chalk-4.1.0" ]; }) - (sources."inquirer-autocomplete-prompt-1.0.2" // { + (sources."inquirer-autocomplete-prompt-1.1.0" // { dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."figures-2.0.0" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" + sources."chalk-4.1.0" ]; }) sources."is-arrayish-0.2.1" @@ -61477,11 +62580,11 @@ in sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."js-tokens-4.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lru-cache-4.1.5" sources."map-obj-4.1.0" (sources."meow-6.1.1" // { @@ -61502,13 +62605,13 @@ in sources."npm-run-path-4.0.1" sources."num-sort-2.1.0" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."os-tmpdir-1.0.2" sources."p-finally-2.0.1" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" @@ -61591,10 +62694,10 @@ in forever = nodeEnv.buildNodePackage { name = "forever"; packageName = "forever"; - version = "3.0.0"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/forever/-/forever-3.0.0.tgz"; - sha512 = "jA3zD1pl57cwBlhF6V6lZIOk6//77nQyQ3UGkxxYr4X9+F8nI6SGGan69hdohtmsPZCG3vMlqdtBhwlqEn4thA=="; + url = "https://registry.npmjs.org/forever/-/forever-3.0.2.tgz"; + sha512 = "GKZLVs3RQh52kF3kuCrlR1e5npaOqomQzTQryZOFJZ9GKNqLya75LSn1rdjFQ8XixwX3jT76pIJmtGN4XXv1aw=="; }; dependencies = [ sources."ansi-regex-2.1.1" @@ -61631,7 +62734,6 @@ in sources."async-0.2.9" sources."cliff-0.1.9" sources."nconf-0.6.9" - sources."optimist-0.6.0" sources."utile-0.2.1" sources."winston-0.8.0" ]; @@ -61680,7 +62782,7 @@ in sources."define-property-2.0.2" sources."defined-0.0.0" sources."director-1.2.7" - sources."duplexer-0.1.1" + sources."duplexer-0.1.2" sources."es-abstract-1.17.6" sources."es-to-primitive-1.2.1" sources."event-stream-3.3.4" @@ -61720,11 +62822,7 @@ in sources."is-extendable-0.1.1" ]; }) - (sources."flatiron-0.4.3" // { - dependencies = [ - sources."optimist-0.6.0" - ]; - }) + sources."flatiron-0.4.3" sources."for-in-1.0.2" sources."forever-monitor-3.0.1" sources."fragment-cache-0.2.1" @@ -61823,7 +62921,7 @@ in sources."object.assign-4.1.0" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."optimist-0.6.1" + sources."optimist-0.6.0" sources."os-locale-1.4.0" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" @@ -62030,7 +63128,7 @@ in dependencies = [ sources."async-2.6.3" sources."debug-4.2.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.groupby-4.6.0" sources."microee-0.0.6" sources."minilog-3.1.0" @@ -62058,7 +63156,7 @@ in }; dependencies = [ sources."asyncmemo-1.0.0" - sources."chloride-2.2.14" + sources."chloride-2.3.0" sources."chloride-test-1.2.4" sources."commander-2.20.3" sources."debug-4.2.0" @@ -62084,7 +63182,7 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" sources."is-property-1.0.2" - sources."is-valid-domain-0.0.14" + sources."is-valid-domain-0.0.15" sources."json-buffer-2.0.11" sources."jsonpointer-4.1.0" sources."kvgraph-0.1.0" @@ -62106,8 +63204,7 @@ in sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" sources."muxrpc-6.5.0" - sources."nan-2.14.1" - sources."nearley-2.19.5" + sources."nearley-2.19.6" sources."node-gyp-build-4.2.3" sources."node-polyglot-1.0.0" sources."non-private-ip-1.4.4" @@ -62183,7 +63280,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.4.9" + sources."sodium-native-3.2.0" sources."split-buffer-1.0.0" sources."ssb-avatar-0.2.0" sources."ssb-caps-1.1.0" @@ -62255,10 +63352,10 @@ in gitmoji-cli = nodeEnv.buildNodePackage { name = "gitmoji-cli"; packageName = "gitmoji-cli"; - version = "3.2.6"; + version = "3.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.6.tgz"; - sha512 = "Mzb3SGlcrFSwVu4R8Y2sGxK+d7VP6CRC6rw3S4mOPbxfW3qNrOLYEPDJM7h1GNUjOL22JQHx1qsn8sRODqAygQ=="; + url = "https://registry.npmjs.org/gitmoji-cli/-/gitmoji-cli-3.2.10.tgz"; + sha512 = "IVwhdySPQyHTfImCGllphBqHZtDWGnphjZG4EhkKtJY98b69sbaRU8PRO+XEC0rutbb5Gf0oCHvM3QswtAVCeQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -62278,7 +63375,7 @@ in sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -62292,6 +63389,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.2.1" sources."arrify-1.0.1" + sources."atomically-1.3.2" (sources."boxen-4.2.0" // { dependencies = [ sources."chalk-3.0.0" @@ -62316,11 +63414,11 @@ in sources."clone-response-1.0.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."conf-6.2.4" + sources."conf-7.1.2" sources."configstore-5.0.1" sources."cross-spawn-7.0.3" sources."crypto-random-string-2.0.0" - sources."debounce-fn-3.0.1" + sources."debounce-fn-4.0.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { dependencies = [ @@ -62345,8 +63443,8 @@ in sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."find-up-3.0.0" - sources."fuse.js-3.6.1" - sources."get-stream-5.1.0" + sources."fuse.js-6.4.1" + sources."get-stream-5.2.0" sources."global-dirs-2.0.1" (sources."got-9.6.0" // { dependencies = [ @@ -62366,18 +63464,7 @@ in sources."indent-string-4.0.0" sources."ini-1.3.5" sources."inquirer-7.3.3" - (sources."inquirer-autocomplete-prompt-1.0.2" // { - dependencies = [ - sources."ansi-escapes-3.2.0" - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."figures-2.0.0" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."inquirer-autocomplete-prompt-1.1.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" sources."is-fullwidth-code-point-3.0.0" @@ -62393,35 +63480,34 @@ in sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-traverse-0.4.1" sources."json-schema-typed-7.0.3" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" sources."lines-and-columns-1.1.6" - sources."locate-path-3.0.0" - sources."lodash-4.17.19" - (sources."log-symbols-3.0.0" // { + (sources."locate-path-3.0.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" + sources."path-exists-3.0.0" ]; }) + sources."lodash-4.17.20" + sources."log-symbols-4.0.0" sources."lowercase-keys-1.0.1" - sources."make-dir-3.1.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."map-obj-4.1.0" - (sources."meow-6.1.1" // { + (sources."meow-7.1.0" // { dependencies = [ sources."type-fest-0.13.1" ]; }) sources."merge-stream-2.0.0" - sources."mimic-fn-2.1.0" + sources."mimic-fn-3.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimist-1.2.5" @@ -62436,20 +63522,24 @@ in sources."normalize-url-4.5.0" sources."npm-run-path-4.0.1" sources."once-1.4.0" - sources."onetime-5.1.1" - (sources."ora-4.0.5" // { + (sources."onetime-5.1.2" // { dependencies = [ - sources."chalk-3.0.0" + sources."mimic-fn-2.1.0" ]; }) + sources."ora-5.0.0" sources."os-tmpdir-1.0.2" sources."p-cancelable-1.1.0" sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."package-json-6.5.0" - sources."parse-json-5.0.1" - sources."path-exists-3.0.0" + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."parse-json-5.1.0" + sources."path-exists-4.0.0" sources."path-key-3.1.1" sources."path-parse-1.0.6" sources."pkg-up-3.1.0" @@ -62469,7 +63559,6 @@ in sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."p-locate-4.1.0" - sources."path-exists-4.0.0" sources."type-fest-0.8.1" ]; }) @@ -62482,8 +63571,12 @@ in sources."run-async-2.4.1" sources."rxjs-6.6.2" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" - sources."semver-diff-3.1.1" + sources."semver-7.3.2" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" @@ -62506,7 +63599,7 @@ in sources."type-fest-0.11.0" sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" - (sources."update-notifier-4.1.0" // { + (sources."update-notifier-4.1.1" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -62554,35 +63647,35 @@ in sources."supports-color-5.5.0" ]; }) - sources."@babel/runtime-7.11.1" + sources."@babel/runtime-7.11.2" sources."@graphql-cli/common-4.0.0" sources."@graphql-cli/init-4.0.0" - sources."@graphql-tools/delegate-6.0.16" - (sources."@graphql-tools/graphql-file-loader-6.0.16" // { + sources."@graphql-tools/delegate-6.1.0" + (sources."@graphql-tools/graphql-file-loader-6.1.0" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/import-6.0.16" // { + (sources."@graphql-tools/import-6.1.0" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - (sources."@graphql-tools/json-file-loader-6.0.16" // { + (sources."@graphql-tools/json-file-loader-6.1.0" // { dependencies = [ sources."fs-extra-9.0.1" ]; }) - sources."@graphql-tools/load-6.0.16" - sources."@graphql-tools/merge-6.0.16" - sources."@graphql-tools/schema-6.0.16" - (sources."@graphql-tools/url-loader-6.0.16" // { + sources."@graphql-tools/load-6.1.0" + sources."@graphql-tools/merge-6.1.0" + sources."@graphql-tools/schema-6.1.0" + (sources."@graphql-tools/url-loader-6.1.0" // { dependencies = [ sources."cross-fetch-3.0.5" ]; }) - sources."@graphql-tools/utils-6.0.16" - sources."@graphql-tools/wrap-6.0.16" + sources."@graphql-tools/utils-6.1.0" + sources."@graphql-tools/wrap-6.1.0" sources."@kwsites/exec-p-0.4.0" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" @@ -62590,10 +63683,10 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" - sources."aggregate-error-3.0.1" + sources."aggregate-error-3.1.0" sources."ajv-5.5.2" (sources."ansi-escapes-4.3.1" // { dependencies = [ @@ -62612,7 +63705,7 @@ in sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -62630,7 +63723,7 @@ in sources."braces-3.0.2" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -62701,7 +63794,7 @@ in sources."execa-1.0.0" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -62748,7 +63841,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."fast-deep-equal-3.1.3" sources."json-schema-traverse-0.4.1" ]; @@ -62789,8 +63882,10 @@ in sources."is-glob-4.0.1" sources."is-interactive-1.0.0" sources."is-map-2.0.1" + sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" sources."is-number-object-1.0.4" + sources."is-promise-4.0.0" sources."is-regex-1.1.1" sources."is-set-2.0.1" sources."is-stream-1.1.0" @@ -62809,7 +63904,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.3.1" sources."json-stringify-safe-5.0.1" @@ -62824,7 +63919,7 @@ in sources."leven-3.1.0" sources."lines-and-columns-1.1.6" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."log-symbols-3.0.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -62870,7 +63965,7 @@ in sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.1.3" - sources."oas-resolver-2.4.2" + sources."oas-resolver-2.4.3" sources."oas-schema-walker-1.1.5" sources."oas-validator-3.4.0" sources."oauth-sign-0.9.0" @@ -62879,7 +63974,7 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."open-7.0.4" sources."openapi-to-graphql-2.1.0" (sources."ora-4.0.4" // { @@ -62912,7 +64007,7 @@ in ]; }) sources."parent-module-1.0.1" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" (sources."pascal-case-3.1.1" // { dependencies = [ sources."tslib-1.13.0" @@ -62932,7 +64027,7 @@ in sources."punycode-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" - sources."reftools-1.1.4" + sources."reftools-1.1.5" sources."regenerator-runtime-0.13.7" sources."regexp.prototype.flags-1.3.0" sources."registry-auth-token-4.2.0" @@ -62965,7 +64060,11 @@ in sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."side-channel-1.0.2" + (sources."side-channel-1.0.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."signal-exit-3.0.3" sources."simple-git-2.5.0" sources."slash-3.0.0" @@ -62978,7 +64077,7 @@ in sources."strip-ansi-6.0.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" - sources."subscriptions-transport-ws-0.9.17" + sources."subscriptions-transport-ws-0.9.18" sources."supports-color-7.1.0" (sources."swagger2openapi-5.4.0" // { dependencies = [ @@ -62995,7 +64094,7 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."tough-cookie-2.5.0" - sources."tslib-2.0.0" + sources."tslib-2.0.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-1.2.0" @@ -63369,7 +64468,7 @@ in sources."here-0.0.2" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.toarray-4.4.0" sources."map-canvas-0.1.5" sources."marked-0.7.0" @@ -63399,7 +64498,7 @@ in sources."supports-color-7.1.0" ]; }) - sources."systeminformation-4.26.10" + sources."systeminformation-4.27.3" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -63560,7 +64659,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -63576,6 +64675,7 @@ in ]; }) sources."fancy-log-1.3.3" + sources."fast-levenshtein-1.1.4" sources."file-uri-to-path-1.0.0" (sources."fill-range-4.0.0" // { dependencies = [ @@ -63834,7 +64934,7 @@ in sources."type-1.2.0" sources."typedarray-0.0.6" sources."unc-path-regex-0.1.2" - sources."undertaker-1.2.1" + sources."undertaker-1.3.0" sources."undertaker-registry-1.0.1" sources."union-value-1.0.1" sources."unique-stream-2.3.1" @@ -63961,7 +65061,7 @@ in sources."expand-tilde-2.0.2" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -64267,7 +65367,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.2" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -64290,14 +65390,14 @@ in }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-3.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -64390,11 +65490,11 @@ in sources."corser-2.0.1" sources."debug-3.2.6" sources."ecstatic-3.3.2" - sources."eventemitter3-4.0.4" - sources."follow-redirects-1.12.1" + sources."eventemitter3-4.0.6" + sources."follow-redirects-1.13.0" sources."he-1.2.0" sources."http-proxy-1.18.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."mime-1.6.0" sources."minimist-1.2.5" sources."mkdirp-0.5.5" @@ -64591,7 +65691,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."jquery-3.5.1" - sources."jquery.terminal-2.17.6" + sources."jquery.terminal-2.18.2" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" @@ -64599,7 +65699,7 @@ in sources."once-1.4.0" sources."os-homedir-1.0.2" sources."path-is-absolute-1.0.1" - sources."prismjs-1.20.0" + sources."prismjs-1.21.0" sources."rimraf-2.7.1" sources."select-1.1.2" sources."tiny-emitter-2.1.0" @@ -64642,7 +65742,11 @@ in sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" - sources."ast-types-0.13.3" + (sources."ast-types-0.14.1" // { + dependencies = [ + sources."tslib-2.0.1" + ]; + }) sources."astral-regex-2.0.0" sources."asynckit-0.4.0" sources."balanced-match-1.0.0" @@ -64761,7 +65865,7 @@ in sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."mimic-fn-2.1.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."restore-cursor-3.1.0" ]; }) @@ -64781,7 +65885,7 @@ in ]; }) sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._baseassign-3.2.0" sources."lodash._basecopy-3.0.1" sources."lodash._bindcallback-3.0.1" @@ -64823,7 +65927,7 @@ in }) sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.1.0" + sources."open-7.2.0" sources."optionator-0.8.3" sources."os-name-3.1.0" sources."os-tmpdir-1.0.2" @@ -64869,7 +65973,7 @@ in ]; }) sources."source-map-0.6.1" - sources."split2-3.1.1" + sources."split2-3.2.2" sources."ssh-config-1.1.6" sources."statuses-1.5.0" (sources."stream-combiner2-1.1.1" // { @@ -64916,7 +66020,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."which-2.0.2" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" sources."word-wrap-1.2.3" (sources."wrap-ansi-6.2.0" // { dependencies = [ @@ -64952,7 +66056,7 @@ in sources."@types/color-name-1.1.1" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."amdefine-1.0.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -64966,7 +66070,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.5.0" @@ -65006,7 +66110,7 @@ in sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."ecc-jsbn-0.1.2" - sources."ejs-3.1.3" + sources."ejs-3.1.5" sources."emoji-regex-8.0.0" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" @@ -65127,7 +66231,7 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."optionator-0.8.3" sources."os-homedir-1.0.2" sources."os-locale-1.4.0" @@ -65169,7 +66273,7 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" - sources."prettier-2.0.5" + sources."prettier-2.1.1" sources."process-nextick-args-2.0.1" sources."promise-polyfill-6.1.0" sources."pseudomap-1.0.2" @@ -65253,7 +66357,7 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - (sources."verda-1.1.0" // { + (sources."verda-1.1.1" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-4.1.0" @@ -65261,6 +66365,7 @@ in sources."color-name-1.1.4" sources."has-flag-4.0.0" sources."supports-color-7.1.0" + sources."tslib-2.0.1" ]; }) sources."verror-1.10.0" @@ -65368,8 +66473,8 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."iterare-1.2.1" - sources."jaeger-client-3.18.0" - sources."lodash-4.17.19" + sources."jaeger-client-3.18.1" + sources."lodash-4.17.20" sources."long-2.4.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -65437,7 +66542,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" (sources."ansi-escape-sequences-4.1.0" // { dependencies = [ sources."array-back-3.1.0" @@ -65472,7 +66577,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.726.0" // { + (sources."aws-sdk-2.740.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -65480,7 +66585,7 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -65491,7 +66596,7 @@ in sources."base64-js-1.3.1" sources."base64-stream-1.0.0" sources."bcrypt-pbkdf-1.0.2" - (sources."bl-4.0.2" // { + (sources."bl-4.0.3" // { dependencies = [ sources."buffer-5.6.0" ]; @@ -65669,7 +66774,7 @@ in sources."fs-extra-4.0.3" ]; }) - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."font-awesome-filetypes-2.1.0" sources."for-each-property-0.0.4" sources."for-each-property-deep-0.0.3" @@ -65712,9 +66817,10 @@ in sources."html-minifier-3.5.21" (sources."htmlparser2-4.1.0" // { dependencies = [ + sources."dom-serializer-1.0.1" sources."domelementtype-2.0.1" sources."domhandler-3.0.0" - sources."domutils-2.1.0" + sources."domutils-2.2.0" sources."entities-2.0.3" ]; }) @@ -65793,7 +66899,7 @@ in sources."jmespath-0.15.0" sources."joplin-turndown-4.0.29" sources."joplin-turndown-plugin-gfm-1.0.12" - sources."jpeg-js-0.4.1" + sources."jpeg-js-0.4.2" sources."js-tokens-4.0.0" sources."jsbn-0.1.1" sources."jsdom-15.2.1" @@ -65817,7 +66923,7 @@ in sources."levn-0.3.0" sources."linkify-it-2.2.0" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash-es-4.17.15" sources."lodash.padend-4.6.1" sources."lodash.repeat-4.1.0" @@ -65868,7 +66974,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" (sources."mixin-deep-1.3.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -65897,7 +67003,7 @@ in sources."nextgen-events-1.3.0" sources."nice-try-1.0.5" sources."no-case-2.3.2" - sources."node-abi-2.18.0" + sources."node-abi-2.19.1" sources."node-bitmap-0.0.1" sources."node-emoji-1.10.0" sources."node-fetch-1.7.3" @@ -65972,7 +67078,7 @@ in sources."qs-6.5.2" sources."query-string-4.3.4" sources."querystring-0.2.0" - sources."querystringify-2.1.1" + sources."querystringify-2.2.0" sources."random-bytes-1.0.0" sources."rc-1.2.8" sources."read-chunk-2.1.0" @@ -66145,7 +67251,7 @@ in sources."q-0.9.7" ]; }) - sources."terminal-kit-1.42.0" + sources."terminal-kit-1.43.0" (sources."tkwidgets-0.5.26" // { dependencies = [ sources."is-fullwidth-code-point-2.0.0" @@ -66258,10 +67364,10 @@ in js-beautify = nodeEnv.buildNodePackage { name = "js-beautify"; packageName = "js-beautify"; - version = "1.11.0"; + version = "1.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.11.0.tgz"; - sha512 = "a26B+Cx7USQGSWnz9YxgJNMmML/QG2nqIaL7VVYPCXbqiKz8PN0waSNvroMtvAK6tY7g/wPdNWGEP+JTNIBr6A=="; + url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.13.0.tgz"; + sha512 = "/Tbp1OVzZjbwzwJQFIlYLm9eWQ+3aYbBXLSaqb1mEJzhcQAfrqMMQYtjb6io+U6KpD0ID4F+Id3/xcjH3l/sqA=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -66279,11 +67385,8 @@ in sources."lru-cache-4.1.5" sources."minimatch-3.0.4" sources."mkdirp-1.0.4" - sources."nopt-4.0.3" + sources."nopt-5.0.0" sources."once-1.4.0" - sources."os-homedir-1.0.2" - sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."path-is-absolute-1.0.1" sources."proto-list-1.2.4" sources."pseudomap-1.0.2" @@ -66334,7 +67437,7 @@ in sha512 = "SbY+i9ONuxSK35cgVHaI8O9senTE4CDYAmGSDJ5l3+sfe62Ff4gy96osy6OW84t4K4A8iGnMrlRrsSItSNp3RQ=="; }; dependencies = [ - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.4" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -66344,7 +67447,7 @@ in sources."js2xmlparser-4.0.1" sources."klaw-3.0.0" sources."linkify-it-2.2.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."markdown-it-10.0.0" sources."markdown-it-anchor-5.3.0" sources."marked-0.8.2" @@ -66401,7 +67504,7 @@ in sources."inflight-1.0.6" sources."inherits-2.0.4" sources."isarray-0.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -66489,7 +67592,7 @@ in sources."inherits-2.0.4" sources."isarray-1.0.0" sources."js-yaml-3.14.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.44.0" @@ -66532,7 +67635,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.4" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -66545,7 +67648,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."basic-auth-2.0.1" sources."bcrypt-pbkdf-1.0.2" sources."body-parser-1.19.0" @@ -66553,7 +67656,7 @@ in sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -66664,7 +67767,7 @@ in sources."keyv-3.1.0" sources."latest-version-5.1.0" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash-id-0.14.0" sources."lowdb-1.0.0" sources."lowercase-keys-1.0.1" @@ -66768,7 +67871,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."unique-string-2.0.0" sources."unpipe-1.0.0" - sources."update-notifier-4.1.0" + sources."update-notifier-4.1.1" sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" @@ -66856,7 +67959,7 @@ in sources."bytes-3.1.0" sources."callsite-1.0.0" sources."camelcase-5.3.1" - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -66895,13 +67998,13 @@ in sources."engine.io-parser-2.2.0" sources."ent-2.2.0" sources."escape-html-1.0.3" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.6" sources."extend-3.0.2" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" sources."find-up-4.1.0" sources."flatted-2.0.2" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."fs-extra-8.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -66926,7 +68029,7 @@ in sources."isbinaryfile-4.0.6" sources."jsonfile-4.0.0" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."log4js-6.3.0" // { dependencies = [ sources."debug-4.2.0" @@ -67138,7 +68241,7 @@ in sources."abab-1.0.4" sources."acorn-2.7.0" sources."acorn-globals-1.0.9" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."asn1-0.2.4" @@ -67146,7 +68249,7 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" @@ -67235,7 +68338,7 @@ in sources."lcid-1.0.0" sources."levn-0.3.0" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."log-symbols-2.2.0" sources."map-age-cleaner-0.1.3" (sources."mem-4.3.0" // { @@ -67521,18 +68624,18 @@ in ]; }) sources."@octokit/rest-16.43.2" - sources."@octokit/types-5.2.1" + sources."@octokit/types-5.4.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."agent-base-4.3.0" sources."agentkeepalive-3.5.2" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" @@ -67558,7 +68661,7 @@ in sources."atob-2.1.2" sources."atob-lite-2.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -67708,15 +68811,15 @@ in sources."detect-indent-5.0.0" sources."dezalgo-1.0.3" sources."dir-glob-2.2.2" - sources."dot-prop-4.2.0" - sources."duplexer-0.1.1" + sources."dot-prop-4.2.1" + sources."duplexer-0.1.2" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."emoji-regex-7.0.3" sources."encoding-0.1.13" sources."end-of-stream-1.4.4" sources."env-paths-2.2.0" - sources."envinfo-7.7.2" + sources."envinfo-7.7.3" sources."err-code-1.1.2" sources."error-ex-1.3.2" sources."es-abstract-1.17.6" @@ -67862,8 +68965,8 @@ in sources."trim-newlines-2.0.0" ]; }) - sources."git-up-4.0.1" - sources."git-url-parse-11.1.2" + sources."git-up-4.0.2" + sources."git-url-parse-11.1.3" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -67949,7 +69052,7 @@ in sources."is-plain-obj-1.1.0" sources."is-plain-object-2.0.4" sources."is-regex-1.1.1" - sources."is-ssh-1.3.1" + sources."is-ssh-1.3.2" sources."is-stream-1.1.0" sources."is-symbol-1.0.3" sources."is-text-path-1.0.1" @@ -67964,6 +69067,7 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -67978,7 +69082,7 @@ in ]; }) sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._reinterpolate-3.0.0" sources."lodash.clonedeep-4.5.0" sources."lodash.get-4.4.2" @@ -67996,14 +69100,12 @@ in sources."map-cache-0.2.2" sources."map-obj-4.1.0" sources."map-visit-1.0.0" - (sources."meow-7.0.1" // { + (sources."meow-7.1.0" // { dependencies = [ - sources."arrify-2.0.1" - sources."camelcase-6.0.0" sources."find-up-4.1.0" sources."locate-path-5.0.0" sources."p-locate-4.1.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" sources."path-exists-4.0.0" (sources."read-pkg-5.2.0" // { dependencies = [ @@ -68016,11 +69118,7 @@ in ]; }) sources."type-fest-0.13.1" - (sources."yargs-parser-18.1.3" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."yargs-parser-18.1.3" ]; }) sources."merge2-1.4.1" @@ -68123,8 +69221,8 @@ in sources."parallel-transform-1.2.0" sources."parse-github-repo-url-1.4.1" sources."parse-json-4.0.0" - sources."parse-path-4.0.1" - sources."parse-url-5.0.1" + sources."parse-path-4.0.2" + sources."parse-url-5.0.2" sources."pascalcase-0.1.1" sources."path-dirname-1.0.2" sources."path-exists-3.0.0" @@ -68143,7 +69241,7 @@ in sources."promise-retry-1.1.1" sources."promzard-0.3.0" sources."proto-list-1.2.4" - sources."protocols-1.4.7" + sources."protocols-1.4.8" sources."protoduck-5.0.1" sources."psl-1.8.0" sources."pump-3.0.0" @@ -68158,7 +69256,7 @@ in sources."quick-lru-4.0.1" sources."read-1.0.7" sources."read-cmd-shim-1.0.5" - sources."read-package-json-2.1.1" + sources."read-package-json-2.1.2" sources."read-package-tree-5.3.1" (sources."read-pkg-3.0.0" // { dependencies = [ @@ -68333,7 +69431,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.2" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -68367,7 +69465,7 @@ in sources."which-1.3.1" sources."which-module-2.0.0" sources."wide-align-1.1.3" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" sources."wordwrap-1.0.0" (sources."wrap-ansi-5.1.0" // { dependencies = [ @@ -68538,7 +69636,7 @@ in sources."define-property-2.0.2" sources."depd-2.0.0" sources."destroy-1.0.4" - sources."duplexer-0.1.1" + sources."duplexer-0.1.2" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."escape-html-1.0.3" @@ -68809,7 +69907,7 @@ in dependencies = [ sources."accepts-1.3.7" sources."after-0.8.2" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."anymatch-1.3.2" sources."argparse-1.0.10" sources."arr-diff-2.0.0" @@ -68826,7 +69924,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."backo2-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -69316,15 +70414,15 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - sources."@babel/core-7.11.1" - sources."@babel/generator-7.11.0" + sources."@babel/core-7.11.4" + sources."@babel/generator-7.11.4" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-compilation-targets-7.10.4" sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.10.4" + sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" @@ -69334,7 +70432,7 @@ in sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.11.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" @@ -69347,7 +70445,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.4" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" @@ -69412,7 +70510,7 @@ in sources."@babel/preset-env-7.11.0" sources."@babel/preset-modules-0.1.3" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.11.1" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" sources."@babel/traverse-7.11.0" sources."@babel/types-7.11.0" @@ -69437,7 +70535,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.5" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.5" @@ -69467,7 +70565,7 @@ in sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."amdefine-1.0.1" @@ -69481,7 +70579,7 @@ in sources."arr-union-3.1.0" sources."array-unique-0.3.2" sources."asn1-0.2.4" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -69500,7 +70598,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-core-7.0.0-bridge.0" sources."babel-eslint-10.0.3" sources."babel-helper-evaluate-path-0.5.0" @@ -69562,14 +70660,14 @@ in sources."big.js-5.2.2" sources."binary-extensions-2.1.0" sources."bindings-1.5.0" - (sources."bl-4.0.2" // { + (sources."bl-4.0.3" // { dependencies = [ sources."buffer-5.6.0" sources."readable-stream-3.6.0" ]; }) sources."bluebird-3.7.2" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -69599,7 +70697,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.13.0" + sources."browserslist-4.14.0" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -69614,7 +70712,7 @@ in sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001118" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -69626,7 +70724,7 @@ in sources."supports-color-7.1.0" ]; }) - (sources."chokidar-3.4.1" // { + (sources."chokidar-3.4.2" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -69736,7 +70834,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.520" + sources."electron-to-chromium-1.3.549" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -69948,6 +71046,7 @@ in sources."jsbn-0.1.1" sources."jsesc-2.5.2" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-0.0.1" @@ -69969,7 +71068,7 @@ in ]; }) sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.memoize-3.0.4" sources."loose-envify-1.4.0" sources."lru-cache-5.1.1" @@ -70072,8 +71171,8 @@ in sources."parallel-transform-1.2.0" sources."paredit.js-0.3.6" sources."parents-1.0.1" - sources."parse-asn1-5.1.5" - sources."parse-json-5.0.1" + sources."parse-asn1-5.1.6" + sources."parse-json-5.1.0" sources."parse-passwd-1.0.0" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" @@ -70191,7 +71290,7 @@ in }) sources."schema-utils-2.7.0" sources."semver-5.7.1" - sources."serialize-javascript-3.1.0" + sources."serialize-javascript-4.0.0" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { dependencies = [ @@ -70305,7 +71404,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.4" // { + (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ sources."schema-utils-1.0.0" sources."source-map-0.6.1" @@ -70494,14 +71593,14 @@ in }; dependencies = [ sources."@types/color-name-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-styles-4.2.1" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-3.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."chalk-4.1.0" @@ -70535,7 +71634,7 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."link-check-4.5.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.3" sources."marked-0.8.2" sources."mime-db-1.44.0" @@ -70598,7 +71697,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -70658,7 +71757,7 @@ in sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -70668,7 +71767,7 @@ in sources."exit-hook-1.1.1" (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -70700,7 +71799,7 @@ in sources."har-schema-2.0.0" (sources."har-validator-5.1.5" // { dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.4" ]; }) sources."has-ansi-2.0.0" @@ -70731,7 +71830,7 @@ in sources."jsonpointer-4.1.0" sources."jsprim-1.4.1" sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash._basecopy-3.0.1" sources."lodash._basetostring-3.0.1" sources."lodash._basevalues-3.0.0" @@ -70859,14 +71958,14 @@ in mathjax = nodeEnv.buildNodePackage { name = "mathjax"; packageName = "mathjax"; - version = "3.0.5"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mathjax/-/mathjax-3.0.5.tgz"; - sha512 = "9M7VulhltkD8sIebWutK/VfAD+m+6BIFqfpjDh9Pz/etoKUtjO6UMnOhUcDmNl6iApE8C9xrUmaMyNZkZAlrMw=="; + url = "https://registry.npmjs.org/mathjax/-/mathjax-3.1.0.tgz"; + sha512 = "W71QY6DBDAhKhsIRbqzB38VV6Mk1IVAx23IjNc00oAPa4jyoeDQOwMIBPnG5ATqOAYevrBrwaNbycERGoYBBhA=="; }; buildInputs = globalBuildInputs; meta = { - description = "Beautiful math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source code)."; + description = "Beautiful and accessible math in all browsers. MathJax is an open-source JavaScript display engine for LaTeX, MathML, and AsciiMath notation that works in all browsers. This package includes the packaged components (install mathjax-full to get the source "; homepage = "https://github.com/mathjax/MathJax#readme"; license = "Apache-2.0"; }; @@ -70911,750 +72010,33 @@ in bypassCache = true; reconstructLock = true; }; - meguca = nodeEnv.buildNodePackage { - name = "meguca"; - packageName = "meguca"; - version = "1.1.8"; - src = fetchurl { - url = "https://registry.npmjs.org/meguca/-/meguca-1.1.8.tgz"; - sha512 = "BrbjYMq6FeZYMKx9mw7aHGUtLCyGPX4kSoCqZiRBFw5ESTgJcmmr+DbLCC29k8hRpBVRqdq3OapSEbAGXZ6z/g=="; - }; - dependencies = [ - (sources."@gulp-sourcemaps/identity-map-1.0.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."source-map-0.6.1" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."@gulp-sourcemaps/map-sources-1.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."accord-0.28.0" // { - dependencies = [ - sources."glob-7.1.6" - sources."minimatch-3.0.4" - sources."semver-5.7.1" - sources."uglify-js-2.8.29" - ]; - }) - sources."acorn-5.7.4" - sources."ajv-4.11.8" - (sources."align-text-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."almond-0.3.3" - sources."ansi-colors-1.1.0" - sources."ansi-cyan-0.1.1" - sources."ansi-gray-0.1.1" - sources."ansi-red-0.1.1" - sources."ansi-regex-2.1.1" - sources."ansi-styles-2.2.1" - sources."ansi-wrap-0.1.0" - sources."append-buffer-1.0.2" - sources."archy-1.0.0" - sources."arr-diff-4.0.0" - sources."arr-flatten-1.1.0" - sources."arr-union-3.1.0" - sources."array-differ-1.0.0" - sources."array-each-1.0.1" - sources."array-slice-1.1.0" - sources."array-uniq-1.0.3" - sources."array-unique-0.3.2" - sources."asap-2.0.6" - sources."asn1-0.2.4" - sources."assert-plus-0.2.0" - sources."assign-symbols-1.0.0" - sources."asynckit-0.4.0" - sources."atob-2.1.2" - sources."aws-sign2-0.6.0" - sources."aws4-1.10.0" - sources."balanced-match-1.0.0" - (sources."base-0.11.2" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - sources."bcrypt-pbkdf-1.0.2" - sources."beeper-1.1.1" - sources."boom-2.10.1" - sources."brace-expansion-1.1.11" - (sources."braces-2.3.2" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."buffer-equal-1.0.0" - sources."cache-base-1.0.1" - sources."camelcase-1.2.1" - sources."caseless-0.12.0" - sources."center-align-0.1.3" - sources."chalk-1.1.3" - (sources."class-utils-0.3.6" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."clean-css-4.2.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."cliui-2.1.0" - sources."clone-1.0.4" - sources."clone-buffer-1.0.0" - sources."clone-stats-0.0.1" - (sources."cloneable-readable-1.1.3" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."co-4.6.0" - sources."collection-visit-1.0.0" - sources."color-support-1.1.3" - sources."combined-stream-1.0.8" - sources."component-emitter-1.3.0" - sources."concat-map-0.0.1" - sources."convert-source-map-1.7.0" - sources."copy-descriptor-0.1.1" - sources."core-util-is-1.0.2" - sources."cryptiles-2.0.5" - (sources."css-2.2.4" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."d-1.0.1" - (sources."dashdash-1.14.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."dateformat-2.2.0" - sources."debug-2.6.9" - (sources."debug-fabulous-1.1.0" // { - dependencies = [ - sources."debug-3.2.6" - sources."ms-2.1.2" - ]; - }) - sources."decamelize-1.2.0" - sources."decode-uri-component-0.2.0" - sources."defaults-1.0.3" - sources."define-properties-1.1.3" - sources."define-property-2.0.2" - sources."delayed-stream-1.0.0" - sources."deprecated-0.0.1" - sources."detect-file-1.0.0" - sources."detect-newline-2.1.0" - (sources."duplexer2-0.0.2" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.1.14" - ]; - }) - (sources."duplexify-3.7.1" // { - dependencies = [ - sources."end-of-stream-1.4.4" - sources."once-1.4.0" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."ecc-jsbn-0.1.2" - sources."end-of-stream-0.1.5" - sources."errno-0.1.7" - (sources."es5-ext-0.10.53" // { - dependencies = [ - sources."next-tick-1.0.0" - ]; - }) - sources."es6-iterator-2.0.3" - sources."es6-symbol-3.1.3" - sources."es6-weak-map-2.0.3" - sources."escape-string-regexp-1.0.5" - sources."event-emitter-0.3.5" - (sources."expand-brackets-2.1.4" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."expand-tilde-2.0.2" - (sources."ext-1.4.0" // { - dependencies = [ - sources."type-2.0.0" - ]; - }) - sources."extend-3.0.2" - (sources."extend-shallow-3.0.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - (sources."extglob-2.0.4" // { - dependencies = [ - sources."define-property-1.0.0" - sources."extend-shallow-2.0.1" - ]; - }) - sources."extsprintf-1.3.0" - sources."fancy-log-1.3.3" - (sources."fill-range-4.0.0" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."find-index-0.1.1" - sources."findup-sync-2.0.0" - sources."fined-1.2.0" - sources."first-chunk-stream-1.0.0" - sources."flagged-respawn-1.0.1" - (sources."flush-write-stream-1.1.1" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."for-in-1.0.2" - sources."for-own-1.0.0" - sources."forever-agent-0.6.1" - sources."form-data-2.1.4" - sources."fragment-cache-0.2.1" - (sources."fs-mkdirp-stream-1.0.0" // { - dependencies = [ - sources."graceful-fs-4.2.4" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - sources."fs.realpath-1.0.0" - sources."function-bind-1.1.1" - sources."gaze-0.5.2" - sources."get-value-2.0.6" - (sources."getpass-0.1.7" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."glob-4.5.3" - sources."glob-parent-3.1.0" - sources."glob-stream-3.1.18" - sources."glob-watcher-0.0.6" - sources."glob2base-0.0.12" - sources."global-modules-1.0.0" - sources."global-prefix-1.0.2" - (sources."globule-0.1.0" // { - dependencies = [ - sources."glob-3.1.21" - sources."graceful-fs-1.2.3" - sources."inherits-1.0.2" - sources."minimatch-0.2.14" - ]; - }) - sources."glogg-1.0.2" - sources."graceful-fs-3.0.12" - sources."gulp-3.9.1" - (sources."gulp-clean-css-3.10.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.3" - ]; - }) - (sources."gulp-less-3.5.0" // { - dependencies = [ - sources."arr-diff-1.1.0" - sources."arr-union-2.1.0" - sources."array-slice-0.2.3" - sources."extend-shallow-1.1.4" - sources."kind-of-1.1.0" - sources."plugin-error-0.1.2" - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."gulp-sourcemaps-2.6.5" // { - dependencies = [ - sources."graceful-fs-4.2.4" - sources."readable-stream-2.3.7" - sources."source-map-0.6.1" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."gulp-typescript-4.0.2" // { - dependencies = [ - sources."arr-diff-1.1.0" - sources."arr-union-2.1.0" - sources."array-slice-0.2.3" - sources."clone-2.1.2" - sources."clone-stats-1.0.0" - sources."extend-shallow-1.1.4" - sources."glob-7.1.6" - sources."glob-stream-6.1.0" - sources."graceful-fs-4.2.4" - sources."kind-of-1.1.0" - sources."minimatch-3.0.4" - sources."ordered-read-streams-1.0.1" - sources."plugin-error-0.1.2" - sources."readable-stream-2.3.7" - sources."source-map-0.6.1" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - sources."unique-stream-2.3.1" - sources."vinyl-2.2.0" - sources."vinyl-fs-3.0.3" - ]; - }) - (sources."gulp-uglify-3.0.2" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - (sources."gulp-util-3.0.8" // { - dependencies = [ - sources."object-assign-3.0.0" - sources."readable-stream-2.3.7" - sources."replace-ext-0.0.1" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - sources."vinyl-0.5.3" - ]; - }) - sources."gulplog-1.0.0" - sources."har-schema-1.0.5" - sources."har-validator-4.2.1" - sources."has-ansi-2.0.0" - sources."has-gulplog-0.1.0" - sources."has-symbols-1.0.1" - sources."has-value-1.0.0" - (sources."has-values-1.0.0" // { - dependencies = [ - sources."kind-of-4.0.0" - ]; - }) - sources."hawk-3.1.3" - sources."hoek-2.16.3" - sources."homedir-polyfill-1.0.3" - sources."http-signature-1.1.1" - sources."image-size-0.5.5" - sources."indx-0.2.3" - sources."inflight-1.0.6" - sources."inherits-2.0.4" - sources."ini-1.3.5" - sources."interpret-1.4.0" - sources."is-absolute-1.0.0" - sources."is-accessor-descriptor-1.0.0" - sources."is-buffer-1.1.6" - sources."is-data-descriptor-1.0.0" - sources."is-descriptor-1.0.2" - sources."is-extendable-0.1.1" - sources."is-extglob-2.1.1" - sources."is-glob-3.1.0" - sources."is-negated-glob-1.0.0" - (sources."is-number-3.0.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-plain-object-2.0.4" - sources."is-promise-2.2.2" - sources."is-relative-1.0.0" - sources."is-typedarray-1.0.0" - sources."is-unc-path-1.0.0" - sources."is-utf8-0.2.1" - sources."is-valid-glob-1.0.0" - sources."is-windows-1.0.2" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."isobject-3.0.1" - sources."isstream-0.1.2" - sources."jsbn-0.1.1" - sources."json-schema-0.2.3" - sources."json-stable-stringify-1.0.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json-stringify-safe-5.0.1" - sources."jsonify-0.0.0" - (sources."jsprim-1.4.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - sources."kind-of-6.0.3" - sources."lazy-cache-1.0.4" - (sources."lazystream-1.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - ]; - }) - sources."lead-1.0.0" - (sources."less-2.7.3" // { - dependencies = [ - sources."graceful-fs-4.2.4" - ]; - }) - sources."liftoff-2.5.0" - sources."lodash-1.0.2" - sources."lodash._basecopy-3.0.1" - sources."lodash._basetostring-3.0.1" - sources."lodash._basevalues-3.0.0" - sources."lodash._getnative-3.9.1" - sources."lodash._isiterateecall-3.0.9" - sources."lodash._reescape-3.0.0" - sources."lodash._reevaluate-3.0.0" - sources."lodash._reinterpolate-3.0.0" - sources."lodash._root-3.0.1" - sources."lodash.clone-4.5.0" - sources."lodash.defaults-4.2.0" - sources."lodash.escape-3.2.0" - sources."lodash.flatten-4.4.0" - sources."lodash.isarguments-3.1.0" - sources."lodash.isarray-3.0.4" - sources."lodash.keys-3.1.2" - sources."lodash.merge-4.6.2" - sources."lodash.partialright-4.2.1" - sources."lodash.pick-4.4.0" - sources."lodash.restparam-3.6.1" - sources."lodash.template-3.6.2" - sources."lodash.templatesettings-3.1.1" - sources."lodash.uniq-4.5.0" - sources."longest-1.0.1" - sources."lru-cache-2.7.3" - sources."lru-queue-0.1.0" - sources."make-error-1.3.6" - sources."make-error-cause-1.2.2" - sources."make-iterator-1.0.1" - sources."map-cache-0.2.2" - sources."map-visit-1.0.0" - sources."memoizee-0.4.14" - sources."micromatch-3.1.10" - sources."mime-1.6.0" - sources."mime-db-1.44.0" - sources."mime-types-2.1.27" - sources."minimatch-2.0.10" - sources."minimist-1.2.5" - (sources."mixin-deep-1.3.2" // { - dependencies = [ - sources."is-extendable-1.0.1" - ]; - }) - sources."mkdirp-0.5.5" - sources."ms-2.0.0" - sources."multipipe-0.1.2" - sources."nanomatch-1.2.13" - sources."natives-1.1.6" - sources."next-tick-1.1.0" - sources."normalize-path-2.1.1" - sources."now-and-later-2.0.1" - sources."oauth-sign-0.8.2" - sources."object-assign-4.1.1" - (sources."object-copy-0.1.0" // { - dependencies = [ - sources."define-property-0.2.5" - sources."is-accessor-descriptor-0.1.6" - sources."is-data-descriptor-0.1.4" - (sources."is-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-5.1.0" - ]; - }) - sources."kind-of-3.2.2" - ]; - }) - sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.0" - sources."object.defaults-1.1.0" - sources."object.map-1.0.1" - sources."object.pick-1.3.0" - sources."once-1.3.3" - sources."orchestrator-0.3.8" - sources."ordered-read-streams-0.1.0" - sources."os-homedir-1.0.2" - sources."parse-filepath-1.0.2" - sources."parse-node-version-1.0.1" - sources."parse-passwd-1.0.0" - sources."pascalcase-0.1.1" - sources."path-dirname-1.0.2" - sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" - sources."path-root-0.1.1" - sources."path-root-regex-0.1.2" - sources."performance-now-0.2.0" - sources."plugin-error-1.0.1" - sources."posix-character-classes-0.1.1" - sources."pretty-hrtime-1.0.3" - sources."process-nextick-args-2.0.1" - sources."promise-7.3.1" - sources."prr-1.0.1" - (sources."pump-2.0.1" // { - dependencies = [ - (sources."end-of-stream-1.4.4" // { - dependencies = [ - sources."once-1.4.0" - ]; - }) - ]; - }) - sources."pumpify-1.5.1" - sources."punycode-1.4.1" - sources."qs-6.4.0" - (sources."readable-stream-1.0.34" // { - dependencies = [ - sources."isarray-0.0.1" - ]; - }) - sources."rechoir-0.6.2" - sources."regex-not-1.0.2" - sources."remove-bom-buffer-3.0.0" - (sources."remove-bom-stream-1.2.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - sources."remove-trailing-separator-1.1.0" - sources."repeat-element-1.1.3" - sources."repeat-string-1.6.1" - sources."replace-ext-1.0.1" - sources."request-2.81.0" - sources."resolve-1.17.0" - sources."resolve-dir-1.0.1" - sources."resolve-options-1.1.0" - sources."resolve-url-0.2.1" - sources."ret-0.1.15" - sources."right-align-0.1.3" - sources."safe-buffer-5.1.2" - sources."safe-regex-1.1.0" - sources."safer-buffer-2.1.2" - sources."semver-4.3.6" - sources."sequencify-0.0.7" - (sources."set-value-2.0.1" // { - dependencies = [ - sources."extend-shallow-2.0.1" - ]; - }) - sources."sigmund-1.0.1" - (sources."snapdragon-0.8.2" // { - dependencies = [ - sources."define-property-0.2.5" - sources."extend-shallow-2.0.1" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - (sources."snapdragon-node-2.1.1" // { - dependencies = [ - sources."define-property-1.0.0" - ]; - }) - (sources."snapdragon-util-3.0.1" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."sntp-1.0.9" - sources."source-map-0.5.7" - sources."source-map-resolve-0.5.3" - sources."source-map-url-0.4.0" - sources."sparkles-1.0.1" - sources."split-string-3.1.0" - (sources."sshpk-1.16.1" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."static-extend-0.1.2" // { - dependencies = [ - sources."define-property-0.2.5" - (sources."is-accessor-descriptor-0.1.6" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - (sources."is-data-descriptor-0.1.4" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."is-descriptor-0.1.6" - sources."kind-of-5.1.0" - ]; - }) - sources."stream-consume-0.1.1" - sources."stream-shift-1.0.1" - sources."string_decoder-0.10.31" - sources."stringstream-0.0.6" - sources."strip-ansi-3.0.1" - sources."strip-bom-1.0.0" - sources."strip-bom-string-1.0.0" - sources."supports-color-2.0.0" - sources."through2-0.6.5" - (sources."through2-filter-3.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - sources."tildify-1.2.0" - sources."time-stamp-1.1.0" - sources."timers-ext-0.1.7" - sources."to-absolute-glob-2.0.2" - (sources."to-object-path-0.3.0" // { - dependencies = [ - sources."kind-of-3.2.2" - ]; - }) - sources."to-regex-3.0.2" - sources."to-regex-range-2.1.1" - (sources."to-through-2.0.0" // { - dependencies = [ - sources."readable-stream-2.3.7" - sources."string_decoder-1.1.1" - sources."through2-2.0.5" - ]; - }) - sources."tough-cookie-2.3.4" - sources."tunnel-agent-0.6.0" - sources."tweetnacl-0.14.5" - sources."type-1.2.0" - sources."typescript-3.9.7" - sources."uglify-js-3.10.1" - sources."uglify-to-browserify-1.0.2" - sources."unc-path-regex-0.1.2" - sources."union-value-1.0.1" - sources."unique-stream-1.0.0" - (sources."unset-value-1.0.0" // { - dependencies = [ - (sources."has-value-0.3.1" // { - dependencies = [ - sources."isobject-2.1.0" - ]; - }) - sources."has-values-0.1.4" - ]; - }) - sources."urix-0.1.0" - sources."use-3.1.1" - sources."user-home-1.1.1" - sources."util-deprecate-1.0.2" - sources."uuid-3.4.0" - sources."v8flags-2.1.1" - sources."value-or-function-3.0.0" - (sources."verror-1.10.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - ]; - }) - (sources."vinyl-0.4.6" // { - dependencies = [ - sources."clone-0.2.0" - ]; - }) - sources."vinyl-fs-0.3.14" - (sources."vinyl-sourcemap-1.1.0" // { - dependencies = [ - sources."clone-2.1.2" - sources."clone-stats-1.0.0" - sources."graceful-fs-4.2.4" - sources."vinyl-2.2.0" - ]; - }) - sources."vinyl-sourcemaps-apply-0.2.1" - sources."when-3.7.8" - sources."which-1.3.1" - sources."window-size-0.1.0" - sources."wordwrap-0.0.2" - sources."wrappy-1.0.2" - sources."xtend-4.0.2" - sources."yargs-3.10.0" - ]; - buildInputs = globalBuildInputs; - meta = { - description = "[](https://godoc.org/github.com/bakape/meguca) [](https://travis-ci.org/bakape/meguca)"; - homepage = "https://github.com/bakape/meguca#readme"; - license = "AGPL-3.0"; - }; - production = true; - bypassCache = true; - reconstructLock = true; - }; mirakurun = nodeEnv.buildNodePackage { name = "mirakurun"; packageName = "mirakurun"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.0.tgz"; - sha512 = "FL0S+TpQLy1qfaX3BISUp3AC4D8o392WpTWXqOAku6QDnPrB/NYK30dTxGXt3p6+SB9j8jnHEhRX12AuTREsdg=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.1.tgz"; + sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; }; dependencies = [ - sources."@fluentui/date-time-utilities-7.3.1" - sources."@fluentui/keyboard-key-0.2.8" - sources."@fluentui/react-7.124.2" - sources."@fluentui/react-focus-7.12.27" - sources."@fluentui/react-icons-0.1.42" - sources."@microsoft/load-themed-styles-1.10.65" + sources."@fluentui/date-time-utilities-7.6.0" + sources."@fluentui/keyboard-key-0.2.11" + sources."@fluentui/react-7.132.0" + sources."@fluentui/react-focus-7.13.3" + sources."@fluentui/react-icons-0.2.2" + sources."@fluentui/theme-0.1.2" + sources."@microsoft/load-themed-styles-1.10.79" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.7.41" - sources."@uifabric/icons-7.3.67" - sources."@uifabric/merge-styles-7.16.4" - sources."@uifabric/react-hooks-7.7.0" - sources."@uifabric/set-version-7.0.19" - sources."@uifabric/styling-7.14.7" - sources."@uifabric/utilities-7.25.0" + sources."@uifabric/foundation-7.8.3" + sources."@uifabric/icons-7.4.3" + sources."@uifabric/merge-styles-7.17.0" + sources."@uifabric/react-hooks-7.10.0" + sources."@uifabric/set-version-7.0.22" + sources."@uifabric/styling-7.15.3" + sources."@uifabric/utilities-7.30.0" sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-escapes-1.4.0" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -71678,7 +72060,7 @@ in sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -71716,7 +72098,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."etag-1.8.1" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.6" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" sources."express-openapi-6.0.0" @@ -71752,7 +72134,7 @@ in sources."json-schema-traverse-0.4.1" sources."keyv-3.1.0" sources."latest-version-5.1.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.merge-4.6.2" sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" @@ -71778,7 +72160,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.124.2" + sources."office-ui-fabric-react-7.132.0" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -71877,7 +72259,7 @@ in 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.31.1" + sources."swagger-ui-dist-3.32.4" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -71908,15 +72290,16 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.1.1"; + version = "8.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.1.1.tgz"; - sha512 = "p7FuGlYH8t7gaiodlFreseLxEmxTgvyG9RgPHODFPySNhwUehu8NIb0vdSt3WFckSneswZ0Un5typYcWElk7HQ=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.1.2.tgz"; + sha512 = "I8FRAcuACNMLQn3lS4qeWLxXqLvGf6r2CaLstDpZmMUUSmvW6Cnm1AuHxgbc7ctZVRcfwspCRbDHymPsi3dkJw=="; }; dependencies = [ + sources."@types/color-name-1.1.1" sources."ansi-colors-4.1.1" sources."ansi-regex-3.0.0" - sources."ansi-styles-3.2.1" + sources."ansi-styles-4.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" sources."array.prototype.map-1.0.2" @@ -71926,12 +72309,8 @@ in sources."braces-3.0.2" sources."browser-stdout-1.3.1" sources."camelcase-5.3.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."chokidar-3.3.1" + sources."chalk-4.1.0" + sources."chokidar-3.4.2" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -71939,10 +72318,10 @@ in sources."strip-ansi-5.2.0" ]; }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."concat-map-0.0.1" - sources."debug-3.2.6" + sources."debug-4.1.1" sources."decamelize-1.2.0" sources."define-properties-1.1.3" sources."diff-4.0.2" @@ -71951,10 +72330,10 @@ in sources."es-array-method-boxes-properly-1.0.0" sources."es-get-iterator-1.1.0" sources."es-to-primitive-1.2.1" - sources."escape-string-regexp-1.0.5" + sources."escape-string-regexp-4.0.0" sources."esprima-4.0.1" sources."fill-range-7.0.1" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."flat-4.1.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" @@ -71964,7 +72343,7 @@ in sources."glob-parent-5.1.1" sources."growl-1.10.5" sources."has-1.0.3" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbols-1.0.1" sources."he-1.2.0" sources."inflight-1.0.6" @@ -71988,9 +72367,9 @@ in sources."isexe-2.0.0" sources."iterate-iterator-1.0.1" sources."iterate-value-1.0.2" - sources."js-yaml-3.13.1" - sources."locate-path-5.0.0" - sources."log-symbols-3.0.0" + sources."js-yaml-3.14.0" + sources."locate-path-6.0.0" + sources."log-symbols-4.0.0" sources."minimatch-3.0.4" sources."ms-2.1.2" sources."normalize-path-3.0.0" @@ -71998,15 +72377,15 @@ in sources."object-keys-1.1.1" sources."object.assign-4.1.0" sources."once-1.4.0" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.0.2" + sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."picomatch-2.2.2" sources."promise.allsettled-1.0.2" sources."randombytes-2.1.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."safe-buffer-5.2.1" @@ -72018,11 +72397,7 @@ in sources."string.prototype.trimstart-1.0.1" sources."strip-ansi-4.0.0" sources."strip-json-comments-3.0.1" - (sources."supports-color-7.1.0" // { - dependencies = [ - sources."has-flag-4.0.0" - ]; - }) + sources."supports-color-7.1.0" sources."to-regex-range-5.0.1" sources."which-2.0.2" sources."which-module-2.0.0" @@ -72031,6 +72406,9 @@ in (sources."wrap-ansi-5.1.0" // { dependencies = [ sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" sources."string-width-3.1.0" sources."strip-ansi-5.2.0" ]; @@ -72042,6 +72420,7 @@ in sources."ansi-regex-4.1.0" sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" sources."string-width-3.1.0" @@ -72054,6 +72433,7 @@ in sources."ansi-regex-4.1.0" sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" sources."string-width-3.1.0" @@ -72104,7 +72484,7 @@ in sources."commander-4.1.1" ]; }) - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."methods-1.1.2" sources."mime-1.6.0" sources."mime-db-1.44.0" @@ -72162,7 +72542,7 @@ in sources."is-stream-1.1.0" sources."isarray-1.0.0" sources."kuler-1.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.defaults-4.2.0" sources."lodash.omit-4.5.0" sources."logform-2.2.0" @@ -72197,6 +72577,1566 @@ in bypassCache = true; reconstructLock = true; }; + netlify-cli = nodeEnv.buildNodePackage { + name = "netlify-cli"; + packageName = "netlify-cli"; + version = "2.59.1"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.59.1.tgz"; + sha512 = "HoqWho35I89wkJToOjMkcyfs3vXaeRG8/IDaKCXlVWfxLa4X4tEcN+YA/Xt6fHmiRTL8dvZttTO+rwlru7JaBQ=="; + }; + dependencies = [ + sources."@analytics/cookie-utils-0.2.3" + sources."@analytics/core-0.6.2" + sources."@analytics/storage-utils-0.2.4" + sources."@babel/code-frame-7.10.4" + sources."@babel/helper-validator-identifier-7.10.4" + sources."@babel/highlight-7.10.4" + sources."@babel/parser-7.11.4" + sources."@bugsnag/browser-7.3.3" + sources."@bugsnag/core-7.3.3" + sources."@bugsnag/cuid-3.0.0" + sources."@bugsnag/js-7.3.3" + sources."@bugsnag/node-7.3.3" + sources."@bugsnag/safe-json-stringify-6.0.0" + sources."@dabh/diagnostics-2.0.2" + sources."@jest/types-24.9.0" + sources."@mrmlnc/readdir-enhanced-2.2.1" + (sources."@netlify/build-3.3.2" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."execa-3.4.0" + sources."find-up-4.1.0" + sources."read-pkg-up-7.0.1" + sources."resolve-2.0.0-next.1" + sources."uuid-8.3.0" + ]; + }) + sources."@netlify/cache-utils-1.0.1" + (sources."@netlify/config-2.1.2" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."execa-3.4.0" + sources."find-up-4.1.0" + ]; + }) + sources."@netlify/functions-utils-1.2.8" + (sources."@netlify/git-utils-1.0.1" // { + dependencies = [ + sources."braces-3.0.2" + sources."execa-3.4.0" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."to-regex-range-5.0.1" + ]; + }) + sources."@netlify/open-api-0.16.0" + (sources."@netlify/run-utils-1.0.0" // { + dependencies = [ + sources."execa-3.4.0" + ]; + }) + (sources."@netlify/zip-it-and-ship-it-1.3.11" // { + dependencies = [ + sources."find-up-4.1.0" + sources."resolve-2.0.0-next.1" + ]; + }) + (sources."@nodelib/fs.scandir-2.1.3" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + ]; + }) + sources."@nodelib/fs.stat-1.1.3" + sources."@nodelib/fs.walk-1.2.4" + (sources."@oclif/color-0.1.2" // { + dependencies = [ + (sources."chalk-3.0.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."supports-color-7.1.0" + ]; + }) + sources."has-flag-3.0.0" + sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" + sources."tslib-1.13.0" + ]; + }) + (sources."@oclif/command-1.8.0" // { + dependencies = [ + sources."@oclif/plugin-help-3.2.0" + sources."ansi-regex-3.0.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."wrap-ansi-4.0.0" + ]; + }) + (sources."@oclif/config-1.17.0" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.4" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."globby-11.0.1" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + (sources."@oclif/errors-1.3.3" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."clean-stack-3.0.0" + sources."fs-extra-9.0.1" + sources."wrap-ansi-7.0.0" + ]; + }) + sources."@oclif/linewrap-1.0.0" + (sources."@oclif/parser-3.8.5" // { + dependencies = [ + sources."tslib-1.13.0" + ]; + }) + (sources."@oclif/plugin-help-2.2.3" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + (sources."widest-line-2.0.1" // { + dependencies = [ + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + (sources."wrap-ansi-4.0.0" // { + dependencies = [ + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + ]; + }) + ]; + }) + (sources."@oclif/plugin-not-found-1.2.4" // { + dependencies = [ + sources."cli-ux-4.9.3" + sources."fs-extra-7.0.1" + sources."has-flag-3.0.0" + sources."indent-string-3.2.0" + sources."is-wsl-1.1.0" + sources."jsonfile-4.0.0" + sources."semver-5.7.1" + sources."strip-ansi-5.2.0" + sources."supports-color-5.5.0" + sources."tslib-1.13.0" + sources."universalify-0.1.2" + ]; + }) + (sources."@oclif/plugin-plugins-1.9.0" // { + dependencies = [ + sources."fs-extra-7.0.1" + sources."jsonfile-4.0.0" + sources."npm-run-path-3.1.0" + sources."universalify-0.1.2" + ]; + }) + sources."@oclif/screen-1.0.4" + sources."@octokit/auth-token-2.4.2" + (sources."@octokit/endpoint-6.0.5" // { + dependencies = [ + sources."is-plain-object-4.1.1" + sources."universal-user-agent-6.0.0" + ]; + }) + (sources."@octokit/plugin-paginate-rest-1.1.2" // { + dependencies = [ + sources."@octokit/types-2.16.2" + ]; + }) + sources."@octokit/plugin-request-log-1.0.0" + (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { + dependencies = [ + sources."@octokit/types-2.16.2" + ]; + }) + (sources."@octokit/request-5.4.7" // { + dependencies = [ + sources."@octokit/request-error-2.0.2" + sources."is-plain-object-4.1.1" + sources."universal-user-agent-6.0.0" + ]; + }) + (sources."@octokit/request-error-1.2.1" // { + dependencies = [ + sources."@octokit/types-2.16.2" + ]; + }) + sources."@octokit/rest-16.43.2" + sources."@octokit/types-5.4.1" + sources."@sindresorhus/is-0.14.0" + sources."@sindresorhus/slugify-1.1.0" + (sources."@sindresorhus/transliterate-0.1.1" // { + dependencies = [ + sources."escape-string-regexp-2.0.0" + ]; + }) + sources."@szmarczak/http-timer-1.1.2" + sources."@types/color-name-1.1.1" + sources."@types/decompress-4.2.3" + sources."@types/download-6.2.4" + sources."@types/glob-7.1.3" + sources."@types/got-8.3.5" + sources."@types/http-proxy-1.17.4" + sources."@types/istanbul-lib-coverage-2.0.3" + sources."@types/istanbul-lib-report-3.0.0" + sources."@types/istanbul-reports-1.1.2" + sources."@types/minimatch-3.0.3" + sources."@types/mkdirp-0.5.2" + sources."@types/node-14.6.0" + sources."@types/node-fetch-2.5.7" + sources."@types/normalize-package-data-2.4.0" + sources."@types/semver-5.5.0" + sources."@types/yargs-13.0.10" + sources."@types/yargs-parser-15.0.0" + sources."@typescript-eslint/typescript-estree-2.34.0" + sources."accepts-1.3.7" + sources."aggregate-error-3.1.0" + sources."analytics-0.5.5" + sources."analytics-utils-0.2.2" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."emoji-regex-7.0.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-3.1.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."ansi-escapes-3.2.0" + sources."ansi-regex-4.1.0" + (sources."ansi-styles-3.2.1" // { + dependencies = [ + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) + sources."ansicolors-0.3.2" + sources."anymatch-3.1.1" + (sources."archive-type-4.0.0" // { + dependencies = [ + sources."file-type-4.4.0" + ]; + }) + sources."archiver-4.0.2" + (sources."archiver-utils-2.1.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."argparse-1.0.10" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-flat-polyfill-1.0.1" + sources."array-flatten-1.1.1" + sources."array-union-1.0.2" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."arrify-2.0.1" + sources."ascii-table-0.0.9" + sources."assign-symbols-1.0.0" + sources."ast-module-types-2.6.0" + sources."async-3.2.0" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + sources."atob-lite-2.0.0" + (sources."aws-sdk-2.740.0" // { + dependencies = [ + sources."buffer-4.9.2" + sources."uuid-3.3.2" + ]; + }) + sources."backoff-2.5.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."before-after-hook-2.1.0" + sources."binary-extensions-2.1.0" + sources."bl-4.0.3" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."raw-body-2.4.0" + ]; + }) + (sources."boxen-4.2.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + ]; + }) + sources."brace-expansion-1.1.11" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."btoa-lite-1.0.0" + sources."buffer-5.6.0" + sources."buffer-alloc-1.2.0" + sources."buffer-alloc-unsafe-1.1.0" + sources."buffer-crc32-0.2.13" + sources."buffer-fill-1.0.0" + sources."builtins-1.0.3" + sources."byline-5.0.0" + sources."bytes-3.1.0" + sources."cache-base-1.0.1" + (sources."cacheable-request-6.1.0" // { + dependencies = [ + sources."lowercase-keys-2.0.0" + ]; + }) + sources."cachedir-2.3.0" + sources."call-me-maybe-1.0.1" + sources."camelcase-5.3.1" + sources."cardinal-2.1.1" + sources."caw-2.0.1" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."chardet-0.7.0" + (sources."chokidar-3.4.2" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."is-number-7.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."ci-info-2.0.0" + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."clean-deep-3.4.0" + sources."clean-stack-2.2.0" + sources."cli-boxes-2.2.0" + sources."cli-cursor-2.1.0" + sources."cli-progress-3.8.2" + sources."cli-spinners-1.3.1" + (sources."cli-ux-5.4.10" // { + dependencies = [ + sources."ansi-escapes-4.3.1" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."clean-stack-3.0.0" + sources."extract-stack-2.0.0" + sources."fs-extra-9.0.1" + sources."supports-hyperlinks-2.1.0" + sources."type-fest-0.11.0" + ]; + }) + sources."cli-width-2.2.1" + sources."cliui-6.0.0" + sources."clone-1.0.4" + sources."clone-response-1.0.2" + sources."collection-visit-1.0.0" + (sources."color-3.0.0" // { + dependencies = [ + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + ]; + }) + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."color-string-1.5.3" + sources."colors-1.4.0" + sources."colorspace-1.1.2" + sources."combined-stream-1.0.8" + sources."commander-2.20.3" + sources."common-path-prefix-2.0.0" + sources."component-emitter-1.3.0" + (sources."compress-commons-3.0.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."concat-map-0.0.1" + (sources."concordance-4.0.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."config-chain-1.1.12" + sources."configstore-5.0.1" + (sources."content-disposition-0.5.3" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."content-type-1.0.4" + sources."cookie-0.4.1" + sources."cookie-signature-1.0.6" + sources."copy-descriptor-0.1.1" + (sources."copy-template-dir-1.4.0" // { + dependencies = [ + sources."pump-1.0.3" + sources."readable-stream-2.3.7" + sources."readdirp-2.2.1" + sources."safe-buffer-5.1.2" + ]; + }) + sources."core-util-is-1.0.2" + sources."cp-file-7.0.0" + sources."cpy-8.1.0" + sources."crc-3.8.0" + sources."crc32-stream-3.0.1" + sources."cross-spawn-7.0.3" + sources."crypto-random-string-2.0.0" + sources."cyclist-1.0.1" + sources."date-time-2.1.0" + (sources."debug-4.2.0" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."decamelize-1.2.0" + sources."decode-uri-component-0.2.0" + (sources."decompress-4.2.1" // { + dependencies = [ + (sources."make-dir-1.3.0" // { + dependencies = [ + sources."pify-3.0.0" + ]; + }) + sources."pify-2.3.0" + ]; + }) + sources."decompress-response-3.3.0" + (sources."decompress-tar-4.1.1" // { + dependencies = [ + sources."bl-1.2.2" + sources."file-type-5.2.0" + sources."is-stream-1.1.0" + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + sources."tar-stream-1.6.2" + ]; + }) + (sources."decompress-tarbz2-4.1.1" // { + dependencies = [ + sources."file-type-6.2.0" + sources."is-stream-1.1.0" + ]; + }) + (sources."decompress-targz-4.1.1" // { + dependencies = [ + sources."file-type-5.2.0" + sources."is-stream-1.1.0" + ]; + }) + (sources."decompress-unzip-4.0.1" // { + dependencies = [ + sources."file-type-3.9.0" + sources."get-stream-2.3.1" + sources."pify-2.3.0" + ]; + }) + sources."deep-extend-0.6.0" + sources."deep-is-0.1.3" + sources."deepmerge-4.2.2" + sources."defaults-1.0.3" + sources."defer-to-connect-1.1.3" + sources."define-properties-1.1.3" + sources."define-property-2.0.2" + (sources."del-5.1.0" // { + dependencies = [ + sources."@nodelib/fs.stat-2.0.3" + sources."array-union-2.1.0" + sources."braces-3.0.2" + sources."dir-glob-3.0.1" + sources."fast-glob-3.2.4" + sources."fill-range-7.0.1" + sources."glob-parent-5.1.1" + sources."globby-10.0.2" + sources."ignore-5.1.8" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."slash-3.0.0" + sources."to-regex-range-5.0.1" + ]; + }) + sources."delayed-stream-1.0.0" + sources."depd-1.1.2" + sources."deprecation-2.3.1" + sources."destroy-1.0.4" + sources."detective-amd-3.0.0" + sources."detective-cjs-3.1.1" + sources."detective-es6-2.2.0" + sources."detective-less-1.0.2" + sources."detective-postcss-3.0.1" + sources."detective-sass-3.0.1" + sources."detective-scss-2.0.1" + sources."detective-stylus-1.0.0" + sources."detective-typescript-5.8.0" + (sources."dir-glob-2.2.2" // { + dependencies = [ + sources."path-type-3.0.0" + sources."pify-3.0.0" + ]; + }) + sources."dlv-1.1.3" + sources."dot-prop-5.2.0" + sources."dotenv-8.2.0" + (sources."download-7.1.0" // { + dependencies = [ + sources."@sindresorhus/is-0.7.0" + sources."cacheable-request-2.1.4" + sources."get-stream-3.0.0" + sources."got-8.3.2" + sources."http-cache-semantics-3.8.1" + sources."is-plain-obj-1.1.0" + sources."keyv-3.0.0" + sources."lowercase-keys-1.0.0" + sources."make-dir-1.3.0" + sources."normalize-url-2.0.1" + sources."p-cancelable-0.4.1" + sources."p-event-2.3.1" + sources."p-finally-1.0.0" + sources."p-timeout-2.0.1" + sources."pify-3.0.0" + sources."sort-keys-2.0.0" + ]; + }) + sources."duplexer3-0.1.4" + sources."ee-first-1.1.1" + sources."elf-tools-1.1.2" + sources."emoji-regex-8.0.0" + sources."enabled-2.0.0" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."envinfo-7.7.3" + sources."error-ex-1.3.2" + sources."error-stack-parser-2.0.6" + sources."es-abstract-1.17.6" + sources."es-to-primitive-1.2.1" + sources."escape-goat-2.1.1" + sources."escape-html-1.0.3" + sources."escape-string-regexp-4.0.0" + (sources."escodegen-1.14.3" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."eslint-visitor-keys-1.3.0" + sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."etag-1.8.1" + sources."eventemitter3-4.0.6" + sources."events-1.1.1" + (sources."execa-2.1.0" // { + dependencies = [ + sources."npm-run-path-3.1.0" + ]; + }) + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."express-4.17.1" // { + dependencies = [ + sources."cookie-0.4.0" + sources."debug-2.6.9" + sources."safe-buffer-5.1.2" + ]; + }) + sources."express-logging-1.1.1" + sources."ext-list-2.2.2" + sources."ext-name-5.0.0" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."external-editor-3.1.0" + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extract-stack-1.0.0" + sources."fast-diff-1.2.0" + sources."fast-equals-1.6.3" + sources."fast-glob-2.2.7" + sources."fast-levenshtein-2.0.6" + sources."fast-safe-stringify-2.0.7" + sources."fast-stringify-1.1.2" + sources."fastq-1.8.0" + sources."fd-slicer-1.1.0" + sources."fecha-4.2.0" + (sources."figures-3.2.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."file-size-0.0.5" + sources."file-type-8.1.0" + sources."filename-reserved-regex-2.0.0" + sources."filenamify-2.1.0" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."filter-obj-2.0.1" + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."find-up-3.0.0" // { + dependencies = [ + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + ]; + }) + sources."flatten-1.0.3" + sources."flush-write-stream-2.0.0" + sources."fn.name-1.1.0" + sources."folder-walker-3.2.0" + sources."follow-redirects-1.13.0" + sources."for-in-1.0.2" + sources."form-data-3.0.0" + sources."forwarded-0.1.2" + sources."fragment-cache-0.2.1" + sources."fresh-0.5.2" + (sources."from2-2.3.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."from2-array-0.0.4" + sources."fs-constants-1.0.0" + (sources."fs-extra-8.1.0" // { + dependencies = [ + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) + sources."fs.realpath-1.0.0" + sources."fsevents-2.1.3" + sources."function-bind-1.1.1" + sources."fuzzy-0.1.3" + sources."get-amd-module-type-3.0.0" + sources."get-caller-file-2.0.5" + sources."get-port-5.1.1" + sources."get-proxy-2.1.0" + sources."get-stream-5.2.0" + sources."get-value-2.0.6" + (sources."gh-release-fetch-1.0.3" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."git-repo-info-2.1.1" + sources."gitconfiglocal-2.1.0" + sources."glob-7.1.6" + (sources."glob-parent-3.1.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."glob-to-regexp-0.3.0" + sources."global-cache-dir-1.0.1" + sources."global-dirs-2.0.1" + sources."globby-9.2.0" + sources."gonzales-pe-4.3.0" + (sources."got-9.6.0" // { + dependencies = [ + sources."get-stream-4.1.0" + sources."to-readable-stream-1.0.0" + ]; + }) + sources."graceful-fs-4.2.4" + sources."has-1.0.3" + (sources."has-ansi-0.1.0" // { + dependencies = [ + sources."ansi-regex-0.2.1" + ]; + }) + sources."has-flag-4.0.0" + (sources."has-glob-1.0.0" // { + dependencies = [ + sources."is-glob-3.1.0" + ]; + }) + sources."has-symbol-support-x-1.4.2" + sources."has-symbols-1.0.1" + sources."has-to-string-tag-x-1.4.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + sources."kind-of-4.0.0" + ]; + }) + sources."has-yarn-2.1.0" + sources."hasha-5.2.0" + sources."hosted-git-info-2.8.8" + sources."http-cache-semantics-4.1.0" + (sources."http-call-5.3.0" // { + dependencies = [ + sources."parse-json-4.0.0" + ]; + }) + (sources."http-errors-1.7.2" // { + dependencies = [ + sources."inherits-2.0.3" + ]; + }) + sources."http-proxy-1.18.1" + (sources."http-proxy-middleware-0.21.0" // { + dependencies = [ + sources."braces-3.0.2" + sources."fill-range-7.0.1" + sources."is-number-7.0.0" + sources."micromatch-4.0.2" + sources."to-regex-range-5.0.1" + ]; + }) + sources."human-signals-1.1.1" + sources."hyperlinker-1.0.0" + sources."iconv-lite-0.4.24" + sources."ieee754-1.1.13" + sources."ignore-4.0.6" + sources."ignore-walk-3.0.3" + sources."import-lazy-2.1.0" + sources."imurmurhash-0.1.4" + sources."indent-string-4.0.0" + sources."indexes-of-1.0.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + (sources."inquirer-6.5.2" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."escape-string-regexp-1.0.5" + sources."figures-2.0.0" + sources."is-fullwidth-code-point-2.0.0" + (sources."string-width-2.1.1" // { + dependencies = [ + sources."strip-ansi-4.0.0" + ]; + }) + (sources."strip-ansi-5.2.0" // { + dependencies = [ + sources."ansi-regex-4.1.0" + ]; + }) + ]; + }) + (sources."inquirer-autocomplete-prompt-1.1.0" // { + dependencies = [ + sources."ansi-escapes-4.3.1" + sources."ansi-styles-4.2.1" + sources."chalk-4.1.0" + sources."type-fest-0.11.0" + ]; + }) + sources."into-stream-3.1.0" + sources."ipaddr.js-1.9.1" + sources."is-accessor-descriptor-1.0.0" + sources."is-arrayish-0.2.1" + sources."is-binary-path-2.1.0" + sources."is-buffer-1.1.6" + sources."is-callable-1.2.0" + sources."is-ci-2.0.0" + sources."is-data-descriptor-1.0.0" + sources."is-date-object-1.0.2" + sources."is-descriptor-1.0.2" + sources."is-docker-1.1.0" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-installed-globally-0.3.2" + sources."is-natural-number-4.0.1" + sources."is-npm-4.0.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-obj-2.0.0" + sources."is-object-1.0.1" + sources."is-path-cwd-2.2.0" + sources."is-path-inside-3.0.2" + sources."is-plain-obj-2.1.0" + sources."is-plain-object-2.0.4" + sources."is-regex-1.1.1" + sources."is-retry-allowed-1.2.0" + sources."is-stream-2.0.0" + sources."is-symbol-1.0.3" + sources."is-typedarray-1.0.0" + sources."is-url-1.2.4" + sources."is-windows-1.0.2" + (sources."is-wsl-2.2.0" // { + dependencies = [ + sources."is-docker-2.1.1" + ]; + }) + sources."is-yarn-global-0.3.0" + sources."isarray-1.0.0" + sources."iserror-0.0.2" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isurl-1.0.0" + sources."jest-get-type-24.9.0" + sources."jest-validate-24.9.0" + sources."jmespath-0.15.0" + sources."js-string-escape-1.0.1" + sources."js-tokens-4.0.0" + sources."js-yaml-3.14.0" + sources."json-buffer-3.0.0" + sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" + sources."jsonfile-6.0.1" + sources."junk-3.1.0" + sources."jwt-decode-2.2.0" + (sources."keep-func-props-3.0.1" // { + dependencies = [ + sources."mimic-fn-3.1.0" + ]; + }) + sources."keyv-3.1.0" + sources."kind-of-6.0.3" + sources."kuler-2.0.0" + (sources."lambda-local-1.7.3" // { + dependencies = [ + sources."commander-5.1.0" + ]; + }) + sources."latest-version-5.1.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."leven-3.1.0" + sources."levn-0.3.0" + sources."lines-and-columns-1.1.6" + (sources."load-json-file-5.3.0" // { + dependencies = [ + sources."parse-json-4.0.0" + sources."type-fest-0.3.1" + ]; + }) + sources."locate-path-5.0.0" + sources."lodash-4.17.20" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.camelcase-4.3.0" + sources."lodash.clonedeep-4.5.0" + sources."lodash.debounce-4.0.8" + sources."lodash.deburr-4.1.0" + sources."lodash.defaults-4.2.0" + sources."lodash.difference-4.5.0" + sources."lodash.flatten-4.4.0" + sources."lodash.flattendeep-4.4.0" + sources."lodash.get-4.4.2" + sources."lodash.isempty-4.4.0" + sources."lodash.isequal-4.5.0" + sources."lodash.islength-4.0.1" + sources."lodash.isobject-3.0.2" + sources."lodash.isplainobject-4.0.6" + sources."lodash.merge-4.6.2" + sources."lodash.pick-4.4.0" + sources."lodash.sample-4.2.1" + sources."lodash.set-4.3.2" + sources."lodash.snakecase-4.1.1" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" + sources."lodash.transform-4.6.0" + sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" + (sources."log-process-errors-5.1.2" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + ]; + }) + sources."log-symbols-2.2.0" + (sources."logform-2.2.0" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."lowercase-keys-1.0.1" + sources."macos-release-2.4.1" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + sources."map-cache-0.2.2" + sources."map-obj-4.1.0" + sources."map-visit-1.0.0" + sources."maxstache-1.0.7" + (sources."maxstache-stream-1.0.4" // { + dependencies = [ + sources."pump-1.0.3" + ]; + }) + sources."md5-hex-2.0.0" + sources."md5-o-matic-0.1.1" + sources."media-typer-0.3.0" + sources."memoize-one-5.1.1" + sources."merge-descriptors-1.0.1" + sources."merge-stream-2.0.0" + sources."merge2-1.4.1" + sources."methods-1.1.2" + sources."micro-api-client-3.3.0" + sources."micro-memoize-2.1.2" + sources."micromatch-3.1.10" + sources."mime-1.6.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-fn-2.1.0" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + sources."minimist-1.2.5" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."mkdirp-0.5.5" + sources."module-definition-3.3.0" + sources."moize-5.4.7" + (sources."move-file-1.2.0" // { + dependencies = [ + (sources."cp-file-6.2.0" // { + dependencies = [ + sources."make-dir-2.1.0" + ]; + }) + sources."path-exists-3.0.0" + sources."semver-5.7.1" + ]; + }) + sources."ms-2.0.0" + (sources."multiparty-4.2.2" // { + dependencies = [ + sources."http-errors-1.8.0" + sources."setprototypeof-1.2.0" + ]; + }) + sources."mute-stream-0.0.7" + sources."nanomatch-1.2.13" + sources."natural-orderby-2.0.3" + sources."negotiator-0.6.2" + sources."nested-error-stacks-2.1.0" + (sources."netlify-4.3.12" // { + dependencies = [ + sources."p-wait-for-3.1.0" + sources."qs-6.9.4" + ]; + }) + (sources."netlify-redirect-parser-2.5.0" // { + dependencies = [ + sources."@netlify/config-0.11.11" + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."execa-3.4.0" + sources."find-up-4.1.0" + ]; + }) + sources."netlify-redirector-0.2.0" + sources."nice-try-1.0.5" + sources."node-fetch-2.6.0" + sources."node-source-walk-4.2.0" + sources."noop2-2.0.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."normalize-path-3.0.0" + sources."normalize-url-4.5.0" + sources."npm-bundled-1.1.1" + (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-4.0.1" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-inspect-1.8.0" + sources."object-keys-1.1.1" + sources."object-treeify-1.1.26" + sources."object-visit-1.0.1" + sources."object.assign-4.1.0" + sources."object.getownpropertydescriptors-2.1.0" + sources."object.pick-1.3.0" + sources."octokit-pagination-methods-1.1.0" + sources."omit.js-2.0.2" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."one-time-1.0.0" + sources."onetime-5.1.2" + (sources."open-6.4.0" // { + dependencies = [ + sources."is-wsl-1.1.0" + ]; + }) + (sources."opn-5.5.0" // { + dependencies = [ + sources."is-wsl-1.1.0" + ]; + }) + sources."optionator-0.8.3" + (sources."ora-3.4.0" // { + dependencies = [ + sources."cli-spinners-2.4.0" + sources."strip-ansi-5.2.0" + ]; + }) + sources."os-name-3.1.0" + sources."os-tmpdir-1.0.2" + (sources."p-all-2.1.0" // { + dependencies = [ + sources."p-map-2.1.0" + ]; + }) + sources."p-cancelable-1.1.0" + sources."p-event-4.2.0" + (sources."p-filter-2.1.0" // { + dependencies = [ + sources."p-map-2.1.0" + ]; + }) + sources."p-finally-2.0.1" + sources."p-is-promise-1.1.0" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-map-3.0.0" + sources."p-reduce-2.1.0" + (sources."p-timeout-3.2.0" // { + dependencies = [ + sources."p-finally-1.0.0" + ]; + }) + sources."p-try-2.2.0" + (sources."p-wait-for-2.0.1" // { + dependencies = [ + sources."p-finally-1.0.0" + sources."p-timeout-2.0.1" + ]; + }) + (sources."package-json-6.5.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (sources."parallel-transform-1.2.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."parse-github-url-1.0.2" + sources."parse-gitignore-1.0.1" + sources."parse-json-5.1.0" + sources."parse-ms-2.1.0" + sources."parseurl-1.3.3" + sources."pascalcase-0.1.1" + (sources."password-prompt-1.1.2" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."path-key-2.0.1" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) + sources."path-dirname-1.0.2" + sources."path-exists-4.0.0" + sources."path-is-absolute-1.0.1" + sources."path-key-3.1.1" + sources."path-parse-1.0.6" + sources."path-to-regexp-0.1.7" + sources."path-type-4.0.0" + sources."pend-1.2.0" + sources."picomatch-2.2.2" + sources."pify-4.0.1" + sources."pinkie-2.0.4" + sources."pinkie-promise-2.0.1" + (sources."pkg-dir-4.2.0" // { + dependencies = [ + sources."find-up-4.1.0" + ]; + }) + sources."posix-character-classes-0.1.1" + (sources."postcss-7.0.32" // { + dependencies = [ + sources."has-flag-3.0.0" + sources."source-map-0.6.1" + sources."supports-color-6.1.0" + ]; + }) + sources."postcss-values-parser-1.5.0" + sources."precinct-6.3.1" + sources."precond-0.2.3" + sources."prelude-ls-1.1.2" + sources."prepend-http-2.0.0" + sources."pretty-format-24.9.0" + sources."pretty-ms-5.1.0" + sources."prettyjson-1.2.1" + sources."process-nextick-args-2.0.1" + sources."proto-list-1.2.4" + sources."proxy-addr-2.0.6" + sources."pump-3.0.0" + sources."punycode-1.3.2" + sources."pupa-2.0.1" + sources."qs-6.7.0" + sources."query-string-5.1.1" + sources."querystring-0.2.0" + sources."random-bytes-1.0.0" + sources."random-item-1.0.0" + sources."range-parser-1.2.1" + (sources."raw-body-2.4.1" // { + dependencies = [ + sources."http-errors-1.7.3" + ]; + }) + sources."rc-1.2.8" + sources."react-is-16.13.1" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-6.0.0" // { + dependencies = [ + sources."find-up-4.1.0" + sources."type-fest-0.5.2" + ]; + }) + sources."readable-stream-3.6.0" + sources."readdirp-3.4.0" + sources."redeyed-2.1.1" + sources."regex-not-1.0.2" + sources."registry-auth-token-4.2.0" + sources."registry-url-5.1.0" + sources."remove-trailing-separator-1.1.0" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."require-directory-2.1.1" + sources."require-main-filename-2.0.0" + sources."require-package-name-2.0.1" + sources."requires-port-1.0.0" + sources."resolve-1.17.0" + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + (sources."restore-cursor-2.0.0" // { + dependencies = [ + sources."mimic-fn-1.2.0" + sources."onetime-2.0.1" + ]; + }) + sources."ret-0.1.15" + sources."reusify-1.0.4" + sources."rimraf-3.0.2" + sources."run-async-2.4.1" + sources."run-parallel-1.1.9" + (sources."rxjs-6.6.2" // { + dependencies = [ + sources."tslib-1.13.0" + ]; + }) + sources."safe-buffer-5.2.1" + sources."safe-join-0.1.3" + sources."safe-json-stringify-1.2.0" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."sax-1.2.1" + sources."seek-bzip-1.0.6" + sources."semver-7.3.2" + (sources."semver-diff-3.1.1" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) + (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."set-blocking-2.0.0" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."setprototypeof-1.1.1" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.3" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) + sources."slash-2.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."sort-keys-1.1.2" // { + dependencies = [ + sources."is-plain-obj-1.1.0" + ]; + }) + sources."sort-keys-length-1.0.1" + sources."source-map-0.5.7" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.0" + 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.5" + sources."split-string-3.1.0" + sources."split2-1.1.1" + sources."sprintf-js-1.0.3" + sources."stack-generator-2.0.5" + sources."stack-trace-0.0.10" + sources."stackframe-1.2.0" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + (sources."static-server-2.2.1" // { + dependencies = [ + sources."ansi-regex-0.2.1" + sources."ansi-styles-1.1.0" + sources."chalk-0.5.1" + sources."escape-string-regexp-1.0.5" + sources."strip-ansi-0.3.0" + sources."supports-color-0.2.0" + ]; + }) + sources."statsd-client-0.4.5" + sources."statuses-1.5.0" + sources."strict-uri-encode-1.1.0" + sources."string-width-4.2.0" + sources."string.prototype.trimend-1.0.1" + sources."string.prototype.trimstart-1.0.1" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + (sources."strip-ansi-6.0.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + ]; + }) + sources."strip-ansi-control-characters-2.0.0" + sources."strip-bom-3.0.0" + sources."strip-dirs-2.1.0" + sources."strip-eof-1.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-json-comments-2.0.1" + (sources."strip-outer-1.0.1" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."supports-color-7.1.0" + (sources."supports-hyperlinks-1.0.1" // { + dependencies = [ + sources."has-flag-2.0.0" + (sources."supports-color-5.5.0" // { + dependencies = [ + sources."has-flag-3.0.0" + ]; + }) + ]; + }) + sources."tar-stream-2.1.3" + sources."temp-dir-1.0.0" + (sources."tempy-0.3.0" // { + dependencies = [ + sources."crypto-random-string-1.0.0" + sources."type-fest-0.3.1" + sources."unique-string-1.0.0" + ]; + }) + sources."term-size-2.2.0" + sources."text-hex-1.0.0" + sources."through-2.3.8" + (sources."through2-2.0.5" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."through2-filter-3.0.0" + sources."through2-map-3.0.0" + sources."time-zone-1.0.0" + sources."timed-out-4.0.1" + sources."tmp-0.0.33" + sources."to-buffer-1.1.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-readable-stream-2.1.0" + sources."to-regex-3.0.2" + sources."to-regex-range-2.1.1" + sources."toidentifier-1.0.0" + sources."toml-3.0.0" + sources."tomlify-j0.4-3.0.0" + sources."treeify-1.1.0" + (sources."trim-repeated-1.0.0" // { + dependencies = [ + sources."escape-string-regexp-1.0.5" + ]; + }) + sources."triple-beam-1.3.0" + sources."tslib-2.0.1" + (sources."tsutils-3.17.1" // { + dependencies = [ + sources."tslib-1.13.0" + ]; + }) + sources."tunnel-agent-0.6.0" + sources."type-check-0.3.2" + sources."type-fest-0.8.1" + sources."type-is-1.6.18" + sources."typedarray-to-buffer-3.1.5" + sources."typescript-3.9.7" + sources."uid-safe-2.1.5" + sources."unbzip2-stream-1.4.3" + sources."union-value-1.0.1" + sources."uniq-1.0.1" + sources."unique-string-2.0.0" + sources."universal-user-agent-4.0.1" + sources."universalify-1.0.0" + (sources."unixify-1.0.0" // { + dependencies = [ + sources."normalize-path-2.1.1" + ]; + }) + sources."unpipe-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + (sources."update-notifier-4.1.1" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + ]; + }) + sources."urix-0.1.0" + sources."url-0.10.3" + sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."util.promisify-1.0.1" + sources."utils-merge-1.0.1" + sources."uuid-3.4.0" + sources."validate-npm-package-license-3.0.4" + sources."validate-npm-package-name-3.0.0" + sources."vary-1.1.2" + (sources."wait-port-0.2.9" // { + dependencies = [ + sources."commander-3.0.2" + ]; + }) + sources."wcwidth-1.0.1" + sources."well-known-symbols-2.0.0" + sources."which-2.0.2" + sources."which-module-2.0.0" + sources."widest-line-3.1.0" + (sources."windows-release-3.3.3" // { + dependencies = [ + sources."cross-spawn-6.0.5" + sources."execa-1.0.0" + sources."get-stream-4.1.0" + sources."is-stream-1.1.0" + sources."npm-run-path-2.0.2" + sources."p-finally-1.0.0" + sources."path-key-2.0.1" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."which-1.3.1" + ]; + }) + sources."winston-3.3.3" + (sources."winston-transport-4.4.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."safe-buffer-5.1.2" + ]; + }) + sources."word-wrap-1.2.3" + (sources."wrap-ansi-6.2.0" // { + dependencies = [ + sources."ansi-styles-4.2.1" + ]; + }) + sources."wrappy-1.0.2" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" + sources."xml2js-0.4.19" + sources."xmlbuilder-9.0.7" + sources."xtend-4.0.2" + sources."y18n-4.0.0" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."find-up-4.1.0" + ]; + }) + sources."yargs-parser-18.1.3" + sources."yarn-1.22.4" + sources."yauzl-2.10.0" + sources."zip-stream-3.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Netlify command line tool"; + homepage = https://github.com/netlify/cli; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; nijs = nodeEnv.buildNodePackage { name = "nijs"; packageName = "nijs"; @@ -72222,14 +74162,14 @@ in node-gyp = nodeEnv.buildNodePackage { name = "node-gyp"; packageName = "node-gyp"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.0.0.tgz"; - sha512 = "ZW34qA3CJSPKDz2SJBHKRvyNQN0yWO5EGKKksJc+jElu9VA468gwJTyTArC1iOXU7rN3Wtfg/CMt/dBAOFIjvg=="; + url = "https://registry.npmjs.org/node-gyp/-/node-gyp-7.1.0.tgz"; + sha512 = "rjlHQlnl1dqiDZxZYiKqQdrjias7V+81OVR5PTzZioCBtWkNdrKy06M05HLKxy/pcKikKRCabeDRoZaEc6nIjw=="; }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -72237,7 +74177,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -72285,7 +74225,7 @@ in sources."mime-types-2.1.27" sources."minimatch-3.0.4" sources."minipass-3.1.3" - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."nopt-4.0.3" sources."npmlog-4.1.2" @@ -72314,7 +74254,7 @@ in sources."string-width-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" - sources."tar-6.0.2" + sources."tar-6.0.5" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -72378,7 +74318,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" @@ -72738,16 +74678,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.1.2.tgz"; - sha512 = "In2GzDLER2Bm5SkuEQVrekrSFtPljpkMaEYcZxNkbTomYixI63PrCm1IJEZjEBjSkFaK5zY1t3sfEHKdAla+MQ=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.1.3.tgz"; + sha512 = "U+bxzyjB66dwIm0DZwvCqy34A6CJICro8xNNbMqA8GWnNrY6/ZGuUrmNuApsH3n8stkOPB4CozdR9JpEXTqbtw=="; }; dependencies = [ - sources."@babel/runtime-7.11.1" - sources."@node-red/editor-api-1.1.2" - sources."@node-red/editor-client-1.1.2" - (sources."@node-red/nodes-1.1.2" // { + sources."@babel/runtime-7.11.2" + sources."@node-red/editor-api-1.1.3" + sources."@node-red/editor-client-1.1.3" + (sources."@node-red/nodes-1.1.3" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -72761,9 +74701,9 @@ in }) ]; }) - sources."@node-red/registry-1.1.2" - sources."@node-red/runtime-1.1.2" - sources."@node-red/util-1.1.2" + sources."@node-red/registry-1.1.3" + sources."@node-red/runtime-1.1.3" + sources."@node-red/util-1.1.3" sources."abbrev-1.1.1" sources."accepts-1.3.7" (sources."agent-base-6.0.1" // { @@ -72791,7 +74731,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."axios-0.19.2" sources."balanced-match-1.0.0" (sources."basic-auth-2.0.1" // { @@ -72931,7 +74871,7 @@ in }) (sources."ext-1.4.0" // { dependencies = [ - sources."type-2.0.0" + sources."type-2.1.0" ]; }) sources."extend-3.0.2" @@ -73249,7 +75189,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -73257,7 +75197,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -73325,7 +75265,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."minipass-3.1.3" - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" sources."mkdirp-0.5.5" sources."ncp-0.4.2" sources."nijs-0.0.25" @@ -73397,7 +75337,7 @@ in ]; }) sources."strip-ansi-3.0.1" - (sources."tar-6.0.2" // { + (sources."tar-6.0.5" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -73457,7 +75397,7 @@ in sources."braces-3.0.2" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -73468,7 +75408,7 @@ in sources."supports-color-7.1.0" ]; }) - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."ci-info-2.0.0" sources."cli-boxes-2.2.0" sources."clone-response-1.0.2" @@ -73576,7 +75516,7 @@ in ]; }) sources."unique-string-2.0.0" - sources."update-notifier-4.1.0" + sources."update-notifier-4.1.1" sources."url-parse-lax-3.0.0" sources."widest-line-3.1.0" sources."wrappy-1.0.2" @@ -73596,10 +75536,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "6.14.7"; + version = "6.14.8"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-6.14.7.tgz"; - sha512 = "swhsdpNpyXg4GbM6LpOQ6qaloQuIKizZ+Zh6JPXJQc59ka49100Js0WvZx594iaKSoFgkFq2s8uXFHS3/Xy2WQ=="; + url = "https://registry.npmjs.org/npm/-/npm-6.14.8.tgz"; + sha512 = "HBZVBMYs5blsj94GTeQZel7s9odVuuSUHy1+AlZh7rPVux1os2ashvEGLy/STNK7vUjbrCg5Kq9/GXisJgdf6A=="; }; buildInputs = globalBuildInputs; meta = { @@ -73614,10 +75554,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "7.0.2"; + version = "7.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-7.0.2.tgz"; - sha512 = "MyH17fUCFbYShuIyxZj6yqB6YZ47+AjPCgXQiH1oqNe3vElBoJ0toY7nwy88qJbfXnFqjTFigzs9lsoKSK0iUw=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-7.1.1.tgz"; + sha512 = "mTth44/DK4EmTecdyqEzt6C76sSYdCnDrOo39lNcN1/JWOEkcb+uLQ2CRt0gqkCp6DohALs4RpVBVp+E2i+h8Q=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" @@ -73625,7 +75565,7 @@ in sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/move-file-1.0.1" sources."@npmcli/promise-spawn-1.2.0" - sources."@npmcli/run-script-1.4.0" + sources."@npmcli/run-script-1.5.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" @@ -73633,8 +75573,8 @@ in sources."abbrev-1.1.1" sources."agent-base-6.0.1" sources."agentkeepalive-4.1.3" - sources."aggregate-error-3.0.1" - sources."ajv-6.12.3" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.4" (sources."ansi-align-3.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -73653,7 +75593,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" (sources."boxen-4.2.0" // { @@ -73671,7 +75611,7 @@ in sources."cacache-15.0.5" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -73690,7 +75630,7 @@ in sources."color-name-1.1.4" sources."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commander-5.1.0" + sources."commander-6.0.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" @@ -73771,12 +75711,13 @@ in sources."js-yaml-3.14.0" sources."jsbn-0.1.1" sources."json-buffer-3.0.0" - sources."json-parse-even-better-errors-2.2.0" + sources."json-parse-even-better-errors-2.3.0" sources."json-parse-helpfulerror-1.0.3" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-2.1.3" + sources."jsonlines-0.1.1" sources."jsonparse-1.3.1" sources."jsprim-1.4.1" sources."keyv-3.1.0" @@ -73791,7 +75732,7 @@ in ]; }) sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { @@ -73807,9 +75748,9 @@ in sources."minimist-1.2.5" sources."minipass-3.1.3" sources."minipass-collect-1.0.2" - (sources."minipass-fetch-1.3.0" // { + (sources."minipass-fetch-1.3.1" // { dependencies = [ - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" ]; }) sources."minipass-flush-1.0.5" @@ -73824,7 +75765,6 @@ in }) sources."mkdirp-1.0.4" sources."ms-2.1.2" - sources."nested-error-stacks-2.0.1" (sources."node-gyp-6.1.0" // { dependencies = [ sources."chownr-1.1.4" @@ -73846,9 +75786,9 @@ in sources."npm-package-arg-8.0.1" sources."npm-packlist-2.1.2" sources."npm-pick-manifest-6.1.0" - (sources."npm-registry-fetch-8.1.3" // { + (sources."npm-registry-fetch-8.1.4" // { dependencies = [ - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" ]; }) sources."npmlog-4.1.2" @@ -73872,7 +75812,6 @@ in sources."pacote-11.1.11" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-parse-1.0.6" sources."performance-now-2.1.0" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" @@ -73887,15 +75826,13 @@ in sources."qs-6.5.2" sources."rc-1.2.8" sources."rc-config-loader-3.0.0" - sources."read-package-json-fast-1.1.3" + sources."read-package-json-fast-1.2.1" sources."readable-stream-2.3.7" sources."readdir-scoped-modules-1.1.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" sources."request-2.88.2" sources."require-from-string-2.0.2" - sources."requireg-0.2.2" - sources."resolve-1.7.1" sources."responselike-1.0.2" sources."retry-0.10.1" sources."rimraf-3.0.2" @@ -73923,9 +75860,9 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."supports-color-7.1.0" - (sources."tar-6.0.2" // { + (sources."tar-6.0.5" // { dependencies = [ - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" ]; }) sources."term-size-2.2.0" @@ -73938,7 +75875,7 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" - (sources."update-notifier-4.1.0" // { + (sources."update-notifier-4.1.1" // { dependencies = [ sources."chalk-3.0.0" ]; @@ -73986,7 +75923,7 @@ in }; dependencies = [ sources."abbrev-1.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-2.1.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -73995,7 +75932,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" @@ -74201,13 +76138,13 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/compat-data-7.11.0" - (sources."@babel/core-7.11.1" // { + (sources."@babel/core-7.11.4" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.11.0" // { + (sources."@babel/generator-7.11.4" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -74220,7 +76157,7 @@ in sources."@babel/helper-create-class-features-plugin-7.10.5" sources."@babel/helper-create-regexp-features-plugin-7.10.4" sources."@babel/helper-define-map-7.10.5" - sources."@babel/helper-explode-assignable-expression-7.10.4" + sources."@babel/helper-explode-assignable-expression-7.11.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" @@ -74230,7 +76167,7 @@ in sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" - sources."@babel/helper-remap-async-to-generator-7.10.4" + sources."@babel/helper-remap-async-to-generator-7.11.4" sources."@babel/helper-replace-supers-7.10.4" sources."@babel/helper-simple-access-7.10.4" sources."@babel/helper-skip-transparent-expression-wrappers-7.11.0" @@ -74239,7 +76176,7 @@ in sources."@babel/helper-wrap-function-7.10.4" sources."@babel/helpers-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" + sources."@babel/parser-7.11.4" sources."@babel/plugin-proposal-async-generator-functions-7.10.5" sources."@babel/plugin-proposal-class-properties-7.10.4" sources."@babel/plugin-proposal-dynamic-import-7.10.4" @@ -74303,7 +76240,7 @@ in sources."@babel/plugin-transform-unicode-regex-7.10.4" sources."@babel/preset-env-7.11.0" sources."@babel/preset-modules-0.1.3" - sources."@babel/runtime-7.11.1" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" sources."@babel/traverse-7.11.0" sources."@babel/types-7.11.0" @@ -74324,7 +76261,7 @@ in ]; }) sources."acorn-walk-6.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."alphanum-sort-1.0.2" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" @@ -74341,7 +76278,7 @@ in sources."array-equal-1.0.0" sources."array-unique-0.3.2" sources."asn1-0.2.4" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -74359,7 +76296,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -74382,7 +76319,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."binary-extensions-1.13.1" sources."bindings-1.5.0" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" sources."braces-2.3.2" @@ -74408,7 +76345,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.13.0" + sources."browserslist-4.14.0" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -74424,7 +76361,7 @@ in sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001111" + sources."caniuse-lite-1.0.30001118" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -74558,7 +76495,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.520" + sources."electron-to-chromium-1.3.549" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -74566,7 +76503,7 @@ in }) sources."encodeurl-1.0.2" sources."entities-1.1.2" - sources."envinfo-7.7.2" + sources."envinfo-7.7.3" sources."error-ex-1.3.2" (sources."es-abstract-1.17.6" // { dependencies = [ @@ -74662,7 +76599,8 @@ in sources."html-tags-1.2.0" (sources."htmlnano-0.2.6" // { dependencies = [ - sources."posthtml-0.13.1" + sources."posthtml-0.13.3" + sources."posthtml-parser-0.5.0" sources."terser-4.8.0" ]; }) @@ -74750,7 +76688,7 @@ in sources."leven-3.1.0" sources."levenary-1.1.1" sources."levn-0.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.clone-4.5.0" sources."lodash.memoize-4.1.2" sources."lodash.sortby-4.7.0" @@ -74837,7 +76775,7 @@ in sources."ora-2.1.0" sources."os-browserify-0.3.0" sources."pako-0.2.9" - sources."parse-asn1-5.1.5" + sources."parse-asn1-5.1.6" sources."parse-json-4.0.0" sources."parse5-5.1.0" sources."parseurl-1.3.3" @@ -74857,7 +76795,7 @@ in sources."supports-color-6.1.0" ]; }) - (sources."postcss-calc-7.0.2" // { + (sources."postcss-calc-7.0.3" // { dependencies = [ sources."postcss-value-parser-4.1.0" ]; @@ -75173,7 +77111,7 @@ in sources."negotiator-0.6.2" ]; }) - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -75184,7 +77122,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babybird-0.0.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -75301,7 +77239,7 @@ in sources."kad-memstore-0.0.1" sources."limitation-0.2.1" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.clone-4.5.0" sources."media-typer-0.3.0" sources."mediawiki-title-0.6.5" @@ -75402,7 +77340,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.2" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.2.2" @@ -75557,7 +77495,7 @@ in sources."ansi-styles-3.2.1" sources."chalk-2.4.2" sources."is-fullwidth-code-point-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."string-width-2.1.1" sources."strip-ansi-4.0.0" sources."supports-color-5.5.0" @@ -75566,7 +77504,7 @@ in sources."internal-ip-1.2.0" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.1" + sources."ipaddr.js-2.0.0" sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-callable-1.2.0" @@ -75700,7 +77638,11 @@ in sources."string-width-1.0.2" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" - sources."string2compact-1.3.0" + (sources."string2compact-1.3.0" // { + dependencies = [ + sources."ipaddr.js-1.9.1" + ]; + }) sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -75764,7 +77706,7 @@ in sources."accepts-1.3.7" sources."addr-to-ip-port-1.5.1" sources."after-0.8.2" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."archiver-3.1.1" (sources."archiver-utils-2.1.0" // { dependencies = [ @@ -75779,7 +77721,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.5" @@ -75798,7 +77740,7 @@ in sources."ws-1.1.5" ]; }) - sources."bl-4.0.2" + sources."bl-4.0.3" sources."blob-0.0.5" sources."bn.js-4.11.9" sources."bncode-0.5.3" @@ -75939,7 +77881,7 @@ in sources."readable-stream-2.3.7" ]; }) - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" @@ -76131,10 +78073,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.4.12"; + version = "5.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.4.12.tgz"; - sha512 = "//Oru9g26OvTCe6bID3AJNiJ8B5SRd0vQBRH1gpoWxDh5kdPPpV4pge4B6ncWJUIl0yAVB9sSmDqDDheJP5+xQ=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.5.3.tgz"; + sha512 = "1FfqqDOaQKIn10WzP2Vdjwo4KOpdu7s2dRbBMDJi9llHa5BhhHf+ASrW8HTWyqKd03n6wf2NrbFvZreHJKQnZw=="; }; buildInputs = globalBuildInputs; meta = { @@ -76172,7 +78114,7 @@ in sources."callsites-2.0.0" sources."camelcase-5.3.1" sources."chalk-4.1.0" - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -76211,7 +78153,7 @@ in sources."json-parse-better-errors-1.0.2" sources."jsonfile-6.0.1" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."log-symbols-2.2.0" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -76294,10 +78236,10 @@ in prettier = nodeEnv.buildNodePackage { name = "prettier"; packageName = "prettier"; - version = "2.0.5"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz"; - sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg=="; + url = "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz"; + sha512 = "9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw=="; }; buildInputs = globalBuildInputs; meta = { @@ -76329,7 +78271,7 @@ in sources."inherits-2.0.4" sources."isexe-2.0.0" sources."keypress-0.2.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."minimatch-3.0.4" sources."once-1.4.0" sources."path-is-absolute-1.0.1" @@ -76359,7 +78301,7 @@ in sources."acorn-7.4.0" sources."acorn-node-1.8.2" sources."acorn-walk-7.2.0" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -76373,7 +78315,7 @@ in sources."async-1.5.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."brorand-1.1.0" sources."browser-pack-6.1.0" @@ -76485,7 +78427,7 @@ in sources."jsonify-0.0.0" sources."jsonparse-1.3.1" sources."labeled-stream-splicer-2.0.2" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.memoize-3.0.4" sources."md5.js-1.3.5" (sources."miller-rabin-4.0.1" // { @@ -76523,7 +78465,7 @@ in sources."os-browserify-0.3.0" sources."pako-1.0.11" sources."parents-1.0.1" - sources."parse-asn1-5.1.5" + sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" @@ -76553,6 +78495,7 @@ in sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."sander-0.5.1" sources."sha.js-2.4.11" sources."shasum-1.0.2" @@ -76616,10 +78559,10 @@ in purescript-language-server = nodeEnv.buildNodePackage { name = "purescript-language-server"; packageName = "purescript-language-server"; - version = "0.13.6"; + version = "0.13.7"; src = fetchurl { - url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.13.6.tgz"; - sha512 = "0e7oA1gveyd8XLkBYcPWRC27PAFGTxpf6aVJWUfA79Q3lCCOP9BQBkr9a42FutP3q6GMc9TVW4mQ+xSEfhwOzA=="; + url = "https://registry.npmjs.org/purescript-language-server/-/purescript-language-server-0.13.7.tgz"; + sha512 = "TFOuSw0boZkT8q96QJyY/LJfEZ0DWD86xKdwOe2td04TAzBZVUvwu7143XCzKnewf38qv4tHzCLlVPe4a+HXdA=="; }; dependencies = [ sources."isexe-2.0.0" @@ -76680,10 +78623,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.59"; + version = "1.1.65"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.59.tgz"; - sha512 = "34PysYgl5bDdV7H4y5dv4fonKsJvI2H/YSDY6jvVtt0XI7Ld0k6lHzBZcVDO4kNLdJt0ekhwqC8w42oJyPYnWg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.65.tgz"; + sha512 = "G8tI8Ws5CwXJGJTQ48e0L+56cA31990t9V65EukrefKnLupySPVVpHuUGeCY21LCYqZPg1yY2R8KMbXH1y1uMQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -76738,6 +78681,7 @@ in sources."is-callable-1.2.0" sources."is-date-object-1.0.2" sources."is-map-2.0.1" + sources."is-negative-zero-2.0.0" sources."is-number-object-1.0.4" sources."is-regex-1.1.1" sources."is-set-2.0.1" @@ -76766,7 +78710,11 @@ in sources."revalidator-0.1.8" sources."rimraf-2.7.1" sources."semver-5.7.1" - sources."side-channel-1.0.2" + (sources."side-channel-1.0.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."stack-trace-0.0.10" sources."string.prototype.trimend-1.0.1" sources."string.prototype.trimstart-1.0.1" @@ -76850,14 +78798,14 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.9.10"; + version = "0.9.12"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.10.tgz"; - sha512 = "2rfbQp8uNpQEw/4hRYes3fVrOAYfgK7jYw3t/A9R4EpMSF6jtzJLA/sl1SQh2zWaF5z1ckXEvUW9B8c+NDc//g=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.12.tgz"; + sha512 = "9Ap7WfEsYtAoVZNyA8lryWAsU2Wq0lHXaNiFgdVZb4zltHNTYEqKmRi06WhileeuqVTNkd1CF2S5CCS5Xg9+aQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/generator-7.11.0" // { + (sources."@babel/generator-7.11.4" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -76869,37 +78817,22 @@ in sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.11.1" - sources."@babel/runtime-7.11.1" + sources."@babel/parser-7.11.4" + sources."@babel/runtime-7.11.2" sources."@babel/template-7.10.4" sources."@babel/traverse-7.11.0" sources."@babel/types-7.11.0" - (sources."@emotion/babel-utils-0.6.10" // { - dependencies = [ - sources."source-map-0.7.3" - ]; - }) - sources."@emotion/hash-0.6.6" - (sources."@emotion/is-prop-valid-0.8.8" // { - dependencies = [ - sources."@emotion/memoize-0.7.4" - ]; - }) - sources."@emotion/memoize-0.6.6" - sources."@emotion/serialize-0.9.1" - sources."@emotion/stylis-0.7.1" - sources."@emotion/unitless-0.6.7" - sources."@emotion/utils-0.8.2" + 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."@types/color-name-1.1.1" - sources."@types/node-13.13.15" - sources."@types/parse-json-4.0.0" - sources."abbrev-1.1.1" sources."ajv-5.5.2" - sources."ansi-regex-5.0.0" + sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -76909,19 +78842,13 @@ in sources."util-0.10.3" ]; }) - (sources."babel-plugin-emotion-9.2.11" // { - dependencies = [ - sources."mkdirp-0.5.5" - sources."source-map-0.5.7" - ]; - }) - sources."babel-plugin-macros-2.8.0" sources."babel-plugin-styled-components-1.11.1" sources."babel-plugin-syntax-jsx-6.18.0" sources."base64-js-1.3.1" sources."better-ajv-errors-0.6.7" + sources."big.js-5.2.2" sources."binary-extensions-2.1.0" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."braces-3.0.2" sources."brorand-1.1.0" sources."browserify-aes-1.2.0" @@ -76947,42 +78874,35 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."call-me-maybe-1.0.1" - sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelize-1.0.0" sources."chalk-2.4.2" - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."cipher-base-1.0.4" sources."classnames-2.2.6" sources."clipboard-2.0.6" - sources."cliui-6.0.0" + sources."cliui-4.1.0" sources."clsx-1.1.1" sources."co-4.6.0" sources."code-error-fragment-0.0.230" + sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."console-browserify-1.2.0" sources."constants-browserify-1.0.0" - (sources."convert-source-map-1.7.0" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) sources."core-js-3.6.5" sources."core-util-is-1.0.2" - sources."cosmiconfig-6.0.0" (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" ]; }) - sources."create-emotion-9.2.12" sources."create-hash-1.2.0" sources."create-hmac-1.1.7" + sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" - sources."csstype-2.6.13" sources."debug-4.2.0" sources."decamelize-1.2.0" sources."decko-1.2.0" @@ -76993,33 +78913,37 @@ in sources."bn.js-4.11.9" ]; }) + sources."dom-walk-0.1.2" sources."domain-browser-1.2.0" - sources."dompurify-2.0.12" + sources."dompurify-1.0.11" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" ]; }) sources."emoji-regex-8.0.0" - sources."emotion-9.2.12" - sources."error-ex-1.3.2" + sources."emojis-list-3.0.0" + sources."end-of-stream-1.4.4" sources."es6-promise-3.3.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."eventemitter3-4.0.4" + sources."eventemitter3-3.1.2" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" + sources."execa-1.0.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" sources."fill-range-7.0.1" - sources."find-root-1.1.0" - sources."find-up-4.1.0" + sources."find-up-3.0.0" sources."foreach-2.0.5" sources."format-util-1.0.5" sources."fsevents-2.1.3" - sources."get-caller-file-2.0.5" + sources."get-caller-file-1.0.3" + sources."get-stream-4.1.0" sources."glob-parent-5.1.1" + sources."global-4.4.0" sources."globals-11.12.0" sources."good-listener-1.2.2" sources."grapheme-splitter-1.0.4" @@ -77041,79 +78965,88 @@ in sources."http2-client-1.3.3" sources."https-browserify-1.0.0" sources."ieee754-1.1.13" - sources."import-fresh-3.2.1" sources."inherits-2.0.1" - sources."is-arrayish-0.2.1" + sources."invert-kv-2.0.0" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" + sources."is-stream-1.1.0" sources."isarray-2.0.5" + sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsesc-2.5.2" - sources."json-parse-better-errors-1.0.2" sources."json-pointer-0.6.0" sources."json-schema-ref-parser-6.1.0" sources."json-schema-traverse-0.3.1" sources."json-to-ast-2.1.0" + sources."json5-1.0.1" sources."jsonpointer-4.1.0" + sources."lcid-2.0.0" sources."leven-3.1.0" - sources."lines-and-columns-1.1.6" - sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."loader-utils-1.4.0" + sources."locate-path-3.0.0" + sources."lodash-4.17.20" sources."loose-envify-1.4.0" - sources."lunr-2.3.8" + sources."lunr-2.3.6" + sources."map-age-cleaner-0.1.3" sources."mark.js-8.11.1" - sources."marked-0.7.0" + sources."marked-0.6.3" sources."md5.js-1.3.5" + sources."mem-4.3.0" sources."memoize-one-5.1.1" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.11.9" ]; }) + sources."mimic-fn-2.1.0" + sources."min-document-2.19.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-4.15.4" - sources."mobx-react-6.2.5" - sources."mobx-react-lite-2.0.7" + sources."mobx-4.15.6" + sources."mobx-react-5.4.4" sources."ms-2.1.2" sources."neo-async-2.6.2" + sources."nice-try-1.0.5" sources."node-fetch-h2-2.3.0" sources."node-libs-browser-2.2.1" sources."node-readfiles-0.2.0" - sources."nopt-1.0.10" sources."normalize-path-3.0.0" + sources."npm-run-path-2.0.2" + sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.1.3" - sources."oas-resolver-2.4.2" + sources."oas-resolver-2.4.3" sources."oas-schema-walker-1.1.5" - sources."oas-validator-4.0.7" + sources."oas-validator-3.4.0" sources."object-assign-4.1.1" + sources."once-1.4.0" sources."ono-4.0.11" - sources."openapi-sampler-1.0.0-beta.16" + sources."openapi-sampler-1.0.0-beta.14" sources."os-browserify-0.3.0" + sources."os-locale-3.1.0" + sources."p-defer-1.0.0" + sources."p-finally-1.0.0" + sources."p-is-promise-2.1.0" sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-locate-3.0.0" sources."p-try-2.2.0" sources."pako-1.0.11" - sources."parent-module-1.0.1" - sources."parse-asn1-5.1.5" - sources."parse-json-5.0.1" + sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" - sources."path-exists-4.0.0" - sources."path-parse-1.0.6" - sources."path-type-4.0.0" + sources."path-exists-3.0.0" + sources."path-key-2.0.1" sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" sources."polished-3.6.5" sources."postcss-value-parser-4.1.0" - sources."prismjs-1.20.0" + sources."prismjs-1.21.0" sources."process-0.11.10" sources."process-nextick-args-2.0.1" sources."prop-types-15.7.2" @@ -77122,6 +79055,7 @@ in sources."bn.js-4.11.9" ]; }) + sources."pump-3.0.0" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -77129,8 +79063,14 @@ in sources."randomfill-1.0.4" sources."react-16.13.1" sources."react-dom-16.13.1" - sources."react-dropdown-aria-2.0.7" + sources."react-dropdown-1.8.0" + (sources."react-hot-loader-4.12.21" // { + dependencies = [ + sources."source-map-0.7.3" + ]; + }) sources."react-is-16.13.1" + sources."react-lifecycles-compat-3.0.4" sources."react-tabs-3.1.1" (sources."readable-stream-2.3.7" // { dependencies = [ @@ -77141,61 +79081,68 @@ in ]; }) sources."readdirp-3.4.0" - sources."redoc-2.0.0-rc.36" - sources."reftools-1.1.4" + (sources."redoc-2.0.0-rc.8-1" // { + dependencies = [ + sources."tslib-1.13.0" + ]; + }) + sources."reftools-1.1.5" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" - sources."resolve-from-4.0.0" + sources."require-main-filename-1.0.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" + sources."safer-buffer-2.1.2" sources."scheduler-0.19.1" sources."select-1.1.2" + sources."semver-5.7.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" sources."shallowequal-1.1.0" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" sources."should-13.2.3" sources."should-equal-2.0.0" sources."should-format-3.0.3" sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" + sources."signal-exit-3.0.3" sources."slugify-1.4.5" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - sources."string-width-4.2.0" - sources."string_decoder-1.3.0" - sources."strip-ansi-6.0.0" - (sources."styled-components-5.1.1" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."@emotion/stylis-0.8.5" - sources."@emotion/unitless-0.7.5" + sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."stylis-3.5.4" - sources."stylis-rule-sheet-0.0.10" + sources."string_decoder-1.3.0" + sources."strip-ansi-4.0.0" + sources."strip-eof-1.0.0" + sources."styled-components-5.1.1" sources."supports-color-5.5.0" - sources."swagger2openapi-6.2.2" + (sources."swagger2openapi-5.4.0" // { + dependencies = [ + sources."yargs-12.0.5" + ]; + }) sources."timers-browserify-2.0.11" sources."tiny-emitter-2.1.0" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" - sources."touch-2.0.2" - sources."tslib-2.0.0" + sources."tslib-2.0.1" sources."tty-browserify-0.0.0" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.2" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) - sources."url-template-2.0.8" (sources."util-0.11.1" // { dependencies = [ sources."inherits-2.0.3" @@ -77203,20 +79150,41 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" + sources."which-1.3.1" sources."which-module-2.0.0" sources."wordwrap-1.0.0" - (sources."wrap-ansi-6.2.0" // { + (sources."wrap-ansi-2.1.0" // { dependencies = [ - sources."ansi-styles-4.2.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" + sources."ansi-regex-2.1.1" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" ]; }) + sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yaml-1.10.0" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + (sources."yargs-15.4.1" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.2.1" + sources."cliui-6.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."find-up-4.1.0" + sources."get-caller-file-2.0.5" + sources."is-fullwidth-code-point-3.0.0" + sources."locate-path-5.0.0" + sources."p-locate-4.1.0" + sources."path-exists-4.0.0" + sources."require-main-filename-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" + sources."wrap-ansi-6.2.0" + sources."yargs-parser-18.1.3" + ]; + }) + sources."yargs-parser-11.1.1" ]; buildInputs = globalBuildInputs; meta = { @@ -77249,10 +79217,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.23.0"; + version = "2.26.5"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.23.0.tgz"; - sha512 = "vLNmZFUGVwrnqNAJ/BvuLk1MtWzu4IuoqsH9UWK5AIdO3rt8/CSiJNvPvCIvfzrbNsqKbNzPAG1V2O4eTe2XZg=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.26.5.tgz"; + sha512 = "rCyFG3ZtQdnn9YwfuAVH0l/Om34BdO5lwCA0W6Hq+bNB21dVEBbCRxhaHOmu1G7OBFDWytbzAC104u7rxHwGjA=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -77293,25 +79261,25 @@ in sources."@types/node-12.7.12" sources."@types/node-fetch-2.5.7" sources."@types/resolve-1.17.1" - sources."@types/vscode-1.47.0" - (sources."@typescript-eslint/eslint-plugin-3.8.0" // { + sources."@types/vscode-1.48.0" + (sources."@typescript-eslint/eslint-plugin-3.10.1" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/experimental-utils-3.8.0" - sources."@typescript-eslint/parser-3.8.0" - sources."@typescript-eslint/types-3.8.0" - (sources."@typescript-eslint/typescript-estree-3.8.0" // { + sources."@typescript-eslint/experimental-utils-3.10.1" + sources."@typescript-eslint/parser-3.10.1" + sources."@typescript-eslint/types-3.10.1" + (sources."@typescript-eslint/typescript-estree-3.10.1" // { dependencies = [ sources."semver-7.3.2" ]; }) - sources."@typescript-eslint/visitor-keys-3.8.0" + sources."@typescript-eslint/visitor-keys-3.10.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" sources."agent-base-4.3.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-colors-4.1.1" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" @@ -77341,7 +79309,7 @@ in ]; }) sources."cheerio-1.0.0-rc.3" - sources."chokidar-3.3.1" + sources."chokidar-3.4.2" (sources."cliui-5.0.0" // { dependencies = [ sources."ansi-regex-4.1.0" @@ -77387,7 +79355,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.6.0" // { + (sources."eslint-7.7.0" // { dependencies = [ sources."semver-7.3.2" ]; @@ -77395,11 +79363,11 @@ in sources."eslint-scope-5.1.0" sources."eslint-utils-2.1.0" sources."eslint-visitor-keys-1.3.0" - sources."espree-7.2.0" + sources."espree-7.3.0" sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -77412,7 +79380,7 @@ in sources."fd-slicer-1.1.0" sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" - sources."find-up-4.1.0" + sources."find-up-5.0.0" sources."flat-4.1.0" sources."flat-cache-2.0.1" sources."flatted-2.0.2" @@ -77475,13 +79443,9 @@ in sources."leven-3.1.0" sources."levn-0.4.1" sources."linkify-it-2.2.0" - sources."locate-path-5.0.0" - sources."lodash-4.17.19" - (sources."log-symbols-3.0.0" // { - dependencies = [ - sources."chalk-2.4.2" - ]; - }) + sources."locate-path-6.0.0" + sources."lodash-4.17.20" + sources."log-symbols-4.0.0" sources."lru-cache-4.1.5" sources."magic-string-0.25.7" (sources."markdown-it-10.0.0" // { @@ -77496,11 +79460,11 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.1.1" // { + (sources."mocha-8.1.2" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-4.1.1" + sources."escape-string-regexp-4.0.0" sources."has-flag-4.0.0" - sources."js-yaml-3.13.1" sources."strip-json-comments-3.0.1" sources."supports-color-7.1.0" ]; @@ -77520,8 +79484,8 @@ in sources."os-homedir-1.0.2" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" + sources."p-limit-3.0.2" + sources."p-locate-5.0.0" sources."p-try-2.2.0" sources."parent-module-1.0.1" (sources."parse-semver-1.1.1" // { @@ -77544,14 +79508,14 @@ in sources."randombytes-2.1.0" sources."read-1.0.7" sources."readable-stream-3.6.0" - sources."readdirp-3.3.0" + sources."readdirp-3.4.0" sources."regexpp-3.1.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."resolve-1.17.0" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.23.0" + sources."rollup-2.26.5" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-4.0.0" @@ -77578,7 +79542,7 @@ in sources."text-table-0.2.0" sources."tmp-0.0.29" sources."to-regex-range-5.0.1" - sources."tslib-2.0.0" + sources."tslib-2.0.1" (sources."tsutils-3.17.1" // { dependencies = [ sources."tslib-1.13.0" @@ -77596,7 +79560,7 @@ in sources."url-join-1.1.0" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.1.1" - (sources."vsce-1.77.0" // { + (sources."vsce-1.79.3" // { dependencies = [ sources."chalk-2.4.2" sources."semver-5.7.1" @@ -77632,6 +79596,7 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" ]; @@ -77641,6 +79606,7 @@ in dependencies = [ sources."find-up-3.0.0" sources."locate-path-3.0.0" + sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."path-exists-3.0.0" sources."yargs-14.2.3" @@ -77666,13 +79632,13 @@ in sha1 = "c8fa1fffb8258ce68adf75df73f90fbb6f23d198"; }; dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sdk-1.18.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" @@ -77748,7 +79714,7 @@ in sources."node-wsfederation-0.1.1" sources."oauth-https://github.com/ciaranj/node-oauth/tarball/master" sources."oauth-sign-0.9.0" - (sources."openid-2.0.6" // { + (sources."openid-2.0.7" // { dependencies = [ sources."qs-6.5.2" sources."request-2.88.2" @@ -77916,10 +79882,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "1.78.1"; + version = "1.80.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-1.78.1.tgz"; - sha512 = "Dw3x2+fnZ+Tgb3nGTYfGe78AIT/AOda8gttwKAoCUPScNDoF8Hjy8YvLuqLQg/o7daWouFUCHQ9Mv0ehN/Qazg=="; + url = "https://registry.npmjs.org/serverless/-/serverless-1.80.0.tgz"; + sha512 = "gIHWDwW5ZkKD+WKMhVUPAmhn95Tk8vFru7feYpbJ4WZgzz/M0HkHpph3rA7YxiWBJChghaLXO7HwvbnxJ1nvCw=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -77939,7 +79905,7 @@ in sources."@protobufjs/utf8-1.1.0" sources."@serverless/cli-1.5.2" sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-2.34.1" // { + (sources."@serverless/components-2.34.7" // { dependencies = [ sources."globby-10.0.2" sources."semver-7.3.2" @@ -77950,11 +79916,11 @@ in sources."fs-extra-7.0.1" ]; }) - sources."@serverless/enterprise-plugin-3.7.0" + sources."@serverless/enterprise-plugin-3.7.1" sources."@serverless/event-mocks-1.1.1" sources."@serverless/inquirer-1.1.2" - sources."@serverless/platform-client-1.1.1" - (sources."@serverless/platform-client-china-1.0.32" // { + sources."@serverless/platform-client-1.1.7" + (sources."@serverless/platform-client-china-1.0.34" // { dependencies = [ sources."archiver-4.0.2" sources."async-3.2.0" @@ -77971,17 +79937,18 @@ in }) sources."@serverless/template-1.1.3" sources."@serverless/utils-1.2.0" - sources."@serverless/utils-china-0.1.22" + sources."@serverless/utils-china-0.1.27" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-0.2.17" sources."@types/caseless-0.12.2" sources."@types/chalk-2.2.0" + sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" - sources."@types/lodash-4.14.158" + sources."@types/lodash-4.14.160" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/object-assign-4.0.30" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" @@ -77989,7 +79956,8 @@ in sources."adm-zip-0.4.16" sources."after-0.8.2" sources."agent-base-5.1.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" + sources."ajv-keywords-3.5.2" (sources."ansi-align-3.0.0" // { dependencies = [ sources."string-width-3.1.0" @@ -77997,7 +79965,12 @@ in }) sources."ansi-escapes-4.3.1" sources."ansi-regex-4.1.0" - sources."ansi-styles-3.2.1" + (sources."ansi-styles-4.2.1" // { + dependencies = [ + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."anymatch-3.1.1" (sources."archive-type-4.0.0" // { dependencies = [ @@ -78006,7 +79979,6 @@ in }) (sources."archiver-3.1.1" // { dependencies = [ - sources."async-2.6.3" (sources."compress-commons-2.1.1" // { dependencies = [ sources."readable-stream-2.3.7" @@ -78037,11 +80009,11 @@ in sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."assign-symbols-1.0.0" - sources."async-1.5.2" + sources."async-2.6.3" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.726.0" // { + (sources."aws-sdk-2.740.0" // { dependencies = [ sources."buffer-4.9.2" sources."isarray-1.0.0" @@ -78049,7 +80021,7 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."axios-0.19.2" sources."backo2-1.0.2" sources."balanced-match-1.0.0" @@ -78063,7 +80035,7 @@ in sources."bcrypt-pbkdf-1.0.2" sources."better-assert-1.0.2" sources."binary-extensions-2.1.0" - sources."bl-4.0.2" + sources."bl-4.0.3" sources."blob-0.0.5" sources."bluebird-3.7.2" (sources."boxen-3.2.0" // { @@ -78084,7 +80056,7 @@ in sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -78095,7 +80067,13 @@ in sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."caw-2.0.1" - sources."chalk-2.4.2" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) sources."chardet-0.7.0" (sources."child-process-ext-2.1.1" // { dependencies = [ @@ -78103,7 +80081,7 @@ in sources."semver-5.7.1" ]; }) - sources."chokidar-3.4.1" + sources."chokidar-3.4.2" sources."ci-info-1.6.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -78113,7 +80091,6 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-buffer-1.1.6" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" @@ -78155,7 +80132,7 @@ in }) sources."concat-map-0.0.1" sources."config-chain-1.1.12" - sources."configstore-3.1.2" + sources."configstore-3.1.5" (sources."content-disposition-0.5.3" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -78175,7 +80152,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.8.32" + sources."dayjs-1.8.34" sources."debug-3.1.0" sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" @@ -78217,7 +80194,7 @@ in sources."diagnostics-1.1.1" sources."dijkstrajs-1.0.1" sources."dir-glob-3.0.1" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."dot-qs-0.2.0" sources."dotenv-8.2.0" (sources."download-7.1.0" // { @@ -78289,7 +80266,6 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-buffer-1.1.6" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" @@ -78336,7 +80312,7 @@ in ]; }) sources."find-requires-1.0.0" - sources."flat-5.0.0" + sources."flat-5.0.2" sources."follow-redirects-1.5.10" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -78384,7 +80360,6 @@ in }) sources."glob-parent-3.1.0" sources."ignore-4.0.6" - sources."is-buffer-1.1.6" sources."is-glob-3.1.0" (sources."is-number-3.0.0" // { dependencies = [ @@ -78409,13 +80384,12 @@ in sources."har-validator-5.1.5" sources."has-binary2-1.0.3" sources."has-cors-1.1.0" - sources."has-flag-3.0.0" + sources."has-flag-4.0.0" sources."has-symbol-support-x-1.4.2" sources."has-to-string-tag-x-1.4.1" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ - sources."is-buffer-1.1.6" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -78449,17 +80423,16 @@ in sources."figures-2.0.0" ]; }) - (sources."inquirer-autocomplete-prompt-1.0.2" // { + (sources."inquirer-autocomplete-prompt-1.1.0" // { dependencies = [ - sources."ansi-escapes-3.2.0" - sources."figures-2.0.0" + sources."chalk-4.1.0" ]; }) sources."into-stream-3.1.0" sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" + sources."is-buffer-1.1.6" sources."is-ci-1.2.1" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" @@ -78549,7 +80522,7 @@ in ]; }) sources."lie-3.3.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.defaults-4.2.0" sources."lodash.difference-4.5.0" sources."lodash.flatten-4.4.0" @@ -78619,7 +80592,6 @@ in dependencies = [ sources."define-property-0.2.5" sources."is-accessor-descriptor-0.1.6" - sources."is-buffer-1.1.6" sources."is-data-descriptor-0.1.4" (sources."is-descriptor-0.1.6" // { dependencies = [ @@ -78636,7 +80608,7 @@ in sources."once-1.4.0" sources."one-time-0.0.4" sources."onetime-2.0.1" - (sources."open-7.1.0" // { + (sources."open-7.2.0" // { dependencies = [ sources."is-docker-2.1.1" ]; @@ -78755,7 +80727,6 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-buffer-1.1.6" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" @@ -78773,7 +80744,6 @@ in }) (sources."snapdragon-util-3.0.1" // { dependencies = [ - sources."is-buffer-1.1.6" sources."kind-of-3.2.2" ]; }) @@ -78791,7 +80761,7 @@ in sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" sources."split-string-3.1.0" - sources."split2-3.1.1" + sources."split2-3.2.2" sources."sprintf-js-1.0.3" sources."sprintf-kit-2.0.0" sources."sshpk-1.16.1" @@ -78804,7 +80774,6 @@ in sources."kind-of-3.2.2" ]; }) - sources."is-buffer-1.1.6" (sources."is-data-descriptor-0.1.4" // { dependencies = [ sources."kind-of-3.2.2" @@ -78840,7 +80809,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."supports-color-5.5.0" + sources."supports-color-7.1.0" (sources."tabtab-3.0.2" // { dependencies = [ sources."debug-4.2.0" @@ -78858,7 +80827,6 @@ in sources."to-buffer-1.1.1" (sources."to-object-path-0.3.0" // { dependencies = [ - sources."is-buffer-1.1.6" sources."kind-of-3.2.2" ]; }) @@ -78872,7 +80840,7 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-2.0.0" + sources."type-2.1.0" sources."type-fest-0.11.0" sources."unbzip2-stream-1.4.3" sources."union-value-1.0.1" @@ -78913,14 +80881,10 @@ in sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."verror-1.10.0" - sources."whatwg-fetch-3.3.1" + sources."whatwg-fetch-3.4.0" sources."which-1.3.1" sources."widest-line-2.0.1" - (sources."winston-3.2.1" // { - dependencies = [ - sources."async-2.6.3" - ]; - }) + sources."winston-3.2.1" (sources."winston-transport-4.4.0" // { dependencies = [ sources."isarray-1.0.0" @@ -78968,14 +80932,14 @@ in sources."CSSwhat-0.4.7" sources."accepts-1.3.7" sources."after-0.8.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."array-flatten-1.1.1" sources."arraybuffer.slice-0.0.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" @@ -79010,7 +80974,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.2.1" sources."domutils-1.4.3" - sources."duplexer-0.1.1" + sources."duplexer-0.1.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" @@ -79302,7 +81266,7 @@ in sources."isarray-1.0.0" sources."isobject-3.0.1" sources."kind-of-6.0.3" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."micromatch-3.1.10" @@ -79582,54 +81546,53 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.369.3"; + version = "1.385.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.369.3.tgz"; - sha512 = "I54pQeG7i/fLQfBQYK+hL/Yr3g9FPuSnVWKroRFdEaB6vfNSRBA2nd3cKPz9iTVm8v72dSZvixsvR6s+7iDi6g=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.385.0.tgz"; + sha512 = "sh+/Lt7764pWzuiXke+ICuBG88QLX9ZrCYmCJXJ9ZU0D9P+Uo25bVqE+OyJIhR4et6VRt60ZQim0iferz6K0mA=="; }; dependencies = [ sources."@arcanis/slice-ansi-1.0.2" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" - sources."@sindresorhus/is-3.1.0" + sources."@sindresorhus/is-2.1.1" (sources."@snyk/cli-interface-2.8.1" // { dependencies = [ (sources."@snyk/dep-graph-1.19.0" // { dependencies = [ - sources."tslib-2.0.0" + sources."tslib-2.0.1" ]; }) ]; }) - (sources."@snyk/cocoapods-lockfile-parser-3.4.0" // { + (sources."@snyk/cocoapods-lockfile-parser-3.5.1" // { dependencies = [ - sources."@snyk/dep-graph-1.18.4" - sources."semver-7.3.2" + sources."@snyk/ruby-semver-3.0.0" ]; }) sources."@snyk/composer-lockfile-parser-1.4.0" - (sources."@snyk/dep-graph-1.18.3" // { + (sources."@snyk/dep-graph-1.19.3" // { dependencies = [ - sources."semver-7.3.2" + sources."@snyk/graphlib-2.1.9-patch.2" ]; }) sources."@snyk/docker-registry-v2-client-1.13.5" sources."@snyk/gemfile-1.2.0" sources."@snyk/graphlib-2.1.9-patch" sources."@snyk/inquirer-6.2.2-patch" - sources."@snyk/java-call-graph-builder-1.12.3" + sources."@snyk/java-call-graph-builder-1.13.1" sources."@snyk/lodash-4.17.15-patch" sources."@snyk/rpm-parser-2.0.0" sources."@snyk/ruby-semver-2.2.0" - (sources."@snyk/snyk-cocoapods-plugin-2.3.0" // { + (sources."@snyk/snyk-cocoapods-plugin-2.5.0" // { dependencies = [ - (sources."@snyk/cli-interface-1.5.0" // { + (sources."@snyk/cli-interface-2.6.1" // { dependencies = [ sources."tslib-1.13.0" ]; }) - sources."tslib-2.0.0" + sources."tslib-2.0.1" ]; }) (sources."@snyk/snyk-docker-pull-3.2.0" // { @@ -79702,12 +81665,16 @@ in sources."array-union-2.1.0" sources."asap-2.0.6" sources."asn1-0.2.4" - sources."ast-types-0.13.3" + (sources."ast-types-0.14.1" // { + dependencies = [ + sources."tslib-2.0.1" + ]; + }) sources."async-1.5.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" - (sources."bl-4.0.2" // { + (sources."bl-4.0.3" // { dependencies = [ sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" @@ -79739,7 +81706,7 @@ in sources."cacheable-lookup-5.0.3" (sources."cacheable-request-7.0.1" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" ]; }) sources."camelcase-2.1.1" @@ -79803,7 +81770,7 @@ in sources."string_decoder-1.3.0" ]; }) - sources."dockerfile-ast-0.0.19" + sources."dockerfile-ast-0.0.30" sources."dot-prop-5.2.0" sources."dotnet-deps-parser-4.10.0" sources."duplexer3-0.1.4" @@ -79849,7 +81816,7 @@ in sources."glob-parent-5.1.1" sources."global-dirs-2.0.1" sources."globby-10.0.2" - sources."got-11.5.1" + sources."got-11.4.0" sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" sources."gunzip-maybe-1.4.2" @@ -79926,6 +81893,7 @@ in sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lodash.constant-3.0.0" + sources."lodash.escaperegexp-4.1.2" sources."lodash.filter-4.6.0" sources."lodash.flatmap-4.5.0" sources."lodash.flatten-4.4.0" @@ -79945,6 +81913,7 @@ in sources."lodash.topairs-4.3.0" sources."lodash.transform-4.6.0" sources."lodash.union-4.6.0" + sources."lodash.uniq-4.5.0" sources."lodash.values-4.3.0" sources."logic-solver-2.0.1" sources."lowercase-keys-2.0.0" @@ -79979,7 +81948,7 @@ in sources."object.assign-4.1.0" sources."once-1.4.0" sources."onetime-2.0.1" - sources."open-7.1.0" + sources."open-7.2.0" sources."optionator-0.8.3" sources."os-locale-1.4.0" sources."os-name-3.1.0" @@ -80002,7 +81971,7 @@ in }) sources."decompress-response-3.3.0" sources."defer-to-connect-1.1.3" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."got-9.6.0" sources."json-buffer-3.0.0" sources."keyv-3.1.0" @@ -80070,7 +82039,12 @@ in sources."slash-3.0.0" sources."smart-buffer-4.1.0" sources."snyk-config-3.1.0" - (sources."snyk-docker-plugin-3.16.0" // { + (sources."snyk-cpp-plugin-1.4.0" // { + dependencies = [ + sources."tslib-2.0.1" + ]; + }) + (sources."snyk-docker-plugin-3.18.1" // { dependencies = [ sources."rimraf-3.0.2" (sources."snyk-nodejs-lockfile-parser-1.22.0" // { @@ -80086,11 +82060,6 @@ in sources."snyk-go-parser-1.4.1" (sources."snyk-go-plugin-1.16.0" // { dependencies = [ - (sources."@snyk/dep-graph-1.19.3" // { - dependencies = [ - sources."@snyk/graphlib-2.1.9-patch.2" - ]; - }) sources."rimraf-3.0.2" sources."tmp-0.2.0" ]; @@ -80101,7 +82070,7 @@ in dependencies = [ (sources."@snyk/dep-graph-1.19.0" // { dependencies = [ - sources."tslib-2.0.0" + sources."tslib-2.0.1" ]; }) sources."tslib-1.13.0" @@ -80115,17 +82084,17 @@ in sources."rimraf-3.0.2" sources."supports-color-7.1.0" sources."tmp-0.2.1" - sources."tslib-2.0.0" + sources."tslib-2.0.1" ]; }) sources."snyk-module-3.1.0" - (sources."snyk-mvn-plugin-2.18.2" // { + (sources."snyk-mvn-plugin-2.19.1" // { dependencies = [ sources."tmp-0.1.0" sources."tslib-1.11.1" ]; }) - sources."snyk-nodejs-lockfile-parser-1.26.3" + sources."snyk-nodejs-lockfile-parser-1.27.0" (sources."snyk-nuget-plugin-1.18.1" // { dependencies = [ sources."jszip-3.3.0" @@ -80255,7 +82224,7 @@ in sources."underscore-1.10.2" sources."unique-string-2.0.0" sources."unpipe-1.0.0" - (sources."update-notifier-4.1.0" // { + (sources."update-notifier-4.1.1" // { dependencies = [ sources."ansi-styles-4.2.1" sources."chalk-3.0.0" @@ -80280,7 +82249,7 @@ in ]; }) sources."window-size-0.1.4" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" sources."word-wrap-1.2.3" (sources."wrap-ansi-5.1.0" // { dependencies = [ @@ -80414,7 +82383,7 @@ in sources."clone-1.0.4" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."configstore-3.1.2" + sources."configstore-3.1.5" sources."create-error-class-3.0.2" sources."cross-spawn-5.1.0" sources."crypto-random-string-1.0.0" @@ -80428,7 +82397,7 @@ in }) sources."deep-extend-0.6.0" sources."defaults-1.0.3" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."draftlog-1.0.12" sources."duplexer3-0.1.4" sources."error-ex-1.3.2" @@ -80586,7 +82555,7 @@ in sources."async-each-1.0.3" sources."async-single-1.0.5" sources."atob-2.1.2" - (sources."atomic-file-2.0.1" // { + (sources."atomic-file-2.1.1" // { dependencies = [ sources."flumecodec-0.0.1" sources."level-codec-6.2.0" @@ -80608,21 +82577,12 @@ in sources."binary-extensions-1.13.1" sources."binary-search-1.3.6" sources."bindings-1.5.0" - (sources."bl-0.8.2" // { - dependencies = [ - sources."isarray-0.0.1" - sources."readable-stream-1.0.34" - sources."string_decoder-0.10.31" - ]; - }) sources."blake2s-1.1.0" sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."broadcast-stream-0.2.2" sources."buffer-5.6.0" sources."buffer-from-1.1.1" - sources."bytewise-1.1.0" - sources."bytewise-core-1.2.3" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" @@ -80636,7 +82596,7 @@ in sources."character-entities-legacy-1.1.4" sources."character-reference-invalid-1.1.4" sources."charwise-3.0.1" - sources."chloride-2.2.14" + sources."chloride-2.3.0" sources."chloride-test-1.2.4" sources."chokidar-1.7.0" (sources."class-utils-0.3.6" // { @@ -80814,7 +82774,7 @@ in sources."he-0.5.0" sources."heap-0.2.6" sources."hoox-0.0.1" - sources."idb-kv-store-4.4.0" + sources."idb-kv-store-4.5.0" sources."ieee754-1.1.13" sources."immediate-3.2.3" sources."increment-buffer-1.0.1" @@ -80859,6 +82819,7 @@ in sources."is-glob-2.0.1" sources."is-hexadecimal-1.0.4" sources."is-map-2.0.1" + sources."is-negative-zero-2.0.0" sources."is-number-2.1.0" sources."is-number-object-1.0.4" (sources."is-plain-object-2.0.4" // { @@ -80874,7 +82835,7 @@ in sources."is-symbol-1.0.3" sources."is-typed-array-1.1.3" sources."is-typedarray-1.0.0" - sources."is-valid-domain-0.0.14" + sources."is-valid-domain-0.0.15" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -80896,27 +82857,6 @@ in sources."level-js-4.0.2" sources."level-packager-5.1.1" sources."level-post-1.0.7" - (sources."level-sublevel-6.6.5" // { - dependencies = [ - (sources."abstract-leveldown-0.12.4" // { - dependencies = [ - sources."xtend-3.0.0" - ]; - }) - sources."deferred-leveldown-0.2.0" - sources."isarray-0.0.1" - (sources."levelup-0.19.1" // { - dependencies = [ - sources."xtend-3.0.0" - ]; - }) - sources."ltgt-2.1.3" - sources."prr-0.0.0" - sources."readable-stream-1.0.34" - sources."semver-5.1.1" - sources."string_decoder-0.10.31" - ]; - }) sources."level-supports-1.0.1" (sources."leveldown-5.6.0" // { dependencies = [ @@ -80961,6 +82901,7 @@ in sources."multiserver-3.6.0" sources."multiserver-address-1.0.1" sources."multiserver-scopes-1.0.0" + sources."mutexify-1.3.0" sources."muxrpc-6.5.0" sources."muxrpc-usage-2.1.0" sources."muxrpc-validation-3.0.2" @@ -80980,7 +82921,7 @@ in }) sources."napi-macros-2.0.0" sources."ncp-2.0.0" - sources."nearley-2.19.5" + sources."nearley-2.19.6" sources."nice-try-1.0.5" sources."node-gyp-build-4.2.3" sources."non-private-ip-1.4.4" @@ -81208,7 +83149,11 @@ in sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" sources."shellsubstitute-1.2.0" - sources."side-channel-1.0.2" + (sources."side-channel-1.0.3" // { + dependencies = [ + sources."es-abstract-1.18.0-next.0" + ]; + }) sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -81246,7 +83191,7 @@ in ]; }) sources."sodium-chloride-1.1.2" - sources."sodium-native-2.4.9" + sources."sodium-native-3.2.0" sources."source-map-0.5.7" sources."source-map-resolve-0.5.3" sources."source-map-url-0.4.0" @@ -81270,7 +83215,7 @@ in sources."atomic-file-1.1.5" ]; }) - (sources."ssb-invite-2.1.5" // { + (sources."ssb-invite-2.1.6" // { dependencies = [ sources."abstract-leveldown-6.2.3" sources."level-6.0.1" @@ -81359,8 +83304,6 @@ in sources."tweetnacl-auth-0.3.1" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."typewise-1.0.3" - sources."typewise-core-1.2.0" sources."typewiselite-1.0.0" sources."uint48be-2.0.1" sources."ultron-1.0.2" @@ -81482,7 +83425,7 @@ in sources."semver-5.0.3" ]; }) - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."align-text-0.1.4" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" @@ -81499,13 +83442,13 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.726.0" // { + (sources."aws-sdk-2.740.0" // { dependencies = [ sources."uuid-3.3.2" ]; }) sources."aws-sign2-0.6.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" @@ -81684,7 +83627,7 @@ in sources."fd-slicer-1.1.0" sources."finalhandler-1.1.2" sources."find-up-3.0.0" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."forever-agent-0.6.1" sources."form-data-2.1.4" sources."formidable-1.2.2" @@ -81734,7 +83677,7 @@ in }) (sources."http-proxy-1.18.1" // { dependencies = [ - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.6" ]; }) sources."http-signature-1.1.1" @@ -81812,7 +83755,7 @@ in }) sources."load-json-file-1.1.0" sources."locate-path-3.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.get-4.4.2" sources."lodash.isequal-4.5.0" sources."long-2.4.0" @@ -81885,7 +83828,7 @@ in sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" - sources."openid-2.0.6" + sources."openid-2.0.7" sources."options-0.0.6" sources."optjs-3.2.2" sources."os-locale-3.1.0" @@ -82453,7 +84396,7 @@ in sources."component-emitter-1.3.0" sources."concat-map-0.0.1" sources."concat-stream-1.6.2" - sources."configstore-3.1.2" + sources."configstore-3.1.5" sources."connect-3.7.0" sources."content-type-1.0.4" sources."cookiejar-2.1.2" @@ -82484,7 +84427,7 @@ in ]; }) sources."diff-1.4.0" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" @@ -82552,7 +84495,7 @@ in sources."graceful-fs-4.2.4" (sources."graphlib-2.1.8" // { dependencies = [ - sources."lodash-4.17.19" + sources."lodash-4.17.20" ]; }) sources."growl-1.9.2" @@ -82624,7 +84567,7 @@ in sources."json-refs-2.1.7" (sources."json-schema-deref-sync-0.6.0" // { dependencies = [ - sources."lodash-4.17.19" + sources."lodash-4.17.20" ]; }) sources."jsonfile-2.4.0" @@ -82891,7 +84834,7 @@ in sources."swagger-editor-2.10.5" (sources."swagger-test-templates-1.6.0" // { dependencies = [ - sources."lodash-4.17.19" + sources."lodash-4.17.20" ]; }) (sources."swagger-tools-0.9.16" // { @@ -82916,7 +84859,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.2" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -82983,7 +84926,7 @@ in sha256 = "886069ecc5eedf0371b948e8ff66e7f2943c85fe7cfdaa7183e1a3572d55852b"; }; dependencies = [ - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" @@ -82992,7 +84935,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" (sources."bcrypt-pbkdf-1.0.2" // { dependencies = [ sources."tweetnacl-0.14.5" @@ -83251,7 +85194,7 @@ in sources."levn-0.3.0" sources."load-json-file-1.1.0" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."log-symbols-1.0.2" sources."map-like-2.0.0" sources."markdown-escapes-1.0.4" @@ -83438,10 +85381,10 @@ in textlint-rule-alex = nodeEnv.buildNodePackage { name = "textlint-rule-alex"; packageName = "textlint-rule-alex"; - version = "2.1.0"; + version = "3.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-2.1.0.tgz"; - sha512 = "+ctxNHWJNfO7IXMj+D4XOBHL1Gj7/vnroCjw8wByPxpCngfr/fmMYyaJ5H5v9dIQjY+WuPmpAp3xM4zkZqjHJQ=="; + url = "https://registry.npmjs.org/textlint-rule-alex/-/textlint-rule-alex-3.0.0.tgz"; + sha512 = "z/Xo1WHxAn7eueUbRLXoMNew+R3dzGENPG/yiCt/KT2WgAfRuQ7GeF855kLcnCCqdTnl6W7sYq8TKy+/DLpiqQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -83451,23 +85394,34 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.3.4" sources."@textlint/types-1.4.5" + sources."@types/color-name-1.1.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" + sources."@types/parse5-5.0.3" sources."@types/unist-2.0.3" - sources."alex-8.2.0" - sources."ansi-align-3.0.0" + sources."alex-9.0.1" + (sources."ansi-align-3.0.0" // { + dependencies = [ + sources."string-width-3.1.0" + ]; + }) sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."array-iterate-1.1.4" - sources."arrify-2.0.1" + sources."arrify-1.0.1" sources."bail-1.0.5" sources."balanced-match-1.0.0" sources."boundary-1.0.1" - (sources."boxen-3.2.0" // { + (sources."boxen-4.2.0" // { dependencies = [ - sources."camelcase-5.3.1" - sources."type-fest-0.3.1" + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + sources."type-fest-0.8.1" ]; }) sources."brace-expansion-1.1.11" @@ -83475,20 +85429,17 @@ in sources."buffer-from-1.1.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" sources."pump-3.0.0" ]; }) - sources."camelcase-6.0.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."ccount-1.0.5" 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."ci-info-2.0.0" @@ -83505,11 +85456,10 @@ in sources."string_decoder-1.3.0" ]; }) - sources."configstore-4.0.0" + sources."configstore-5.0.1" sources."core-util-is-1.0.2" - sources."cross-spawn-5.1.0" - sources."crypto-random-string-1.0.0" - sources."cuss-1.20.0" + sources."crypto-random-string-2.0.0" + sources."cuss-1.21.0" sources."debug-4.2.0" sources."decamelize-1.2.0" (sources."decamelize-keys-1.1.0" // { @@ -83520,44 +85470,43 @@ in sources."decompress-response-3.3.0" sources."deep-extend-0.6.0" sources."defer-to-connect-1.1.3" - sources."dot-prop-4.2.0" - sources."duplexer-0.1.1" + sources."dot-prop-5.2.0" + sources."duplexer-0.1.2" sources."duplexer3-0.1.4" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" + sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."event-stream-3.1.7" - sources."execa-0.7.0" sources."extend-3.0.2" sources."fault-1.0.4" + sources."figgy-pudding-3.5.2" sources."figures-3.2.0" sources."find-up-4.1.0" - sources."fn-name-2.0.1" sources."format-0.2.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" - sources."get-stream-3.0.0" - sources."git-diff-tree-1.1.0" - sources."git-spawned-stream-1.0.1" - sources."glob-7.1.6" - sources."global-dirs-0.1.1" - (sources."got-9.6.0" // { + (sources."get-stream-4.1.0" // { dependencies = [ - sources."get-stream-4.1.0" sources."pump-3.0.0" ]; }) + sources."git-diff-tree-1.1.0" + sources."git-spawned-stream-1.0.1" + sources."glob-7.1.6" + sources."global-dirs-2.0.1" + sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."hard-rejection-2.1.0" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" - sources."hast-util-from-parse5-5.0.3" + sources."hast-util-from-parse5-6.0.0" sources."hast-util-has-property-1.0.4" sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.0.4" + sources."hast-util-is-element-1.1.0" sources."hast-util-parse-selector-2.2.4" sources."hast-util-phrasing-1.0.5" sources."hast-util-to-nlcst-1.2.7" @@ -83574,6 +85523,7 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."is-alphabetical-1.0.4" + sources."is-alphanumeric-1.0.0" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-buffer-2.0.4" @@ -83582,64 +85532,71 @@ in sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" sources."is-hexadecimal-1.0.4" - sources."is-hidden-1.1.3" - sources."is-installed-globally-0.1.0" - sources."is-npm-3.0.0" - sources."is-obj-1.0.1" - sources."is-object-1.0.1" - sources."is-path-inside-1.0.1" + sources."is-installed-globally-0.3.2" + sources."is-npm-4.0.0" + sources."is-obj-2.0.0" + sources."is-path-inside-3.0.2" sources."is-plain-obj-1.1.0" - sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" sources."is-whitespace-character-1.0.4" sources."is-word-character-1.0.4" sources."is-yarn-global-0.3.0" sources."isarray-0.0.1" - sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."json-buffer-3.0.0" - sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."latest-version-5.1.0" + (sources."libnpmconfig-1.2.1" // { + dependencies = [ + sources."find-up-3.0.0" + sources."locate-path-3.0.0" + sources."p-locate-3.0.0" + sources."path-exists-3.0.0" + ]; + }) sources."limit-spawn-0.0.3" sources."lines-and-columns-1.1.6" - sources."load-plugin-2.3.1" + sources."load-plugin-3.0.0" sources."locate-path-5.0.0" sources."lodash.difference-4.5.0" sources."lodash.intersection-4.4.0" + sources."longest-streak-2.0.4" sources."lowercase-keys-1.0.1" - sources."lru-cache-4.1.5" - sources."make-dir-1.3.0" + (sources."make-dir-3.1.0" // { + dependencies = [ + sources."semver-6.3.0" + ]; + }) sources."map-obj-4.1.0" sources."map-stream-0.1.0" sources."markdown-escapes-1.0.4" + sources."markdown-table-2.0.0" sources."mdast-comment-marker-1.1.2" - sources."mdast-util-to-nlcst-3.2.3" - sources."meow-7.0.1" + sources."mdast-util-compact-2.0.1" + (sources."mdast-util-to-nlcst-4.0.0" // { + dependencies = [ + sources."vfile-location-3.1.0" + ]; + }) + sources."meow-7.1.0" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minimist-options-4.1.0" // { - dependencies = [ - sources."arrify-1.0.1" - ]; - }) + sources."minimist-options-4.1.0" sources."ms-2.1.2" sources."nlcst-is-literal-1.2.1" sources."nlcst-normalize-2.1.4" - sources."nlcst-search-1.5.1" + sources."nlcst-search-2.0.0" sources."nlcst-to-string-2.0.4" sources."normalize-package-data-2.5.0" sources."normalize-url-4.5.0" - sources."npm-prefix-1.2.0" - sources."npm-run-path-2.0.2" sources."object-keys-1.1.1" sources."once-1.4.0" - sources."os-homedir-1.0.2" sources."p-cancelable-1.1.0" - sources."p-finally-1.0.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -83649,24 +85606,21 @@ in ]; }) sources."parse-english-4.1.3" - sources."parse-entities-1.2.2" - sources."parse-json-5.0.1" + sources."parse-entities-2.0.0" + sources."parse-json-5.1.0" sources."parse-latin-4.2.1" - sources."parse5-5.1.1" + sources."parse5-6.0.1" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."path-is-inside-1.0.2" - sources."path-key-2.0.1" sources."path-parse-1.0.6" sources."pause-stream-0.0.11" - sources."pify-3.0.0" sources."pluralize-8.0.0" sources."prepend-http-2.0.0" sources."process-nextick-args-1.0.7" sources."property-information-5.5.0" - sources."pseudomap-1.0.2" sources."pump-1.0.3" sources."pump-chain-1.0.0" + sources."pupa-2.0.1" sources."quick-lru-4.0.1" sources."quotation-1.1.3" sources."rc-1.2.8" @@ -83684,32 +85638,33 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" - sources."rehype-parse-6.0.2" + sources."rehype-parse-7.0.1" sources."rehype-retext-2.0.4" - sources."remark-frontmatter-1.3.3" - sources."remark-message-control-5.0.0" - sources."remark-parse-7.0.2" - sources."remark-retext-3.1.3" + sources."remark-frontmatter-2.0.0" + sources."remark-mdx-2.0.0-next.7" + sources."remark-message-control-6.0.0" + (sources."remark-parse-8.0.3" // { + dependencies = [ + sources."vfile-location-3.1.0" + ]; + }) + sources."remark-retext-4.0.0" + sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."resolve-1.17.0" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."retext-english-3.0.4" - (sources."retext-equality-4.3.0" // { + sources."retext-equality-5.2.0" + sources."retext-profanities-6.1.0" + sources."safe-buffer-5.2.1" + sources."semver-5.7.1" + (sources."semver-diff-3.1.1" // { dependencies = [ - sources."unist-util-is-4.0.2" - sources."unist-util-visit-2.0.3" - sources."unist-util-visit-parents-3.1.0" + sources."semver-6.3.0" ]; }) - sources."retext-profanities-5.0.0" - sources."safe-buffer-5.2.1" - sources."semver-5.7.1" - sources."semver-diff-2.1.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" - sources."shellsubstitute-1.2.0" sources."signal-exit-3.0.3" sources."sliced-1.0.1" sources."space-separated-tokens-1.1.5" @@ -83736,16 +85691,29 @@ in sources."sprintf-js-1.0.3" sources."state-toggle-1.0.3" sources."stream-combiner-0.0.4" - sources."string-width-3.1.0" + (sources."string-width-4.2.0" // { + dependencies = [ + sources."ansi-regex-5.0.0" + sources."emoji-regex-8.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."strip-ansi-6.0.0" + ]; + }) sources."string_decoder-0.10.31" + sources."stringify-entities-3.0.1" sources."strip-ansi-5.2.0" - sources."strip-eof-1.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-5.5.0" - sources."term-size-1.2.0" - sources."textlint-rule-helper-2.1.1" + sources."term-size-2.2.0" + (sources."textlint-rule-helper-2.1.1" // { + dependencies = [ + sources."unist-util-is-3.0.0" + sources."unist-util-visit-1.4.1" + sources."unist-util-visit-parents-2.1.2" + ]; + }) sources."through-2.3.8" (sources."through2-2.0.0" // { dependencies = [ @@ -83761,31 +85729,44 @@ in sources."trough-1.0.5" sources."type-fest-0.13.1" sources."typedarray-0.0.6" + sources."typedarray-to-buffer-3.1.5" sources."unherit-1.1.3" - (sources."unified-8.4.2" // { + (sources."unified-9.2.0" // { dependencies = [ sources."is-plain-obj-2.1.0" ]; }) sources."unified-diff-3.0.1" - (sources."unified-engine-7.0.0" // { + (sources."unified-engine-8.0.0" // { dependencies = [ - sources."parse-json-4.0.0" + sources."is-plain-obj-2.1.0" ]; }) - sources."unified-message-control-2.0.0" - sources."unique-string-1.0.0" - sources."unist-util-inspect-4.1.4" - sources."unist-util-is-3.0.0" + (sources."unified-message-control-3.0.1" // { + dependencies = [ + sources."vfile-location-3.1.0" + ]; + }) + sources."unique-string-2.0.0" + sources."unist-util-inspect-5.0.1" + sources."unist-util-is-4.0.2" sources."unist-util-modify-children-1.1.6" sources."unist-util-position-3.1.0" - sources."unist-util-remove-position-1.1.4" + sources."unist-util-remove-position-2.0.1" sources."unist-util-stringify-position-2.0.3" - sources."unist-util-visit-1.4.1" + sources."unist-util-visit-2.0.3" sources."unist-util-visit-children-1.1.4" - sources."unist-util-visit-parents-2.1.2" - sources."untildify-2.1.0" - sources."update-notifier-3.0.1" + sources."unist-util-visit-parents-3.1.0" + (sources."update-notifier-4.1.1" // { + dependencies = [ + sources."ansi-styles-4.2.1" + sources."chalk-3.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.1.0" + ]; + }) sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-license-3.0.4" @@ -83795,36 +85776,18 @@ in sources."vfile-message-2.0.4" (sources."vfile-reporter-6.0.1" // { dependencies = [ - sources."ansi-regex-5.0.0" - sources."emoji-regex-8.0.0" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" sources."supports-color-6.1.0" ]; }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" sources."web-namespaces-1.1.4" - sources."which-1.3.1" - (sources."widest-line-2.0.1" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."widest-line-3.1.0" sources."wrappy-1.0.2" - sources."write-file-atomic-2.4.3" - sources."x-is-string-0.1.0" - sources."xdg-basedir-3.0.0" + sources."write-file-atomic-3.0.3" + sources."xdg-basedir-4.0.0" sources."xtend-4.0.2" - sources."yallist-2.1.2" - (sources."yargs-parser-18.1.3" // { - dependencies = [ - sources."camelcase-5.3.1" - ]; - }) + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -84062,7 +86025,7 @@ in sources."@textlint/ast-node-types-4.3.4" sources."@textlint/types-1.4.5" sources."boundary-1.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."split-lines-2.0.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -84092,7 +86055,7 @@ in sources."@textlint/ast-node-types-4.3.4" sources."@textlint/types-1.4.5" sources."boundary-1.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."strip-json-comments-3.1.1" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -84191,13 +86154,13 @@ in thelounge = nodeEnv.buildNodePackage { name = "thelounge"; packageName = "thelounge"; - version = "4.1.0"; + version = "4.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/thelounge/-/thelounge-4.1.0.tgz"; - sha512 = "ozjuU9/DaxT5r7ivckvdrzTLRoMCOiUlNbEAxldoHD3jzbbCEm561rHkEw0Caek31tOL4y0yqHiFuRBRoGbmiQ=="; + url = "https://registry.npmjs.org/thelounge/-/thelounge-4.2.0.tgz"; + sha512 = "5hijX1V/4CrgrkqCqtwP32LSbLPSF/10nneI+2doPHKx7AdCgR52HqWZo0AQEPv4fvOqEOMLJ0c9pL6t/jUDwg=="; }; dependencies = [ - sources."@sindresorhus/is-2.1.1" + sources."@sindresorhus/is-3.1.2" sources."@szmarczak/http-timer-4.0.5" sources."@tokenizer/token-0.1.1" sources."@types/cacheable-request-6.0.1" @@ -84205,14 +86168,19 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" - sources."abstract-logging-1.0.0" + sources."abstract-logging-2.0.0" sources."accepts-1.3.7" sources."after-0.8.2" - sources."agent-base-4.3.0" - sources."ajv-6.12.3" + (sources."agent-base-6.0.1" // { + dependencies = [ + sources."debug-4.2.0" + sources."ms-2.1.2" + ]; + }) + sources."ajv-6.12.4" sources."ansi-regex-2.1.1" sources."ansi-styles-4.2.1" sources."aproba-1.2.0" @@ -84232,7 +86200,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."backo2-1.0.2" sources."backoff-2.5.0" sources."balanced-match-1.0.0" @@ -84242,6 +86210,7 @@ in sources."bcryptjs-2.4.3" sources."better-assert-1.0.2" sources."blob-0.0.5" + sources."block-stream-0.0.9" sources."bn.js-4.11.9" sources."body-parser-1.19.0" sources."boolbase-1.0.0" @@ -84249,23 +86218,19 @@ in sources."buffer-equal-constant-time-1.0.1" sources."busboy-0.3.1" sources."bytes-3.1.0" - sources."cacheable-lookup-2.0.1" + sources."cacheable-lookup-5.0.3" sources."cacheable-request-7.0.1" sources."callsite-1.0.0" sources."caseless-0.12.0" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" sources."chownr-1.1.4" - (sources."clone-response-1.0.2" // { - dependencies = [ - sources."mimic-response-1.0.1" - ]; - }) + sources."clone-response-1.0.2" sources."code-point-at-1.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-4.1.0" + sources."commander-6.0.0" sources."component-bind-1.0.0" sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" @@ -84285,7 +86250,11 @@ in sources."css-what-2.1.3" sources."dashdash-1.14.1" sources."debug-2.6.9" - sources."decompress-response-5.0.0" + (sources."decompress-response-6.0.0" // { + dependencies = [ + sources."mimic-response-3.1.0" + ]; + }) sources."deep-extend-0.6.0" sources."defer-to-connect-2.0.0" sources."delayed-stream-1.0.0" @@ -84321,12 +86290,10 @@ in }) sources."engine.io-parser-2.2.0" sources."entities-1.1.2" - sources."es6-promise-4.2.8" - sources."es6-promisify-5.0.0" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."eventemitter3-2.0.3" + sources."eventemitter3-4.0.6" (sources."express-4.17.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -84337,7 +86304,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."fast-text-encoding-1.0.3" - sources."file-type-14.1.3" + sources."file-type-14.7.1" sources."filename-reserved-regex-2.0.0" sources."filenamify-4.1.0" sources."finalhandler-1.1.2" @@ -84345,14 +86312,14 @@ in sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fresh-0.5.2" - sources."fs-extra-8.1.0" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" + sources."fstream-1.0.12" sources."gauge-2.7.4" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.6" - sources."got-10.6.0" + sources."got-11.5.2" sources."graceful-fs-4.2.4" sources."grapheme-splitter-1.0.4" sources."har-schema-2.0.0" @@ -84369,10 +86336,11 @@ in ]; }) sources."http-signature-1.2.0" + sources."http2-wrapper-1.0.0-beta.5.2" sources."http_ece-1.1.0" - (sources."https-proxy-agent-3.0.1" // { + (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-3.2.6" + sources."debug-4.2.0" sources."ms-2.1.2" ]; }) @@ -84384,11 +86352,16 @@ in sources."inherits-2.0.4" sources."ini-1.3.5" sources."ipaddr.js-1.9.1" - sources."irc-framework-4.7.0" + (sources."irc-framework-4.9.0" // { + dependencies = [ + sources."iconv-lite-0.6.2" + ]; + }) sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-2.0.1" + sources."isexe-2.0.0" sources."isomorphic-textencoder-1.0.1" sources."isstream-0.1.2" sources."jsbn-0.1.1" @@ -84396,28 +86369,27 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-4.0.0" (sources."jsprim-1.4.1" // { dependencies = [ sources."extsprintf-1.3.0" ]; }) - sources."jwa-1.4.1" - sources."jws-3.2.2" + sources."jwa-2.0.0" + sources."jws-4.0.0" sources."keyv-4.0.1" sources."ldap-filter-0.3.3" - sources."ldapjs-2.0.0-pre.5" - sources."linkify-it-2.2.0" - sources."lodash-4.17.15" + sources."ldapjs-2.1.1" + sources."linkify-it-3.0.2" + sources."lodash-4.17.20" sources."lowercase-keys-2.0.0" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" sources."methods-1.1.2" sources."middleware-handler-0.2.0" sources."mime-1.6.0" - sources."mime-db-1.43.0" - sources."mime-types-2.1.26" - sources."mimic-response-2.1.0" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-response-1.0.1" sources."minimalistic-assert-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" @@ -84426,7 +86398,6 @@ in sources."mkdirp-0.5.5" sources."ms-2.0.0" sources."mute-stream-0.0.8" - sources."nan-2.14.1" (sources."needle-2.5.0" // { dependencies = [ sources."debug-3.2.6" @@ -84434,6 +86405,15 @@ in ]; }) sources."negotiator-0.6.2" + sources."node-addon-api-2.0.0" + sources."node-forge-0.9.1" + (sources."node-gyp-3.8.0" // { + dependencies = [ + sources."nopt-3.0.6" + sources."semver-5.3.0" + sources."tar-2.2.2" + ]; + }) (sources."node-pre-gyp-0.11.0" // { dependencies = [ sources."semver-5.7.1" @@ -84456,9 +86436,7 @@ in sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" sources."p-cancelable-2.0.0" - sources."p-event-4.2.0" sources."p-finally-1.0.0" - sources."p-timeout-3.2.0" sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ @@ -84466,7 +86444,7 @@ in sources."@szmarczak/http-timer-1.1.2" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -84477,11 +86455,9 @@ in sources."json-buffer-3.0.0" sources."keyv-3.1.0" sources."lowercase-keys-1.0.1" - sources."mimic-response-1.0.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."parse5-3.0.3" @@ -84501,6 +86477,7 @@ in sources."pump-3.0.0" sources."punycode-2.1.1" sources."qs-6.7.0" + sources."quick-lru-5.1.1" sources."range-parser-1.2.1" sources."raw-body-2.4.0" sources."rc-1.2.8" @@ -84517,12 +86494,13 @@ in sources."uuid-3.4.0" ]; }) + sources."resolve-alpn-1.0.0" sources."responselike-2.0.0" sources."rimraf-2.7.1" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."sax-1.2.4" - sources."semver-7.1.3" + sources."semver-7.3.2" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" @@ -84562,7 +86540,7 @@ in sources."ipaddr.js-0.1.3" ]; }) - sources."sqlite3-4.1.1" + sources."sqlite3-5.0.0" sources."sshpk-1.16.1" sources."statuses-1.5.0" sources."streamsearch-0.1.2" @@ -84574,39 +86552,38 @@ in sources."strtok3-6.0.4" sources."supports-color-7.1.0" sources."tar-4.4.13" - sources."tlds-1.207.0" + sources."tlds-1.208.0" sources."to-array-0.1.4" - sources."to-readable-stream-2.1.0" + sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."token-types-2.0.0" sources."tough-cookie-2.5.0" sources."trim-repeated-1.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.10.0" sources."type-is-1.6.18" sources."typedarray-to-buffer-3.1.5" sources."ua-parser-js-0.7.21" sources."uc.micro-1.0.6" - sources."universalify-0.1.2" sources."unpipe-1.0.0" sources."uri-js-4.2.2" sources."url-parse-lax-3.0.0" sources."urlsafe-base64-1.0.0" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" - sources."uuid-7.0.1" + sources."uuid-8.3.0" sources."vary-1.1.2" sources."vasync-2.2.0" sources."verror-1.10.0" - sources."web-push-3.4.3" + sources."web-push-3.4.4" + sources."which-1.3.1" sources."wide-align-1.1.3" sources."with-open-file-0.1.7" sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" sources."yallist-3.1.1" - sources."yarn-1.22.0" + sources."yarn-1.22.4" sources."yeast-0.1.2" ]; buildInputs = globalBuildInputs; @@ -84622,10 +86599,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.119.1"; + version = "0.120.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.119.1.tgz"; - sha512 = "GHyh/RiUfQ5VTiWIVRRTANYoXc1PFB1y+jDVRTb649nif1uX1F06PT1TKU3k2+F/MN4UJ3PWvQB53fY2OqKqKw=="; + url = "https://registry.npmjs.org/three/-/three-0.120.0.tgz"; + sha512 = "Swffpi3EAHWkmqC1MagKEzR5XgwkDiyeWI3M7vkGbBc0xhq2LcQmJj5DqBruLkrgcZQ+fM/+fSQBU1tDvggO4A=="; }; buildInputs = globalBuildInputs; meta = { @@ -84665,13 +86642,13 @@ in }; dependencies = [ sources."adm-zip-0.4.13" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."asn1-0.2.4" sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -84718,7 +86695,7 @@ in sources."jsonfile-4.0.0" sources."jsprim-1.4.1" sources."keypress-0.2.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimatch-3.0.4" @@ -84783,10 +86760,10 @@ in triton = nodeEnv.buildNodePackage { name = "triton"; packageName = "triton"; - version = "7.10.0"; + version = "7.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/triton/-/triton-7.10.0.tgz"; - sha512 = "IcnXbISVdJtwhTDpbO+LAfOF37G4uflrZMSnf4VPX1aMygOutXvFQcLz3ST0/1EmaZuPOHHyUxnaDuPGSU93pA=="; + url = "https://registry.npmjs.org/triton/-/triton-7.11.0.tgz"; + sha512 = "NycwGp9drvi9uJUo7PCmET470f+ZWzvzJ7d06hcI+Y0LZSLtZN+gxFz+YjLpt14Zifqs/751IcEhp7cCGThBxA=="; }; dependencies = [ sources."asn1-0.2.4" @@ -84842,7 +86819,7 @@ in ]; }) sources."keep-alive-agent-0.0.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."lomstream-1.1.0" // { dependencies = [ sources."assert-plus-0.1.5" @@ -85053,10 +87030,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "3.9.7"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-3.9.7.tgz"; - sha512 = "BLbiRkiBzAwsjut4x/dsibSTB6yWpwT5qWmC2OfuCg3GgVQCSgMs4vEctYPhsaGtd0AeuuHMkjZ2h2WG8MSzRw=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.2.tgz"; + sha512 = "e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -85107,10 +87084,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.10.1"; + version = "3.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.1.tgz"; - sha512 = "RjxApKkrPJB6kjJxQS3iZlf///REXWYxYJxO/MpmlQzVkDWVI3PSnCBWezMecmTU/TRkNxrl8bmsfFQCp+LO+Q=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.10.2.tgz"; + sha512 = "GXCYNwqoo0MbLARghYjxVBxDCnU0tLqN7IPLdHHbibCb1NI5zBkU2EPcy/GaVxc0BtTjqyGXJCINe6JMR2Dpow=="; }; buildInputs = globalBuildInputs; meta = { @@ -85136,7 +87113,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -85163,7 +87140,7 @@ in sources."bytes-3.1.0" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -85197,7 +87174,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-4.0.2" - sources."diff2html-3.1.11" + sources."diff2html-3.1.12" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -85277,7 +87254,7 @@ in sources."latest-version-5.1.0" sources."locate-path-5.0.0" sources."locks-0.2.2" - sources."lodash-4.17.19" + sources."lodash-4.17.20" (sources."logform-2.2.0" // { dependencies = [ sources."ms-2.1.2" @@ -85540,7 +87517,7 @@ in }; dependencies = [ sources."absolute-0.0.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ansi-escapes-3.2.0" sources."ansi-red-0.1.1" sources."ansi-regex-3.0.0" @@ -85556,7 +87533,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -85680,7 +87657,7 @@ in sources."jsonfile-2.4.0" sources."jsprim-1.4.1" sources."klaw-1.3.1" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."log-symbols-2.2.0" sources."lowercase-keys-1.0.1" (sources."make-dir-1.3.0" // { @@ -85783,7 +87760,7 @@ in sources."tslib-1.13.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.10.1" + sources."uglify-js-3.10.2" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -85842,14 +87819,14 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" sources."abbrev-1.1.1" sources."acorn-6.4.1" sources."acorn-jsx-5.2.0" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ajv-keywords-2.1.1" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -85916,7 +87893,7 @@ in sources."cache-base-1.0.1" (sources."cacheable-request-6.1.0" // { dependencies = [ - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) @@ -86021,7 +87998,7 @@ in sources."dir-glob-2.0.0" sources."dlv-1.1.3" sources."doctrine-3.0.0" - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."duplexer3-0.1.4" sources."editorconfig-0.15.3" sources."element-helper-json-2.0.6" @@ -86052,7 +88029,7 @@ in sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -86154,7 +88131,7 @@ in sources."hast-util-embedded-1.0.5" sources."hast-util-has-property-1.0.4" sources."hast-util-is-body-ok-link-1.0.4" - sources."hast-util-is-element-1.0.4" + sources."hast-util-is-element-1.1.0" sources."hast-util-parse-selector-2.2.4" sources."hast-util-to-string-1.0.4" sources."hast-util-whitespace-1.0.4" @@ -86220,7 +88197,7 @@ in sources."isarray-1.0.0" sources."isexe-2.0.0" sources."isobject-3.0.1" - (sources."js-beautify-1.11.0" // { + (sources."js-beautify-1.13.0" // { dependencies = [ sources."mkdirp-1.0.4" ]; @@ -86241,13 +88218,13 @@ in sources."load-json-file-4.0.0" sources."load-plugin-2.3.1" sources."locate-path-2.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.assign-4.2.0" sources."lodash.defaults-4.2.0" sources."lodash.iteratee-4.7.0" sources."lodash.merge-4.6.2" sources."lodash.unescape-4.0.1" - sources."loglevel-1.6.8" + sources."loglevel-1.7.0" (sources."loglevel-colored-level-prefix-1.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -86296,7 +88273,7 @@ in sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."nice-try-1.0.5" - sources."nopt-4.0.3" + sources."nopt-5.0.0" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" @@ -86333,7 +88310,6 @@ in ]; }) sources."os-tmpdir-1.0.2" - sources."osenv-0.1.5" sources."p-cancelable-1.1.0" sources."p-defer-1.0.0" sources."p-finally-1.0.0" @@ -86704,7 +88680,7 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - (sources."vscode-css-languageservice-4.3.1" // { + (sources."vscode-css-languageservice-4.3.3" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-uri-2.1.2" @@ -86794,7 +88770,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@types/color-name-1.1.1" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."JSONSelect-0.2.1" sources."acorn-7.4.0" sources."acorn-jsx-5.2.0" @@ -86852,7 +88828,7 @@ in sources."atob-2.1.2" sources."atomic-sleep-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -86911,7 +88887,7 @@ in sources."caseless-0.12.0" sources."chalk-4.1.0" sources."cheerio-1.0.0-rc.3" - (sources."chokidar-3.4.1" // { + (sources."chokidar-3.4.2" // { dependencies = [ sources."normalize-path-3.0.0" ]; @@ -87051,7 +89027,7 @@ in sources."esprima-4.0.1" (sources."esquery-1.3.1" // { dependencies = [ - sources."estraverse-5.1.0" + sources."estraverse-5.2.0" ]; }) sources."esrecurse-4.2.1" @@ -87139,7 +89115,7 @@ in ]; }) sources."get-caller-file-2.0.5" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -87260,7 +89236,7 @@ in sources."lighthouse-logger-1.2.0" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.includes-4.3.0" sources."lodash.isboolean-3.0.3" sources."lodash.isinteger-4.0.4" @@ -87364,7 +89340,7 @@ in sources."object.assign-4.1.0" sources."object.pick-1.3.0" sources."once-1.4.0" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."open-7.1.0" sources."optionator-0.9.1" sources."os-locale-5.0.0" @@ -87393,7 +89369,7 @@ in sources."performance-now-2.1.0" sources."picomatch-2.2.2" sources."pino-6.4.0" - sources."pino-std-serializers-2.4.2" + sources."pino-std-serializers-2.5.0" sources."posix-character-classes-0.1.1" (sources."postcss-7.0.32" // { dependencies = [ @@ -87518,7 +89494,7 @@ in sources."kind-of-3.2.2" ]; }) - sources."sonic-boom-1.0.2" + sources."sonic-boom-1.1.0" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" sources."source-map-support-0.5.19" @@ -87769,7 +89745,7 @@ in sources."@xtuc/ieee754-1.2.0" sources."@xtuc/long-4.2.2" sources."acorn-6.4.1" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."anymatch-3.1.1" @@ -87778,7 +89754,7 @@ in sources."arr-flatten-1.1.0" sources."arr-union-3.1.0" sources."array-unique-0.3.2" - (sources."asn1.js-4.10.1" // { + (sources."asn1.js-5.4.1" // { dependencies = [ sources."bn.js-4.11.9" ]; @@ -87803,7 +89779,7 @@ in sources."binary-extensions-2.1.0" sources."bindings-1.5.0" sources."bluebird-3.7.2" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" (sources."braces-2.3.2" // { dependencies = [ @@ -87832,7 +89808,7 @@ in sources."builtin-status-codes-3.0.0" sources."cacache-12.0.4" sources."cache-base-1.0.1" - (sources."chokidar-3.4.1" // { + (sources."chokidar-3.4.2" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -88063,7 +90039,7 @@ in sources."p-try-2.2.0" sources."pako-1.0.11" sources."parallel-transform-1.2.0" - sources."parse-asn1-5.1.5" + sources."parse-asn1-5.1.6" sources."pascalcase-0.1.1" sources."path-browserify-0.0.1" sources."path-dirname-1.0.2" @@ -88107,9 +90083,10 @@ in sources."run-queue-1.0.3" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" sources."schema-utils-1.0.0" sources."semver-5.7.1" - sources."serialize-javascript-3.1.0" + sources."serialize-javascript-4.0.0" (sources."set-value-2.0.1" // { dependencies = [ sources."extend-shallow-2.0.1" @@ -88184,7 +90161,7 @@ in sources."source-map-0.6.1" ]; }) - (sources."terser-webpack-plugin-1.4.4" // { + (sources."terser-webpack-plugin-1.4.5" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -88587,9 +90564,9 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."accepts-1.3.7" - sources."ajv-6.12.3" + sources."ajv-6.12.4" sources."ajv-errors-1.0.1" sources."ajv-keywords-3.5.2" sources."ansi-colors-3.2.4" @@ -88719,7 +90696,7 @@ in sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."etag-1.8.1" - sources."eventemitter3-4.0.4" + sources."eventemitter3-4.0.6" sources."eventsource-1.0.7" sources."execa-1.0.0" (sources."expand-brackets-2.1.4" // { @@ -88773,7 +90750,7 @@ in ]; }) sources."find-up-3.0.0" - sources."follow-redirects-1.12.1" + sources."follow-redirects-1.13.0" sources."for-in-1.0.2" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" @@ -88859,8 +90836,8 @@ in sources."killable-1.0.1" sources."kind-of-6.0.3" sources."locate-path-3.0.0" - sources."lodash-4.17.19" - sources."loglevel-1.6.8" + sources."lodash-4.17.20" + sources."loglevel-1.7.0" sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."media-typer-0.3.0" @@ -88944,7 +90921,7 @@ in sources."punycode-2.1.1" sources."qs-6.7.0" sources."querystring-0.2.0" - sources."querystringify-2.1.1" + sources."querystringify-2.2.0" sources."range-parser-1.2.1" (sources."raw-body-2.4.0" // { dependencies = [ @@ -89177,8 +91154,8 @@ in sources."@nodelib/fs.walk-1.2.4" sources."@npmcli/move-file-1.0.1" sources."@types/json-schema-7.0.5" - sources."aggregate-error-3.0.1" - sources."ajv-6.12.3" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.4" sources."ajv-keywords-3.5.2" sources."array-union-2.1.0" sources."balanced-match-1.0.0" @@ -89227,7 +91204,7 @@ in sources."minipass-collect-1.0.2" sources."minipass-flush-1.0.5" sources."minipass-pipeline-1.2.4" - sources."minizlib-2.1.0" + sources."minizlib-2.1.2" sources."mkdirp-1.0.4" sources."normalize-path-3.0.0" sources."once-1.4.0" @@ -89258,7 +91235,7 @@ in sources."source-list-map-2.0.1" sources."source-map-0.6.1" sources."ssri-8.0.0" - sources."tar-6.0.2" + sources."tar-6.0.5" sources."to-regex-range-5.0.1" sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" @@ -89328,7 +91305,7 @@ in }) sources."blob-to-buffer-1.2.8" sources."block-stream2-2.0.0" - sources."bn.js-5.1.2" + sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" sources."browserify-package-json-1.0.1" sources."buffer-alloc-1.2.0" @@ -89401,7 +91378,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."ip-set-1.0.2" - sources."ipaddr.js-1.9.1" + sources."ipaddr.js-2.0.0" sources."is-ascii-1.0.0" sources."is-docker-2.1.1" sources."is-file-1.0.0" @@ -89450,7 +91427,7 @@ in sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" - sources."open-7.1.0" + sources."open-7.2.0" sources."package-json-versionify-1.0.4" sources."parse-numeric-range-1.2.0" (sources."parse-torrent-7.1.3" // { @@ -89516,7 +91493,11 @@ in sources."stream-to-blob-2.0.1" sources."stream-to-blob-url-3.0.2" sources."stream-with-known-length-to-buffer-1.0.4" - sources."string2compact-1.3.0" + (sources."string2compact-1.3.0" // { + dependencies = [ + sources."ipaddr.js-1.9.1" + ]; + }) sources."string_decoder-1.3.0" sources."thirty-two-1.0.2" sources."through-2.3.8" @@ -89594,10 +91575,10 @@ in write-good = nodeEnv.buildNodePackage { name = "write-good"; packageName = "write-good"; - version = "1.0.2"; + version = "1.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/write-good/-/write-good-1.0.2.tgz"; - sha512 = "1gm9Ouz7mBROF7aC8vvSm/3JtPfTiZ+fegPGCKdxsYhf6VYeStHfVFx2Hnj2kJviHPx5zZkiQ8DytzZMP0Zqwg=="; + url = "https://registry.npmjs.org/write-good/-/write-good-1.0.3.tgz"; + sha512 = "8n5k4h00o91iYlzudpO8VqmeEjJ2qfMtVA+rhYUVYmibEOEoOXN+YGxB7CY7BZbN2Pv8aDK4oiLSN0a3pAwwOQ=="; }; dependencies = [ sources."adverb-where-0.2.1" @@ -89621,10 +91602,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.9.0"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.9.0.tgz"; - sha512 = "nRExM5NfJXzxTKlFmHKr/ZtoxZCddH1kuuWNfHRvTLCEHzexIn/YvI/DBZHxKLh/ym9f4Q4j4zW76vB6J18lUQ=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.10.0.tgz"; + sha512 = "d2/7eGgonEIRcnW9kK+k+ERG4gTOk5BXHr9KjTVv8gEarXKa62Kk+nyFE4AXgMDZ0LXTu8nTuN/AdboJiGN+pQ=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -89638,10 +91619,10 @@ in sources."js-yaml-3.14.0" sources."jsonc-parser-2.3.0" sources."ms-2.0.0" - sources."prettier-1.19.1" + sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - sources."vscode-json-languageservice-3.8.0" + sources."vscode-json-languageservice-3.8.1" sources."vscode-jsonrpc-4.0.0" (sources."vscode-languageserver-5.2.1" // { dependencies = [ @@ -89699,18 +91680,18 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/runtime-7.11.1" + sources."@babel/runtime-7.11.2" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/color-name-1.1.1" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.0.27" + sources."@types/node-14.6.0" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" - sources."aggregate-error-3.0.1" - sources."ajv-6.12.3" + sources."aggregate-error-3.1.0" + sources."ajv-6.12.4" sources."ansi-0.3.1" sources."ansi-align-2.0.0" sources."ansi-escapes-3.2.0" @@ -89734,7 +91715,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.0" + sources."aws4-1.10.1" (sources."axios-0.18.1" // { dependencies = [ sources."is-buffer-2.0.4" @@ -89824,7 +91805,7 @@ in sources."concat-stream-1.6.2" sources."conf-1.4.0" sources."config-chain-1.1.12" - sources."configstore-3.1.2" + sources."configstore-3.1.5" sources."copy-descriptor-0.1.1" sources."core-js-3.6.5" sources."core-util-is-1.0.2" @@ -89853,7 +91834,7 @@ in sources."path-type-3.0.0" ]; }) - sources."dot-prop-4.2.0" + sources."dot-prop-4.2.1" sources."downgrade-root-1.2.2" sources."download-stats-0.3.4" sources."duplexer3-0.1.4" @@ -90064,6 +92045,7 @@ in sources."jsbn-0.1.1" sources."json-buffer-3.0.0" sources."json-parse-better-errors-1.0.2" + sources."json-parse-even-better-errors-2.3.0" sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" @@ -90089,7 +92071,7 @@ in }) sources."locate-path-2.0.0" sources."locutus-2.0.11" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.debounce-4.0.8" sources."lodash.pad-4.5.1" sources."lodash.padend-4.6.1" @@ -90476,7 +92458,7 @@ in sources."tunnel-0.0.6" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."twig-1.15.1" + sources."twig-1.15.2" sources."type-fest-0.3.1" sources."typedarray-0.0.6" sources."union-value-1.0.1" @@ -90513,7 +92495,7 @@ in sources."walk-2.3.14" sources."which-1.3.1" sources."widest-line-2.0.1" - sources."windows-release-3.3.1" + sources."windows-release-3.3.3" (sources."with-open-file-0.1.7" // { dependencies = [ sources."p-try-2.2.0" @@ -90552,7 +92534,7 @@ in sources."debug-3.2.6" sources."execa-4.0.3" sources."figures-3.2.0" - sources."get-stream-5.1.0" + sources."get-stream-5.2.0" sources."has-flag-4.0.0" (sources."inquirer-7.3.3" // { dependencies = [ @@ -90565,7 +92547,7 @@ in sources."ms-2.1.2" sources."mute-stream-0.0.8" sources."npm-run-path-4.0.1" - sources."onetime-5.1.1" + sources."onetime-5.1.2" sources."path-key-3.1.1" sources."restore-cursor-3.1.0" sources."semver-7.3.2" @@ -90591,7 +92573,7 @@ in sources."debug-4.2.0" sources."diff-4.0.2" sources."dir-glob-2.2.2" - sources."ejs-3.1.3" + sources."ejs-3.1.5" sources."find-up-3.0.0" sources."globby-9.2.0" sources."ignore-4.0.6" @@ -90611,7 +92593,7 @@ in sources."p-limit-2.3.0" sources."p-locate-3.0.0" sources."p-try-2.2.0" - sources."parse-json-5.0.1" + sources."parse-json-5.1.0" (sources."path-type-3.0.0" // { dependencies = [ sources."pify-3.0.0" @@ -90648,4 +92630,4 @@ in bypassCache = true; reconstructLock = true; }; -} +} \ No newline at end of file diff --git a/pkgs/development/ocaml-modules/camlpdf/default.nix b/pkgs/development/ocaml-modules/camlpdf/default.nix index fa5ffabedad..7e231001f24 100644 --- a/pkgs/development/ocaml-modules/camlpdf/default.nix +++ b/pkgs/development/ocaml-modules/camlpdf/default.nix @@ -1,20 +1,20 @@ -{ stdenv, fetchFromGitHub, ocaml, findlib }: +{ stdenv, fetchFromGitHub, which, ocaml, findlib }: if !stdenv.lib.versionAtLeast ocaml.version "4.02" then throw "camlpdf is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - version = "2.3"; + version = "2.3.1"; name = "ocaml${ocaml.version}-camlpdf-${version}"; src = fetchFromGitHub { owner = "johnwhitington"; repo = "camlpdf"; rev = "v${version}"; - sha256 = "1z8h6bjzmlscr6h6kdvzj8kspifb4n9dg7zi54z1cv2qi03kr8dk"; + sha256 = "1q69hhk63z836jbkv4wsng27w35w0qpz01c7ax0mqm8d8kmnr0v4"; }; - buildInputs = [ ocaml findlib ]; + buildInputs = [ which ocaml findlib ]; # Version number in META file is wrong patchPhase = '' @@ -26,7 +26,9 @@ stdenv.mkDerivation rec { EOF ''; - createFindlibDestdir = true; + preInstall = '' + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs + ''; meta = with stdenv.lib; { description = "An OCaml library for reading, writing and modifying PDF files"; diff --git a/pkgs/development/ocaml-modules/cohttp/async.nix b/pkgs/development/ocaml-modules/cohttp/async.nix new file mode 100644 index 00000000000..246397b6081 --- /dev/null +++ b/pkgs/development/ocaml-modules/cohttp/async.nix @@ -0,0 +1,22 @@ +{ stdenv, buildDunePackage, async, cohttp, conduit-async, uri, ppx_sexp_conv +, logs, magic-mime }: + +if !stdenv.lib.versionAtLeast cohttp.version "0.99" then + cohttp +else if !stdenv.lib.versionAtLeast async.version "0.13" then + throw "cohttp-async needs async-0.13 (hence OCaml >= 4.08)" +else + + buildDunePackage { + pname = "cohttp-async"; + useDune2 = true; + inherit (cohttp) version src; + + buildInputs = [ ppx_sexp_conv ]; + + propagatedBuildInputs = [ async cohttp conduit-async logs magic-mime uri ]; + + meta = cohttp.meta // { + description = "CoHTTP implementation for the Async concurrency library"; + }; + } diff --git a/pkgs/development/ocaml-modules/conduit/async.nix b/pkgs/development/ocaml-modules/conduit/async.nix new file mode 100644 index 00000000000..f16819ed8ae --- /dev/null +++ b/pkgs/development/ocaml-modules/conduit/async.nix @@ -0,0 +1,19 @@ +{ stdenv, buildDunePackage, async, async_ssl, ppx_sexp_conv, conduit }: + +if !stdenv.lib.versionAtLeast conduit.version "1.0" +then conduit +else + +buildDunePackage { + pname = "conduit-async"; + useDune2 = true; + inherit (conduit) version src; + + buildInputs = [ ppx_sexp_conv ]; + + propagatedBuildInputs = [ async async_ssl conduit ]; + + meta = conduit.meta // { + description = "A network connection establishment library for Async"; + }; +} diff --git a/pkgs/development/ocaml-modules/conduit/default.nix b/pkgs/development/ocaml-modules/conduit/default.nix index 7fbeefb3926..27b2a329b26 100644 --- a/pkgs/development/ocaml-modules/conduit/default.nix +++ b/pkgs/development/ocaml-modules/conduit/default.nix @@ -18,7 +18,7 @@ buildDunePackage rec { propagatedBuildInputs = [ astring ipaddr ipaddr-sexp sexplib uri ]; meta = { - description = "Network connection library for TCP and SSL"; + description = "A network connection establishment library"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [ alexfmpe vbgl ]; homepage = "https://github.com/mirage/ocaml-conduit"; diff --git a/pkgs/development/ocaml-modules/containers/data.nix b/pkgs/development/ocaml-modules/containers/data.nix new file mode 100644 index 00000000000..7d15d7d3c64 --- /dev/null +++ b/pkgs/development/ocaml-modules/containers/data.nix @@ -0,0 +1,18 @@ +{ buildDunePackage, containers +, gen, iter, mdx, ounit, qcheck +}: + +buildDunePackage { + pname = "containers-data"; + + inherit (containers) src version; + + doCheck = true; + checkInputs = [ gen iter mdx.bin ounit qcheck ]; + + propagatedBuildInputs = [ containers ]; + + meta = containers.meta // { + description = "A set of advanced datatypes for containers"; + }; +} diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix index 16bad5a5ec4..970122dd79f 100644 --- a/pkgs/development/ocaml-modules/containers/default.nix +++ b/pkgs/development/ocaml-modules/containers/default.nix @@ -1,24 +1,22 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml -, iter, result, uchar -, gen, mdx, ounit, qcheck, uutf +, seq +, gen, iter, ounit, qcheck, uutf }: buildDunePackage rec { - version = "2.7"; + version = "3.0"; pname = "containers"; src = fetchFromGitHub { owner = "c-cube"; repo = "ocaml-containers"; rev = "v${version}"; - sha256 = "1nsxfgn1g1vpqihb9gd6gsab0bcm70nf9z84cp441c8wsc57hi6a"; + sha256 = "0c75d5csgc68qqbsdz4279nlin111zrjbg4d47k32ska28myvpqn"; }; - buildInputs = [ iter ]; + propagatedBuildInputs = [ seq ]; - checkInputs = lib.optionals doCheck [ gen mdx.bin ounit qcheck uutf ]; - - propagatedBuildInputs = [ result uchar ]; + checkInputs = [ gen iter ounit qcheck uutf ]; doCheck = true; diff --git a/pkgs/development/ocaml-modules/cpdf/default.nix b/pkgs/development/ocaml-modules/cpdf/default.nix index 3b68acaee71..e40f6531e1f 100644 --- a/pkgs/development/ocaml-modules/cpdf/default.nix +++ b/pkgs/development/ocaml-modules/cpdf/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, findlib, camlpdf, ncurses }: -let version = "2.3"; in +let version = "2.3.1"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-cpdf-${version}"; @@ -9,9 +9,13 @@ stdenv.mkDerivation { owner = "johnwhitington"; repo = "cpdf-source"; rev = "v${version}"; - sha256 = "0i976y1v0l7x7k2n8k6v0h4bw9zlxsv04y4fdxss6dzpsfz49w23"; + sha256 = "1gwz0iy28f67kbqap2q10nf98dalwbi03vv5j893z2an7pb4w68z"; }; + prePatch = '' + substituteInPlace META --replace 'version="1.7"' 'version="${version}"' + ''; + buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ camlpdf ]; diff --git a/pkgs/development/ocaml-modules/dune-action-plugin/default.nix b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix new file mode 100644 index 00000000000..fcb93aac799 --- /dev/null +++ b/pkgs/development/ocaml-modules/dune-action-plugin/default.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, dune_2, dune-glob, dune-private-libs }: + +buildDunePackage rec { + pname = "dune-action-plugin"; + inherit (dune_2) src version; + + useDune2 = true; + + dontAddPrefix = true; + + propagatedBuildInputs = [ dune-glob dune-private-libs ]; + + meta = with lib; { + inherit (dune_2.meta) homepage; + description = "API for writing dynamic Dune actions"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/dune-glob/default.nix b/pkgs/development/ocaml-modules/dune-glob/default.nix new file mode 100644 index 00000000000..34b79068c11 --- /dev/null +++ b/pkgs/development/ocaml-modules/dune-glob/default.nix @@ -0,0 +1,19 @@ +{ lib, buildDunePackage, dune_2, dune-private-libs }: + +buildDunePackage rec { + pname = "dune-glob"; + inherit (dune_2) src version; + + useDune2 = true; + + dontAddPrefix = true; + + propagatedBuildInputs = [ dune-private-libs ]; + + meta = with lib; { + inherit (dune_2.meta) homepage; + description = "Glob string matching language supported by dune"; + maintainers = [ maintainers.marsam ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/ocaml-modules/dune-private-libs/default.nix b/pkgs/development/ocaml-modules/dune-private-libs/default.nix index 6161bd1fe8e..9eb253f02e5 100644 --- a/pkgs/development/ocaml-modules/dune-private-libs/default.nix +++ b/pkgs/development/ocaml-modules/dune-private-libs/default.nix @@ -7,7 +7,7 @@ buildDunePackage rec { inherit (dune_2) src version; - minimumOCamlVersion = "4.07"; + minimumOCamlVersion = "4.08"; dontAddPrefix = true; diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 4ce502af19f..4734d83d55f 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -14,11 +14,11 @@ else stdenv.mkDerivation rec { pname = "eliom"; - version = "6.12.0"; + version = "6.12.1"; src = fetchzip { url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "015jh72v6ch9h9czd8sn5kjz3pv6lsnvvnhdjgrplwj443dn1xp8"; + sha256 = "04c1sz113015gyhj3w7flw7l4bv0v50q6n04kk8dybcravzy2xgx"; }; buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild js_of_ocaml-ppx_deriving_json opaline diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix index 93e29d3d34a..865c5448c5b 100644 --- a/pkgs/development/ocaml-modules/elpi/default.nix +++ b/pkgs/development/ocaml-modules/elpi/default.nix @@ -1,19 +1,19 @@ { lib, fetchzip, buildDunePackage, camlp5 -, ppx_tools_versioned, ppx_deriving, re +, ppxlib, ppx_deriving, re, perl, ncurses }: buildDunePackage rec { pname = "elpi"; - version = "1.11.2"; + version = "1.11.4"; src = fetchzip { url = "https://github.com/LPCIC/elpi/releases/download/v${version}/elpi-v${version}.tbz"; - sha256 = "15hamy9ifr05kczadwh3yj2gmr12a9z1jwppmp5yrns0vykjbj76"; + sha256 = "1hmjp2z52j17vwhhdkj45n9jx11jxkdg2dwa0n04yyw0qqy4m7c1"; }; minimumOCamlVersion = "4.04"; - buildInputs = [ ppx_tools_versioned ]; + buildInputs = [ perl ncurses ppxlib ]; propagatedBuildInputs = [ camlp5 ppx_deriving re ]; @@ -24,5 +24,9 @@ buildDunePackage rec { homepage = "https://github.com/LPCIC/elpi"; }; + postPatch = '' + substituteInPlace elpi_REPL.ml --replace "tput cols" "${ncurses}/bin/tput cols" + ''; + useDune2 = true; } diff --git a/pkgs/development/ocaml-modules/hidapi/default.nix b/pkgs/development/ocaml-modules/hidapi/default.nix new file mode 100644 index 00000000000..cd95b34fa2b --- /dev/null +++ b/pkgs/development/ocaml-modules/hidapi/default.nix @@ -0,0 +1,27 @@ +{ pkgs, lib, fetchurl, buildDunePackage, pkg-config +, bigstring, +}: + +buildDunePackage rec { + pname = "hidapi"; + version = "1.1.1"; + + src = fetchurl { + url = "https://github.com/vbmithr/ocaml-hidapi/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "1j7rd7ajrzla76r3sxljx6fb18f4f4s3jd7vhv59l2ilxyxycai2"; + }; + + minimumOCamlVersion = "4.03"; + + buildInputs = [ pkgs.hidapi pkg-config ]; + propagatedBuildInputs = [ bigstring ]; + + doCheck = true; + + meta = with lib; { + homepage = https://github.com/vbmithr/ocaml-hidapi; + description = "Bindings to Signal11's hidapi library"; + license = licenses.isc; + maintainers = [ maintainers.alexfmpe ]; + }; +} diff --git a/pkgs/development/ocaml-modules/janestreet/0.13.nix b/pkgs/development/ocaml-modules/janestreet/0.13.nix index d16ceefd04c..b92027a65a0 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.13.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.13.nix @@ -1,5 +1,6 @@ { janePackage , ctypes +, dune-configurator , num , octavius , ppxlib @@ -417,6 +418,15 @@ rec { propagatedBuildInputs = [ async shell ]; }; + async_ssl = janePackage { + pname = "async_ssl"; + useDune2 = true; + hash = "0z5dbiam5k7ipx9ph4r8nqv0a1ldx1ymxw3xjxgrdjda90lmwf2k"; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ async ctypes openssl ]; + }; + core_bench = janePackage { pname = "core_bench"; hash = "1nk0i3z8rqrljbf4bc7ljp71g0a4361nh85s2ang0lgxri74zacm"; diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix index e85fa5bef24..e178e066a38 100644 --- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.3"; + version = "0.8.5"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "08rmhjrk046nnhbdk16vg7w7ink4bj6yq9dsjcky5psn982aqiwi"; + sha256 = "0l6q0z5ghhy0djfscb2i2xg4dpmxs4xkwh16kc473cmb4hsxsmyk"; }; useDune2 = true; diff --git a/pkgs/development/ocaml-modules/mirage-stack/default.nix b/pkgs/development/ocaml-modules/mirage-stack/default.nix index 64168716399..528ea68d985 100644 --- a/pkgs/development/ocaml-modules/mirage-stack/default.nix +++ b/pkgs/development/ocaml-modules/mirage-stack/default.nix @@ -2,11 +2,11 @@ buildDunePackage rec { pname = "mirage-stack"; - version = "2.0.1"; + version = "2.1.0"; src = fetchurl { url = "https://github.com/mirage/mirage-stack/releases/download/v${version}/mirage-stack-v${version}.tbz"; - sha256 = "1xdy59bxnki1r0jwm3s8fwarhhbxr0lsqqiag5b1j41hciiqp9jq"; + sha256 = "1y110i4kjr03b0ji3q5h0bi3n3q8mdkfflb3fyq5rvpi5l45vvdb"; }; propagatedBuildInputs = [ mirage-protocols ]; diff --git a/pkgs/development/ocaml-modules/posix/base.nix b/pkgs/development/ocaml-modules/posix/base.nix new file mode 100644 index 00000000000..a6fe690ebcc --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/base.nix @@ -0,0 +1,26 @@ +{ lib, buildDunePackage, fetchFromGitHub +, ctypes, integers +}: + +buildDunePackage rec { + pname = "posix-base"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "savonet"; + repo = "ocaml-posix"; + rev = "v${version}"; + sha256 = "18px8hfqcfy2lk8105ki3hrxxigs44gs046ba0fqda6wzd0hr82b"; + }; + + useDune2 = true; + + propagatedBuildInputs = [ ctypes integers ]; + + meta = { + homepage = "https://www.liquidsoap.info/ocaml-posix/"; + description = "Base module for the posix bindings"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/pkgs/development/ocaml-modules/posix/socket.nix b/pkgs/development/ocaml-modules/posix/socket.nix new file mode 100644 index 00000000000..69a469bbece --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/socket.nix @@ -0,0 +1,16 @@ +{ lib, buildDunePackage, posix-base }: + +buildDunePackage { + pname = "posix-socket"; + + inherit (posix-base) version src useDune2; + + propagatedBuildInputs = [ posix-base ]; + + doCheck = true; + + meta = posix-base.meta // { + description = "Bindings for posix sockets"; + }; + +} diff --git a/pkgs/development/ocaml-modules/posix/types.nix b/pkgs/development/ocaml-modules/posix/types.nix new file mode 100644 index 00000000000..2512fe892c1 --- /dev/null +++ b/pkgs/development/ocaml-modules/posix/types.nix @@ -0,0 +1,15 @@ +{ lib, buildDunePackage, posix-base }: + +buildDunePackage { + pname = "posix-types"; + + inherit (posix-base) version src useDune2; + + minimumOCamlVersion = "4.03"; + + propagatedBuildInputs = [ posix-base ]; + + meta = posix-base.meta // { + description = "Bindings for the types defined in <sys/types.h>"; + }; +} diff --git a/pkgs/development/ocaml-modules/re/default.nix b/pkgs/development/ocaml-modules/re/default.nix index 2031c469b29..8881821490a 100644 --- a/pkgs/development/ocaml-modules/re/default.nix +++ b/pkgs/development/ocaml-modules/re/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, buildDunePackage, ounit, seq }: +{ lib, fetchzip, buildDunePackage, ocaml, ounit, seq }: buildDunePackage rec { pname = "re"; @@ -11,14 +11,14 @@ buildDunePackage rec { sha256 = "07ycb103mr4mrkxfd63cwlsn023xvcjp0ra0k7n2gwrg0mwxmfss"; }; - buildInputs = [ ounit ]; + buildInputs = lib.optional doCheck ounit; propagatedBuildInputs = [ seq ]; - doCheck = true; + doCheck = lib.versionAtLeast ocaml.version "4.04"; meta = { homepage = "https://github.com/ocaml/ocaml-re"; description = "Pure OCaml regular expressions, with support for Perl and POSIX-style strings"; - license = stdenv.lib.licenses.lgpl2; - maintainers = with stdenv.lib.maintainers; [ vbgl ]; + license = lib.licenses.lgpl2; + maintainers = with lib.maintainers; [ vbgl ]; }; } diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix new file mode 100644 index 00000000000..463bfbc79f9 --- /dev/null +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, ocaml, findlib, ocamlbuild, topkg +, astring, bos, cmdliner, rresult +}: + +stdenv.mkDerivation rec { + name = "ocaml${ocaml.version}-webbrowser-${version}"; + version = "0.6.1"; + src = fetchurl { + url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; + sha256 = "137a948bx7b71zfv4za3hhznrn5lzbbrgzjy0das83zms508isx3"; + }; + + nativeBuildInputs = [ ocaml findlib ocamlbuild topkg ]; + buildInputs = []; + propagatedBuildInputs = [ astring bos cmdliner rresult ]; + + inherit (topkg) buildPhase installPhase; + + meta = { + description = "Open and reload URIs in browsers from OCaml"; + homepage = "https://erratique.ch/software/webbrowser"; + license = stdenv.lib.licenses.isc; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + inherit (ocaml.meta) platforms; + }; +} diff --git a/pkgs/development/perl-modules/generic/default.nix b/pkgs/development/perl-modules/generic/default.nix index 79c7919a354..c7b57eae906 100644 --- a/pkgs/development/perl-modules/generic/default.nix +++ b/pkgs/development/perl-modules/generic/default.nix @@ -42,7 +42,7 @@ toPerlModule(stdenv.mkDerivation ( version = lib.getVersion attrs; # TODO: phase-out `attrs.name` builder = ./builder.sh; buildInputs = buildInputs ++ [ perl ]; - nativeBuildInputs = nativeBuildInputs ++ [ (perl.dev or perl) ]; + nativeBuildInputs = nativeBuildInputs ++ [ (perl.mini or perl) ]; fullperl = buildPerl; } )) diff --git a/pkgs/development/python-modules/Fabric/default.nix b/pkgs/development/python-modules/Fabric/default.nix index c6fb898e070..1025ed6a05e 100644 --- a/pkgs/development/python-modules/Fabric/default.nix +++ b/pkgs/development/python-modules/Fabric/default.nix @@ -19,9 +19,13 @@ buildPythonPackage rec { propagatedBuildInputs = [ invoke paramiko cryptography ]; checkInputs = [ pytest mock pytest-relaxed ]; + # requires pytest_relaxed, which doesnt have official support for pytest>=5 + # https://github.com/bitprophet/pytest-relaxed/issues/12 + doCheck = false; checkPhase = '' pytest tests ''; + pythonImportsCheck = [ "fabric" ]; meta = with lib; { description = "Pythonic remote execution"; diff --git a/pkgs/development/python-modules/JPype1/default.nix b/pkgs/development/python-modules/JPype1/default.nix index ca30631a68e..68afbb525c9 100644 --- a/pkgs/development/python-modules/JPype1/default.nix +++ b/pkgs/development/python-modules/JPype1/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "JPype1"; - version = "0.7.5"; + version = "1.0.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "7bbd25453dc04704d77d854c80acb5537ecb18b9de8a5572e5f22649a2160aaf"; + sha256 = "c751436350c105f403e382574d34a6ad73e4a677cb0ff5bc9a87581cc07094e1"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/Nikola/default.nix b/pkgs/development/python-modules/Nikola/default.nix index 31915383275..06a85a22033 100644 --- a/pkgs/development/python-modules/Nikola/default.nix +++ b/pkgs/development/python-modules/Nikola/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { pname = "Nikola"; - version = "8.0.4"; + version = "8.1.1"; # Nix contains only Python 3 supported version of doit, which is a dependency # of Nikola. Python 2 support would require older doit 0.29.0 (which on the @@ -54,7 +54,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "2e5c8305ec4423b56af2223336c3309e5c9b8c96df0d6fde46d26cff4c5d6f1a"; + sha256 = "cee35b011667a965eca01b7d36b54649c9434ab004d8556d6563b7d899df61ed"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix new file mode 100644 index 00000000000..5d960b5e92e --- /dev/null +++ b/pkgs/development/python-modules/afdko/default.nix @@ -0,0 +1,55 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, python +, fonttools, defcon, lxml, fs, unicodedata2, zopfli, brotlipy, fontpens +, brotli, fontmath, mutatormath, booleanoperations +, ufoprocessor, ufonormalizer, psautohint +, setuptools_scm +, pytest +}: + +buildPythonPackage rec { + pname = "afdko"; + version = "3.5.0"; + + disabled = pythonOlder "3.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0wid4l70bxm297xgayyrgw5glhp6n92gh4sz1nd4rncgf1ziz8ck"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + booleanoperations + fonttools + lxml # fonttools[lxml], defcon[lxml] extra + fs # fonttools[ufo] extra + unicodedata2 # fonttools[unicode] extra + brotlipy # fonttools[woff] extra + zopfli # fonttools[woff] extra + fontpens + brotli + defcon + fontmath + mutatormath + ufoprocessor + ufonormalizer + psautohint + ]; + + # tests are broken on non x86_64 + # https://github.com/adobe-type-tools/afdko/issues/1163 + # https://github.com/adobe-type-tools/afdko/issues/1216 + doCheck = stdenv.isx86_64; + checkInputs = [ pytest ]; + checkPhase = '' + PATH="$PATH:$out/bin" py.test + ''; + + meta = with stdenv.lib; { + description = "Adobe Font Development Kit for OpenType"; + homepage = "https://adobe-type-tools.github.io/afdko/"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/aioftp/default.nix b/pkgs/development/python-modules/aioftp/default.nix index 522d6c2ed38..6dca5bf906d 100644 --- a/pkgs/development/python-modules/aioftp/default.nix +++ b/pkgs/development/python-modules/aioftp/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.16.1"; + version = "0.17.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0rqzg4w86zch0cjslkndv02gmpi0r27lsy1qi1irpa8hqfhh23ja"; + sha256 = "87869958fa98c4691acad0815840a94c1b50c6925d037d4dbb51331ddf4911f3"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/aiohttp/default.nix b/pkgs/development/python-modules/aiohttp/default.nix index 9dcd34c1d1b..2e5191909bb 100644 --- a/pkgs/development/python-modules/aiohttp/default.nix +++ b/pkgs/development/python-modules/aiohttp/default.nix @@ -54,6 +54,8 @@ buildPythonPackage rec { "proxy_https_bad_response" "partially_applied_handler" "middleware" + # no longer compatible with pytest>=6 + "aiohttp_plugin_async_fixture" ] ++ lib.optionals stdenv.is32bit [ "test_cookiejar" ] ++ lib.optionals isPy38 [ diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 68354cee0b2..b495bf4df46 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "2.1.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "bdd08ad65505057b9dc8fc1b5558250bd13aeba681a493080f710ffffc4260a3"; + sha256 = "35696d04d6eb0328b7031ea3c0a3cfe5d83dfcf62f920522e4767d165c6bc529"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/aiounifi/default.nix b/pkgs/development/python-modules/aiounifi/default.nix index 589ebc08ef4..3b05d2c3811 100644 --- a/pkgs/development/python-modules/aiounifi/default.nix +++ b/pkgs/development/python-modules/aiounifi/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "aiounifi"; - version = "22"; + version = "23"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ad2625c8a62e28781d50644f4a4df5a97a32174b965cd3b329820ae85e2dfcc3"; + sha256 = "0628058b644776132f2f893f1a2201a0142a38b6acf089c6b11a63ad5a752ba7"; }; propagatedBuildInputs = [ aiohttp ]; diff --git a/pkgs/development/python-modules/alerta-server/default.nix b/pkgs/development/python-modules/alerta-server/default.nix index b9fb265f252..571b1fea2e3 100644 --- a/pkgs/development/python-modules/alerta-server/default.nix +++ b/pkgs/development/python-modules/alerta-server/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta-server"; - version = "7.5.6"; + version = "8.0.3"; src = fetchPypi { inherit pname version; - sha256 = "507abdb64c8b83c8ff0c21e39b03a21ccd7884ca3ce31afacea2d97e4d39f2e8"; + sha256 = "894d240c51428225264867a80094b9743d71272635a18ddfefa5832b61fed2c6"; }; propagatedBuildInputs = [ python-dateutil requests pymongo raven bcrypt flask pyjwt flask-cors psycopg2 pytz flask-compress jinja2 pyyaml]; diff --git a/pkgs/development/python-modules/alerta/default.nix b/pkgs/development/python-modules/alerta/default.nix index cdfea1f4c30..a024592b4ed 100644 --- a/pkgs/development/python-modules/alerta/default.nix +++ b/pkgs/development/python-modules/alerta/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "alerta"; - version = "7.5.7"; + version = "8.0.0"; src = fetchPypi { inherit pname version; - sha256 = "849966c05e9899ac72af23991e9f17271c42bba89035c49d257a9dd96b54695b"; + sha256 = "49e0862c756d644e9349f5040dd59d135cd871ffeaea5fc288eb3a2e818cf61a"; }; propagatedBuildInputs = [ six click requests pytz tabulate ]; diff --git a/pkgs/development/python-modules/amqp/default.nix b/pkgs/development/python-modules/amqp/default.nix index f9b1e62caa3..5fa41412a7c 100644 --- a/pkgs/development/python-modules/amqp/default.nix +++ b/pkgs/development/python-modules/amqp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "amqp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "24dbaff8ce4f30566bb88976b398e8c4e77637171af3af6f1b9650f48890e60b"; + sha256 = "70cdb10628468ff14e57ec2f751c7aa9e48e7e3651cfd62d431213c0c4e58f21"; }; propagatedBuildInputs = [ vine ]; diff --git a/pkgs/development/python-modules/ansiconv/default.nix b/pkgs/development/python-modules/ansiconv/default.nix index 7ad683b8c36..d2de4837e07 100644 --- a/pkgs/development/python-modules/ansiconv/default.nix +++ b/pkgs/development/python-modules/ansiconv/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; sha256 = "0ljfpl8x069arzginvpi1v6hlaq4x2qpjqj01qds2ylz33scq8r4"; - }; + }; checkInputs = [ pytest ]; @@ -21,4 +21,3 @@ buildPythonPackage rec { }; } - diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix index 313383f4261..1c140266b9e 100644 --- a/pkgs/development/python-modules/apprise/default.nix +++ b/pkgs/development/python-modules/apprise/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "apprise"; - version = "0.8.6"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - sha256 = "695f9b98b7eb273901d9d28a026a69a028a57ab7d666bdf146ecc215c80b5041"; + sha256 = "18a65c5917bf7f2d48bb557bf0879e49c5293b4c0e9809328387ae09338ae37b"; }; nativeBuildInputs = [ Babel ]; diff --git a/pkgs/development/python-modules/aria2p/default.nix b/pkgs/development/python-modules/aria2p/default.nix index 51b523c010a..9126969c22d 100644 --- a/pkgs/development/python-modules/aria2p/default.nix +++ b/pkgs/development/python-modules/aria2p/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { rev = "v${version}"; sha256 = "1inak3y2win58zbzykfzy6xp00f276sqsz69h2nfsd93mpr74wf6"; }; - + nativeBuildInputs = [ poetry ]; preBuild = '' diff --git a/pkgs/development/python-modules/asdf/default.nix b/pkgs/development/python-modules/asdf/default.nix index f3c3615d926..c1b5ebc786d 100644 --- a/pkgs/development/python-modules/asdf/default.nix +++ b/pkgs/development/python-modules/asdf/default.nix @@ -15,12 +15,12 @@ buildPythonPackage rec { pname = "asdf"; - version = "2.6.0"; + version = "2.7.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1ym9mmxjpnnlinly1rxfqj9rlyl2fv7dxc81f30n1b8n9pwc6jb5"; + sha256 = "687d741f19db663b769eb188458dafd4fe5cc10201640ffed3210c7f138f15d0"; }; postPatch = '' diff --git a/pkgs/development/python-modules/asn1crypto/default.nix b/pkgs/development/python-modules/asn1crypto/default.nix index 156f77b4c97..989b974c64a 100644 --- a/pkgs/development/python-modules/asn1crypto/default.nix +++ b/pkgs/development/python-modules/asn1crypto/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "asn1crypto"; - version = "1.3.0"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0bf4xxaig0b9dv6njynaqk2j7vlpagh3y49s9qj95y0jvjw5q8as"; + sha256 = "f4f6e119474e58e04a2b1af817eb585b4fd72bdd89b998624712b5c99be7641c"; }; # No tests included diff --git a/pkgs/development/python-modules/astor/default.nix b/pkgs/development/python-modules/astor/default.nix index 02610d042ce..0d7aa387712 100644 --- a/pkgs/development/python-modules/astor/default.nix +++ b/pkgs/development/python-modules/astor/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy27, pytest, fetchpatch }: +{ lib, buildPythonPackage, fetchPypi, isPy27, pytestCheckHook, fetchpatch }: buildPythonPackage rec { pname = "astor"; @@ -10,15 +10,15 @@ buildPythonPackage rec { }; # disable tests broken with python3.6: https://github.com/berkerpeksag/astor/issues/89 - checkInputs = [ pytest ]; - checkPhase = '' - py.test -k 'not check_expressions \ - and not check_astunparse \ - and not test_convert_stdlib \ - and not test_codegen_as_submodule \ - and not test_positional_only_arguments \ - and not test_codegen_from_root' - ''; + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + "check_expressions" + "check_astunparse" + "convert_stdlib" + "codegen_as_submodule" + "positional_only_arguments" + "codegen_from_root" + ]; meta = with lib; { description = "Library for reading, writing and rewriting python AST"; diff --git a/pkgs/development/python-modules/asyncpg/default.nix b/pkgs/development/python-modules/asyncpg/default.nix index 794e0fa5242..826ee6103fc 100644 --- a/pkgs/development/python-modules/asyncpg/default.nix +++ b/pkgs/development/python-modules/asyncpg/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0gw665737pr9b0lmmxlnwgmw1sbwv00xp8jdxws1xxi6nc72mjsk"; + sha256 = "53cb2a0eb326f61e34ef4da2db01d87ce9c0ebe396f65a295829df334e31863f"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/asyncssh/default.nix b/pkgs/development/python-modules/asyncssh/default.nix index ad7612259df..e85de90b1f6 100644 --- a/pkgs/development/python-modules/asyncssh/default.nix +++ b/pkgs/development/python-modules/asyncssh/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "asyncssh"; - version = "2.2.1"; + version = "2.3.0"; disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "baf9f1aa397a104a0c3923bae927796ca57063ce62330767131b418cd833338e"; + sha256 = "44bda34c7123f00c3df95d24e2dc8d43c4d17b456fbb8c434ef4f4a7ebb5265e"; }; patches = [ diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 57e54d24ae3..37cd2211833 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -17,16 +17,16 @@ buildPythonPackage rec { pname = "atlassian-python-api"; version = "1.16.0"; - + src = fetchPypi { inherit pname version; sha256 = "1sp036192vdl5nqifcswg2j838vf8i9k8bfd0w4qh1vz4f0pjz7y"; }; - + checkInputs = [ pytestrunner pytest ]; - + propagatedBuildInputs = [ oauthlib requests requests_oauthlib six ]; - + meta = with lib; { description = "Python Atlassian REST API Wrapper"; homepage = "https://github.com/atlassian-api/atlassian-python-api"; @@ -34,4 +34,3 @@ buildPythonPackage rec { maintainers = [ maintainers.arnoldfarkas ]; }; } - diff --git a/pkgs/development/python-modules/atpublic/default.nix b/pkgs/development/python-modules/atpublic/default.nix index e2c3e8af6b0..021d8e8b307 100644 --- a/pkgs/development/python-modules/atpublic/default.nix +++ b/pkgs/development/python-modules/atpublic/default.nix @@ -1,18 +1,26 @@ -{ lib, isPy3k, fetchPypi, buildPythonPackage -, pytest }: +{ lib, isPy3k, pythonOlder, fetchPypi, buildPythonPackage +, pytest +, pytestcov +, sybil +, typing-extensions +}: buildPythonPackage rec { pname = "atpublic"; - version = "1.0"; + version = "2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0i3sbxkdlbb4560rrlmwwd5y4ps7k73lp4d8wnmd7ag9k426gjkx"; + sha256 = "ebeb62b71a5c683a84c1b16bbf415708af5a46841b142b85ac3a22ec2d7613b0"; }; + propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; + checkInputs = [ - pytest + pytest pytestcov sybil ]; checkPhase = '' diff --git a/pkgs/development/python-modules/audiotools/default.nix b/pkgs/development/python-modules/audiotools/default.nix index ee029726d1c..1ad21608274 100644 --- a/pkgs/development/python-modules/audiotools/default.nix +++ b/pkgs/development/python-modules/audiotools/default.nix @@ -25,4 +25,4 @@ buildPythonPackage rec { homepage = "http://audiotools.sourceforge.net/"; license = lib.licenses.gpl2Plus; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/auth0-python/default.nix b/pkgs/development/python-modules/auth0-python/default.nix index fed673453d1..1b50e70aaee 100644 --- a/pkgs/development/python-modules/auth0-python/default.nix +++ b/pkgs/development/python-modules/auth0-python/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "auth0-python"; - version = "3.10.0"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "e02525fd60d4b1e7e08bdc539b536db635da28ee25cc882412be4296802d0281"; + sha256 = "fbc54a231ca787ae0917223028269582abbd963cfa9d53ba822a601dd9cd2215"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/autobahn/default.nix b/pkgs/development/python-modules/autobahn/default.nix index 4ad97ebc93f..909fb65996b 100644 --- a/pkgs/development/python-modules/autobahn/default.nix +++ b/pkgs/development/python-modules/autobahn/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "autobahn"; - version = "20.4.3"; + version = "20.7.1"; src = fetchPypi { inherit pname version; - sha256 = "c6fe745d52ba9f9eecf791cd31f558df42aebfc4f9ee558a8f1d18c707e1ae1f"; + sha256 = "86bbce30cdd407137c57670993a8f9bfdfe3f8e994b889181d85e844d5aa8dfb"; }; propagatedBuildInputs = [ six txaio twisted zope_interface cffi cryptography pynacl ] ++ diff --git a/pkgs/development/python-modules/avro-python3/default.nix b/pkgs/development/python-modules/avro-python3/default.nix index 1ec3d296222..e6bd5acbbb8 100644 --- a/pkgs/development/python-modules/avro-python3/default.nix +++ b/pkgs/development/python-modules/avro-python3/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "avro-python3"; - version = "1.9.2.1"; + version = "1.10.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "ca1e77a3da5ac98e8833588f71fb2e170b38e34787ee0e04920de0e9470b7d32"; + sha256 = "a455c215540b1fceb1823e2a918e94959b54cb363307c97869aa46b5b55bde05"; }; doCheck = false; # No such file or directory: './run_tests.py diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix index fbda87404f6..d9f57686845 100644 --- a/pkgs/development/python-modules/avro/default.nix +++ b/pkgs/development/python-modules/avro/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "00rg1nn9szwm0p1lcda0w3iyqy9mx2y9zv0hdwaz6k0bsagziydv"; + sha256 = "bbf9f89fd20b4cf3156f10ec9fbce83579ece3e0403546c305957f9dac0d2f03"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix index bff57f554d7..65dfd462857 100644 --- a/pkgs/development/python-modules/awkward/default.nix +++ b/pkgs/development/python-modules/awkward/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "awkward"; - version = "0.12.22"; + version = "0.13.0"; src = fetchPypi { inherit pname version; - sha256 = "185d93588c4cc150b2426b2764cdf2370f1807c607c1b4b057c66b2a08720c43"; + sha256 = "1a461ee084ea5e98333dacf2506e9b2619ee89cece14b9b99830b546b35c5922"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix index a9b8834be26..5245801bb09 100644 --- a/pkgs/development/python-modules/aws-sam-translator/default.nix +++ b/pkgs/development/python-modules/aws-sam-translator/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "aws-sam-translator"; - version = "1.24.0"; + version = "1.26.0"; src = fetchPypi { inherit pname version; - sha256 = "f6b67545a87ec1e276bd5bf06abcc84332c4eb9dfa2fd415113e07a908fe55bb"; + sha256 = "1a3fd8e48a745967e8457b9cefdc3ad0f139ac4a25af4db9c13a9e1c19ea6910"; }; # Tests are not included in the PyPI package diff --git a/pkgs/development/python-modules/aws-xray-sdk/default.nix b/pkgs/development/python-modules/aws-xray-sdk/default.nix index 607118564c5..313dd4241d5 100644 --- a/pkgs/development/python-modules/aws-xray-sdk/default.nix +++ b/pkgs/development/python-modules/aws-xray-sdk/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "aws-xray-sdk"; - version = "2.5.0"; + version = "2.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8dfa785305fc8dc720d8d4c2ec6a58e85e467ddc3a53b1506a2ed8b5801c8fc7"; + sha256 = "abf5b90f740e1f402e23414c9670e59cb9772e235e271fef2bce62b9100cbc77"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index ecffc5b2a21..38b580df252 100644 --- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "0.16.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "308aeabdff61bf35ceb7a3d6dd19f1ab69a041bd92c85ee24d98a624968697f3"; + sha256 = "e08b37aea8e6b62596f55f9beb924e1759b2dc424c180ab2e752153a2b01b723"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index ded4531b48a..b6f0dadf225 100644 --- a/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.6.0"; + version = "1.7.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "b1d06279307c41da5e0a5c9722aa6b36ce3b2c212534a54767210639451b9800"; + sha256 = "9d1120bd9760687d87594ec5ce9257b7335504afbe55b3cda79462c1e07a095b"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/backcall/default.nix b/pkgs/development/python-modules/backcall/default.nix index f1951a13d78..b5a53b62132 100644 --- a/pkgs/development/python-modules/backcall/default.nix +++ b/pkgs/development/python-modules/backcall/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "backcall"; - version = "0.1.0"; + version = "0.2.0"; src = fetchPypi { inherit pname version; - sha256 = "38ecd85be2c1e78f77fd91700c76e14667dc21e2713b63876c0eb901196e01e4"; + sha256 = "5cbdbf27be5e7cfadb448baf0aa95508f91f2bbc6c6437cd9cd06e2a4c215e1e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/batchgenerators/default.nix b/pkgs/development/python-modules/batchgenerators/default.nix index bfc52c99ef5..b0f3cdb6e11 100644 --- a/pkgs/development/python-modules/batchgenerators/default.nix +++ b/pkgs/development/python-modules/batchgenerators/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { repo = pname; rev = "v${version}"; sha256 = "0cc3i4wznqb7lk8n6jkprvkpsby6r7khkxqwn75k8f01mxgjfpvf"; - + }; patches = [ diff --git a/pkgs/development/python-modules/bayesian-optimization/default.nix b/pkgs/development/python-modules/bayesian-optimization/default.nix index 990d471bc6b..69494a4fa1f 100644 --- a/pkgs/development/python-modules/bayesian-optimization/default.nix +++ b/pkgs/development/python-modules/bayesian-optimization/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { scikitlearn scipy ]; - + checkInputs = [ pytest ]; checkPhase = '' pytest tests diff --git a/pkgs/development/python-modules/bcrypt/default.nix b/pkgs/development/python-modules/bcrypt/default.nix index 2468eaccecd..dc50c56018e 100644 --- a/pkgs/development/python-modules/bcrypt/default.nix +++ b/pkgs/development/python-modules/bcrypt/default.nix @@ -1,15 +1,16 @@ -{ stdenv, buildPythonPackage, isPyPy, fetchPypi +{ stdenv, buildPythonPackage, isPyPy, fetchPypi, pythonOlder , cffi, pycparser, mock, pytest, py, six }: with stdenv.lib; buildPythonPackage rec { - version = "3.1.7"; + version = "3.2.0"; pname = "bcrypt"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0b0069c752ec14172c5f78208f1863d7ad6755a6fae6fe76ec2c80d13be41e42"; + sha256 = "5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29"; }; buildInputs = [ pycparser mock pytest py ]; propagatedBuildInputs = [ six ] ++ optional (!isPyPy) cffi; diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix index 32ac3e8bd19..4b5cabbbde4 100644 --- a/pkgs/development/python-modules/bellows/default.nix +++ b/pkgs/development/python-modules/bellows/default.nix @@ -5,14 +5,14 @@ let pname = "bellows"; - version = "0.17.0"; + version = "0.18.1"; in buildPythonPackage rec { inherit pname version; src = fetchPypi { inherit pname version; - sha256 = "03gckhrxji8lgjsi6xr8yql405kfanii5hjrmakk1328bmq9g5f6"; + sha256 = "6a2e323c2be6f10a8e99fffccb5670bc77bbddb7b5bd9253b69021120f2ab9d7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/bespon/default.nix b/pkgs/development/python-modules/bespon/default.nix index cb6dbcf0d9c..51e29e55d07 100644 --- a/pkgs/development/python-modules/bespon/default.nix +++ b/pkgs/development/python-modules/bespon/default.nix @@ -4,18 +4,18 @@ }: buildPythonPackage rec { - version = "0.4.0"; + version = "0.5.0"; pname = "BespON"; src = fetchPypi { inherit pname version; - sha256 = "4acfa3f918d416654beccd4db69290f498edb78bf39941287dcbc068b9a7ce2f"; + sha256 = "a75cd7e62746fb0fef9b98aa157a44f9ed2ef63e952f7ae4ec5b3c2892669187"; }; propagatedBuildInputs = [ ]; # upstream doesn't contain tests doCheck = false; - + pythonImportsCheck = [ "bespon" ]; meta = with stdenv.lib; { description = "Encodes and decodes data in the BespON format."; diff --git a/pkgs/development/python-modules/bidict/default.nix b/pkgs/development/python-modules/bidict/default.nix index ec0440b9e44..8c7acc0a8ad 100644 --- a/pkgs/development/python-modules/bidict/default.nix +++ b/pkgs/development/python-modules/bidict/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "bidict"; - version = "0.19.0"; + version = "0.20.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11wiis62kcw6g3n4gdj39fx1yrlq5vz3zx3kmb6g79mliyhn2x7g"; + sha256 = "c1b1ce1c0f1e3457489672bc3a4db375a06f61ae7797a9eedf71ea788cea3870"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/bip_utils/default.nix b/pkgs/development/python-modules/bip_utils/default.nix index ff4fae389cd..490df40e93c 100644 --- a/pkgs/development/python-modules/bip_utils/default.nix +++ b/pkgs/development/python-modules/bip_utils/default.nix @@ -8,12 +8,13 @@ buildPythonPackage rec { pname = "bip_utils"; - version = "1.0.5"; + version = "1.4.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e8397a315c2f656ccf37ff1c43f5e0d496a10ea692c614fdf9bae1a3d5de3558"; + sha256 = "582022ab5c1ff35d0179a22a39c90b7e4e71e4641d59b2a3e81d60df741d1e3c"; }; propagatedBuildInputs = [ ecdsa pysha3 ]; diff --git a/pkgs/development/python-modules/bitarray/default.nix b/pkgs/development/python-modules/bitarray/default.nix index c6a82d8ec42..1e995af3920 100644 --- a/pkgs/development/python-modules/bitarray/default.nix +++ b/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.5.1"; + version = "1.5.3"; src = fetchPypi { inherit pname version; - sha256 = "45bba08bc142781ec7e18a847735219390808f9b6279c356252edddaee1f5fcd"; + sha256 = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix index 63f1319f567..63371fc6eec 100644 --- a/pkgs/development/python-modules/bleak/default.nix +++ b/pkgs/development/python-modules/bleak/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "bleak"; - version = "0.6.4"; + version = "0.7.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1dc32899d0700c5b5ed9abf642dfee28ac62b1fb5d7be5fa5a6db104dec9a03c"; + sha256 = "25f630cf558efda5cbf620d921b85a80ae963c537feaa18cc934f7fa38dc482d"; }; postPatch = '' diff --git a/pkgs/development/python-modules/blis/default.nix b/pkgs/development/python-modules/blis/default.nix index 596579f8148..5d4b9bcb5e2 100644 --- a/pkgs/development/python-modules/blis/default.nix +++ b/pkgs/development/python-modules/blis/default.nix @@ -20,11 +20,13 @@ buildPythonPackage rec { cython ]; + propagatedBuildInputs = [ + numpy + ]; + checkInputs = [ - cython hypothesis - numpy pytest ]; diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 270e1617448..ec1229965e0 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "block-io"; - version = "1.1.14"; + version = "1.1.15"; src = fetchPypi { inherit pname version; - sha256 = "b87b753fe8d2812c3534be025f85ed97d1a00e8fe49c03fe9ad09d71860d672d"; + sha256 = "97ea037a67af72037cb08cec7e0a9f7866ecdfaa1a8c8ebcc0f4b9359a1516d7"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix index e1b9bc16521..48fc3bf6998 100644 --- a/pkgs/development/python-modules/boltztrap2/default.nix +++ b/pkgs/development/python-modules/boltztrap2/default.nix @@ -14,13 +14,13 @@ }: buildPythonPackage rec { - version = "20.2.1"; + version = "20.7.1"; pname = "BoltzTraP2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1cbf17c5479eec82efd1e8a26202c3320b1986597a08706cafa46bfb80cc3001"; + sha256 = "41caa32e5778323471d87033f23537f6178a7aea64fba894c7f2b2579b51f7ed"; }; dontUseCmakeConfigure = true; diff --git a/pkgs/development/python-modules/booleanoperations/default.nix b/pkgs/development/python-modules/booleanoperations/default.nix new file mode 100644 index 00000000000..c747df90f5a --- /dev/null +++ b/pkgs/development/python-modules/booleanoperations/default.nix @@ -0,0 +1,34 @@ +{ lib, buildPythonPackage, fetchPypi +, fonttools, fs, pyclipper, defcon, fontpens +, setuptools_scm, pytest +}: + +buildPythonPackage rec { + pname = "booleanOperations"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1f41lb19m8azchl1aqz6j5ycbspb8jsf1cnn42hlydxd68f85ylc"; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + fonttools + fs + pyclipper + defcon + fontpens + ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "Boolean operations on paths"; + homepage = "https://github.com/typemytype/booleanOperations"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index 59fc878b2c0..595026d8a12 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.14.32"; # N.B: if you change this, change botocore too + version = "1.14.43"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "d494a23295b2db9920e85391dc8106dc08d91dd40eeba5c05002771fe10f8853"; + sha256 = "a6c9a3d3abbad2ff2e5751af599492a9271633a7c9fef343482524464c53e451"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index e8f0684456f..b5cbea8e7f9 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.17.32"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.17.43"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "52a80cb721160b687179bd7077e63d775130455a678bf4280fb37c524c2bd67d"; + sha256 = "3fb144d2b5d705127f394f7483737ece6fa79577ca7c493e4f42047ac8636200"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/breathe/default.nix b/pkgs/development/python-modules/breathe/default.nix index d6fd70031aa..5afb3bfffcf 100644 --- a/pkgs/development/python-modules/breathe/default.nix +++ b/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.19.2"; + version = "4.20.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1mzcggfr61lqkn6sghg842ah9slfjr0ikc776vbx60iqqw9l1gvn"; + sha256 = "d7e1e1ee9b0615423b7e9abc64f0afe12e7bcf32c817a8fd1d9c8c3c4b3d71c9"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/pkgs/development/python-modules/brotlipy/default.nix b/pkgs/development/python-modules/brotlipy/default.nix index 1dd2a070480..f914d2d6c97 100644 --- a/pkgs/development/python-modules/brotlipy/default.nix +++ b/pkgs/development/python-modules/brotlipy/default.nix @@ -33,4 +33,4 @@ buildPythonPackage rec { homepage = "https://github.com/python-hyper/brotlipy/"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/bugsnag/default.nix b/pkgs/development/python-modules/bugsnag/default.nix index 612ab13c193..adae7ff1c38 100644 --- a/pkgs/development/python-modules/bugsnag/default.nix +++ b/pkgs/development/python-modules/bugsnag/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "bugsnag"; - version = "3.6.1"; + version = "3.7.1"; src = fetchPypi { inherit pname version; - sha256 = "8878437aa44ec485cecb255742035b3b98a6c7e7d167a943b5fbe597b2f8f7f9"; + sha256 = "32966bfe625ec6fc0dbc9d86d79a18f31b22b2fdec3ca070eeb3495304f7e18d"; }; propagatedBuildInputs = [ six webob ]; diff --git a/pkgs/development/python-modules/build/default.nix b/pkgs/development/python-modules/build/default.nix index baf583c45e0..97a7f9a201b 100644 --- a/pkgs/development/python-modules/build/default.nix +++ b/pkgs/development/python-modules/build/default.nix @@ -43,4 +43,4 @@ buildPythonPackage rec { description = "A simple, correct PEP517 package builder"; license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/caldav/default.nix b/pkgs/development/python-modules/caldav/default.nix index 0d96372abfc..57dffe89fc3 100644 --- a/pkgs/development/python-modules/caldav/default.nix +++ b/pkgs/development/python-modules/caldav/default.nix @@ -4,6 +4,7 @@ , pythonOlder , icalendar , lxml +, mock , nose , pytz , requests @@ -23,6 +24,7 @@ buildPythonPackage rec { sha256 = "0m64maiqp3k8fsgkkvdx1dlfhkc70pqig4dclq6w8ajz82czrq83"; }; + nativeBuildInputs = lib.optionals (pythonOlder "3.5") [ mock ]; propagatedBuildInputs = [ six requests vobject lxml ] ++ lib.optionals (pythonOlder "3.6") [ pytz tzlocal ]; diff --git a/pkgs/development/python-modules/canonicaljson/default.nix b/pkgs/development/python-modules/canonicaljson/default.nix index 34d75d77a9c..8edd8d05500 100644 --- a/pkgs/development/python-modules/canonicaljson/default.nix +++ b/pkgs/development/python-modules/canonicaljson/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0v2b72n28fi763xxv9vrf4qc61anl2ys9njy7hlm719fdaq3sxml"; + sha256 = "b4763db06a2e8553293c5edaa4bda05605c3307179a7ddfb30273a24ac384b6c"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix index 7829afa83f9..ecb1edf5958 100644 --- a/pkgs/development/python-modules/cassandra-driver/default.nix +++ b/pkgs/development/python-modules/cassandra-driver/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "cassandra-driver"; - version = "3.23.0"; + version = "3.24.0"; src = fetchPypi { inherit pname version; - sha256 = "a3b075bfd36677024b1dcf55a561fac161fc4f4065f01557b21a0b02ebad05c2"; + sha256 = "83ec8d9a5827ee44bb1c0601a63696a8a9086beaf0151c8255556299246081bd"; }; nativeBuildInputs = [ cython ]; diff --git a/pkgs/development/python-modules/catalogue/default.nix b/pkgs/development/python-modules/catalogue/default.nix index eb1aec37c63..608d9dc4269 100644 --- a/pkgs/development/python-modules/catalogue/default.nix +++ b/pkgs/development/python-modules/catalogue/default.nix @@ -2,26 +2,30 @@ , buildPythonPackage , fetchPypi , pythonOlder +, pytestCheckHook , importlib-metadata }: buildPythonPackage rec { pname = "catalogue"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "34f8416ec5e7ed08e55c10414416e67c3f4d66edf83bc67320c3290775293816"; + sha256 = "0d01077dbfca7aa53f3ef4adecccce636bce4f82e5b52237703ab2f56478e56e"; }; propagatedBuildInputs = [ importlib-metadata ]; + checkInputs = [ pytestCheckHook ]; + meta = with stdenv.lib; { description = "Tiny library for adding function or object registries"; homepage = "https://github.com/explosion/catalogue"; + changelog = "https://github.com/explosion/catalogue/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; - }; + }; } diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix index 83ecf49436c..3fd1b51a466 100644 --- a/pkgs/development/python-modules/celery/default.nix +++ b/pkgs/development/python-modules/celery/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "celery"; - version = "4.4.6"; + version = "4.4.7"; src = fetchPypi { inherit pname version; - sha256 = "1ni5c3qgbhb7871b3i55wc306m3g2n0qxp92g5gszdxiicjf8xzx"; + sha256 = "d220b13a8ed57c78149acf82c006785356071844afe0b27012a4991d44026f9f"; }; postPatch = '' diff --git a/pkgs/development/python-modules/certbot/default.nix b/pkgs/development/python-modules/certbot/default.nix index 79e5c3288b7..07ceea731b9 100644 --- a/pkgs/development/python-modules/certbot/default.nix +++ b/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1y0m5qm853i6pcpb2mrf8kjkr9wr80mdrx1qmck38ayvr2v2p5lc"; + sha256 = "1fx29gsa3glwh0ik5k2gynwdz6i3ckq9aakf6ip92n3qyh6l08a8"; }; sourceRoot = "source/${pname}"; diff --git a/pkgs/development/python-modules/certifi/default.nix b/pkgs/development/python-modules/certifi/default.nix index 9e2bbc5c88d..e5733e2e51a 100644 --- a/pkgs/development/python-modules/certifi/default.nix +++ b/pkgs/development/python-modules/certifi/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "certifi"; - version = "2020.4.5.2"; + version = "2020.6.20"; src = fetchPypi { inherit pname version; - sha256 = "5ad7e9a056d25ffa5082862e36f119f7f7cec6457fa07ee2f8c339814b80c9b1"; + sha256 = "5930595817496dd21bb8dc35dad090f1c2cd0adfaf21204bf6732ca5d8ee34d3"; }; pythonImportsCheck = [ "certifi" ]; diff --git a/pkgs/development/python-modules/certipy/default.nix b/pkgs/development/python-modules/certipy/default.nix index 12706ab3d8a..5d34eede311 100644 --- a/pkgs/development/python-modules/certipy/default.nix +++ b/pkgs/development/python-modules/certipy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ pyopenssl ]; - + doCheck = false; #no tests were included meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix index a8862010c47..c4e14c0e7fb 100644 --- a/pkgs/development/python-modules/cffi/default.nix +++ b/pkgs/development/python-modules/cffi/default.nix @@ -2,11 +2,11 @@ if isPyPy then null else buildPythonPackage rec { pname = "cffi"; - version = "1.14.1"; + version = "1.14.2"; src = fetchPypi { inherit pname version; - sha256 = "b2a2b0d276a136146e012154baefaea2758ef1f56ae9f4e01c612b0831e0bd2f"; + sha256 = "ae8f34d50af2c2154035984b8b5fc5d9ed63f32fe615646ab435b05b132ca91b"; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix index 1b940fa2c4e..5a80f9253ba 100644 --- a/pkgs/development/python-modules/cfn-lint/default.nix +++ b/pkgs/development/python-modules/cfn-lint/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "cfn-lint"; - version = "0.33.0"; + version = "0.35.0"; src = fetchPypi { inherit pname version; - sha256 = "b74bb89a3d0da4a744179b07bc186b9fbc4800f929bf635bb6246e80fb91a953"; + sha256 = "42023d89520e3a29891ec2eb4c326eef9d1f7516fe9abee8b6c97ce064187b45"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cftime/default.nix b/pkgs/development/python-modules/cftime/default.nix index 7638695ff2d..1a29e51b35f 100644 --- a/pkgs/development/python-modules/cftime/default.nix +++ b/pkgs/development/python-modules/cftime/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cftime"; - version = "1.1.3"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1w2iakkzxfhyrqrspn40am8x7bzdp5qqdqbm1asbj7fa3mivi17x"; + sha256 = "ab5d5076f7d3e699758a244ada7c66da96bae36e22b9e351ce0ececc36f0a57f"; }; checkInputs = [ pytest coveralls pytestcov ]; @@ -28,4 +28,4 @@ buildPythonPackage rec { description = "Time-handling functionality from netcdf4-python"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/chalice/default.nix b/pkgs/development/python-modules/chalice/default.nix index cb5fab46140..fb2af329ea7 100644 --- a/pkgs/development/python-modules/chalice/default.nix +++ b/pkgs/development/python-modules/chalice/default.nix @@ -1,29 +1,32 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , attrs , botocore , click , enum-compat +, hypothesis , jmespath +, mock +, mypy-extensions , pip +, pytest +, pyyaml , setuptools , six , typing -, wheel , watchdog -, pytest -, hypothesis -, mock +, wheel }: buildPythonPackage rec { pname = "chalice"; - version = "1.14.1"; + version = "1.18.1"; src = fetchPypi { inherit pname version; - sha256 = "457e71fd84951574ccbe72d1389d9c89aaf5e69a552b01d1f1585faa63459c26"; + sha256 = "0zb4xk9b553pnfzh8s909cixfdplqnc3nda0fjwjrryi2nxjxd6a"; }; checkInputs = [ watchdog pytest hypothesis mock ]; @@ -33,10 +36,13 @@ buildPythonPackage rec { click enum-compat jmespath + mypy-extensions pip + pyyaml setuptools six wheel + ] ++ lib.optionals (pythonOlder "3.5") [ typing ]; diff --git a/pkgs/development/python-modules/chameleon/default.nix b/pkgs/development/python-modules/chameleon/default.nix index 96bd1aa8aaa..d522764c799 100644 --- a/pkgs/development/python-modules/chameleon/default.nix +++ b/pkgs/development/python-modules/chameleon/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "Chameleon"; - version = "3.7.4"; + version = "3.8.1"; src = fetchPypi { inherit pname version; - sha256 = "37c01c9af720bc80a0097ebc07eb41e802917ad0006c9a77dc158479c087664b"; + sha256 = "adf9609a2fa4ad20deb390605495f9a5d617b737bfbd86e51a49bbac2acaf316"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/channels-redis/default.nix b/pkgs/development/python-modules/channels-redis/default.nix index b8a95387571..fb0774478a0 100644 --- a/pkgs/development/python-modules/channels-redis/default.nix +++ b/pkgs/development/python-modules/channels-redis/default.nix @@ -34,7 +34,7 @@ buildPythonPackage rec { # pytest # pytest-asyncio # ]; - # + # # # Fails with : ConnectionRefusedError: [Errno 111] Connect call failed ('127.0.0.1', 6379) # # (even with a local redis instance running) # checkPhase = '' diff --git a/pkgs/development/python-modules/cheroot/default.nix b/pkgs/development/python-modules/cheroot/default.nix index 6ea7c8dd8ca..34f1f0fe468 100644 --- a/pkgs/development/python-modules/cheroot/default.nix +++ b/pkgs/development/python-modules/cheroot/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "cheroot"; - version = "8.3.1"; + version = "8.4.4"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "7076d5845f64d729e4155ec2650ad24ee70209340d11b9e619a82e9210a579b8"; + sha256 = "ca92669cc90fbd0920fda1ebcc431147e7d3ae6887216ce404f85f1b3133fa93"; }; nativeBuildInputs = [ setuptools_scm setuptools-scm-git-archive ]; diff --git a/pkgs/development/python-modules/cherrypy/default.nix b/pkgs/development/python-modules/cherrypy/default.nix index 99d21c130da..f23d0600192 100644 --- a/pkgs/development/python-modules/cherrypy/default.nix +++ b/pkgs/development/python-modules/cherrypy/default.nix @@ -32,10 +32,13 @@ buildPythonPackage rec { objgraph pytest pytestcov pathpy requests_toolbelt pytest-services ]; + # Keyboard interrupt ends test suite run + # daemonize and autoreload tests have issue with sockets within sandbox # Disable doctest plugin because times out checkPhase = '' substituteInPlace pytest.ini --replace "--doctest-modules" "" pytest \ + -k 'not KeyboardInterrupt and not daemonize and not Autoreload' \ --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \ --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \ ${stdenv.lib.optionalString stdenv.isDarwin diff --git a/pkgs/development/python-modules/cliff/default.nix b/pkgs/development/python-modules/cliff/default.nix index 00da74929a4..220ff790e7c 100644 --- a/pkgs/development/python-modules/cliff/default.nix +++ b/pkgs/development/python-modules/cliff/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.1.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "0j9q6725226hdhdyy9b0qfjngdj35d3y7fxbmfxpr36ksbh0x6sj"; + sha256 = "49be854582ec4a74240cb72f287846f823cd8cbd2e25f924541d12f27104bda3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudflare/default.nix b/pkgs/development/python-modules/cloudflare/default.nix index 802235d674b..d18bbd8773c 100644 --- a/pkgs/development/python-modules/cloudflare/default.nix +++ b/pkgs/development/python-modules/cloudflare/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cloudflare"; - version = "2.7.1"; + version = "2.8.13"; src = fetchPypi { inherit pname version; - sha256 = "0w8ihj9gram2d4wkbki8f6gr8hsd950b3wzfi1qqqm17lqfk8k7h"; + sha256 = "a662990737d86984156a48f769e6528d947e90fd1561bb5e19d0036b59b9fd6f"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cloudpickle/default.nix b/pkgs/development/python-modules/cloudpickle/default.nix index 551dd06f630..092a0f7c0b1 100644 --- a/pkgs/development/python-modules/cloudpickle/default.nix +++ b/pkgs/development/python-modules/cloudpickle/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cloudpickle"; - version = "1.4.1"; + version = "1.5.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "0b6258a20a143603d53b037a20983016d4e978f554ec4f36b3d0895b947099ae"; + sha256 = "820c9245cebdec7257211cbe88745101d5d6a042bca11336d78ebd4897ddbc82"; }; buildInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix index 9d58c130582..d00c87af704 100644 --- a/pkgs/development/python-modules/cmd2/default.nix +++ b/pkgs/development/python-modules/cmd2/default.nix @@ -6,11 +6,11 @@ }: buildPythonPackage rec { pname = "cmd2"; - version = "1.0.2"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "1f18plbc9yyvhn0js3d2bii9yld8zfl775gxsaw9jza5pmlg9ss2"; + sha256 = "38015008ff4639edfd66591063a0e9bb75a62dccb14ee3ec7bf3a6cb130de5cf"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/colander/default.nix b/pkgs/development/python-modules/colander/default.nix index 944a7818452..0492e271746 100644 --- a/pkgs/development/python-modules/colander/default.nix +++ b/pkgs/development/python-modules/colander/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "colander"; - version = "1.7.0"; + version = "1.8.2"; src = fetchPypi { inherit pname version; - sha256 = "d758163a22d22c39b9eaae049749a5cd503f341231a02ed95af480b1145e81f2"; + sha256 = "54878d2ffd1afb020daca6cd5c6cfe6c0e44d0069fc825d57fe59aa6e4f6a499"; }; propagatedBuildInputs = [ translationstring iso8601 enum34 ]; diff --git a/pkgs/development/python-modules/configparser/4.nix b/pkgs/development/python-modules/configparser/4.nix index 038ee49d2c6..9c6c631d9c2 100644 --- a/pkgs/development/python-modules/configparser/4.nix +++ b/pkgs/development/python-modules/configparser/4.nix @@ -23,4 +23,4 @@ buildPythonPackage rec { license = licenses.mit; homepage = "https://github.com/jaraco/configparser"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/confluent-kafka/default.nix b/pkgs/development/python-modules/confluent-kafka/default.nix index 6aab0f45b38..8048d6f78a2 100644 --- a/pkgs/development/python-modules/confluent-kafka/default.nix +++ b/pkgs/development/python-modules/confluent-kafka/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, isPy3k, rdkafka, requests, avro3k, avro, futures, enum34 }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.5.0"; pname = "confluent-kafka"; src = fetchPypi { inherit pname version; - sha256 = "c2660807e5c1ecd723e280f76918794c3fd84595000c1e8de1f254f5d89a785c"; + sha256 = "9ac812006000887f76c95b8a33a9f0b65845bf072fbc54a42a1acffd34e41120"; }; buildInputs = [ rdkafka requests ] ++ (if isPy3k then [ avro3k ] else [ enum34 avro futures ]) ; diff --git a/pkgs/development/python-modules/cookiecutter/default.nix b/pkgs/development/python-modules/cookiecutter/default.nix index 873cbe142d9..23bc8bcec52 100644 --- a/pkgs/development/python-modules/cookiecutter/default.nix +++ b/pkgs/development/python-modules/cookiecutter/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 future binaryornot click whichcraft poyo jinja2_time requests python-slugify ]; - + # requires network access for cloning git repos doCheck = false; checkPhase = '' diff --git a/pkgs/development/python-modules/cornice/default.nix b/pkgs/development/python-modules/cornice/default.nix index 442a06061ec..9897115353f 100644 --- a/pkgs/development/python-modules/cornice/default.nix +++ b/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "5.0.1"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "4efa77a0d0402f1b92481a53853d65936956a568d64a4f6a703b62feb5b8cf62"; + sha256 = "4fcf3be295514e7e20fdd602fea8d204127bb02da2ff6bdbc8b6fba859ac9fd0"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix index a22009ac9db..fa5f4bca8cd 100644 --- a/pkgs/development/python-modules/coverage/default.nix +++ b/pkgs/development/python-modules/coverage/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "coverage"; - version = "5.1"; + version = "5.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0ll0hr8g3szbxa4al6khhzi6l92a3vwyldj0085whl44s55gq2zr"; + sha256 = "a34cb28e0747ea15e82d13e14de606747e9e484fb28d63c999483f5d5188e89b"; }; # No tests in archive diff --git a/pkgs/development/python-modules/coveralls/default.nix b/pkgs/development/python-modules/coveralls/default.nix index c81cd3c666a..64078693ac1 100644 --- a/pkgs/development/python-modules/coveralls/default.nix +++ b/pkgs/development/python-modules/coveralls/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "coveralls"; - version = "2.0.0"; + version = "2.1.2"; disabled = isPy27; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "d213f5edd49053d03f0db316ccabfe17725f2758147afc9a37eaca9d8e8602b5"; + sha256 = "4430b862baabb3cf090d36d84d331966615e4288d8a8c5957e0fd456d0dd8bd6"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/cppy/default.nix b/pkgs/development/python-modules/cppy/default.nix index c6477c15533..fffa9174424 100644 --- a/pkgs/development/python-modules/cppy/default.nix +++ b/pkgs/development/python-modules/cppy/default.nix @@ -24,4 +24,4 @@ buildPythonPackage rec { homepage = "https://github.com/nucleic/cppy"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/credstash/default.nix b/pkgs/development/python-modules/credstash/default.nix index 07547b280f5..1abd3f4ed20 100644 --- a/pkgs/development/python-modules/credstash/default.nix +++ b/pkgs/development/python-modules/credstash/default.nix @@ -1,4 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose }: +{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose +, fetchpatch +}: buildPythonPackage rec { pname = "credstash"; @@ -9,6 +11,12 @@ buildPythonPackage rec { sha256 = "6c04e8734ef556ab459018da142dd0b244093ef176b3be5583e582e9a797a120"; }; + patches = [ + (fetchpatch { + url = "https://github.com/fugue/credstash/commit/9c02ee43ed6e37596cafbca2fe80c532ec19d2d8.patch"; + sha256 = "dlybrpfLK+PqwWWhH9iXgXHYysZGmcZAFGWNOwsG0xA="; + }) + ]; # The install phase puts an executable and a copy of the library it imports in # bin/credstash and bin/credstash.py, despite the fact that the library is also # installed to lib/python<version>/site-packages/credstash.py. diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 94ec349e038..2bbd20a16d7 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "cupy"; - version = "7.5.0"; + version = "7.7.0"; src = fetchPypi { inherit pname version; - sha256 = "243254a1607e19ca55191c4cca4c0f2b143e1d5914e2a1bc9e3f715e7ccafc41"; + sha256 = "b4032adf839f63bab7fc9f3e7066ef86abe0928e834aa5d132e4e7ce907951ed"; }; checkInputs = [ @@ -20,7 +20,7 @@ buildPythonPackage rec { preConfigure = '' export CUDA_PATH=${cudatoolkit} - ''; + ''; propagatedBuildInputs = [ cudatoolkit diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix index 8d2b6398c4b..29b19414151 100644 --- a/pkgs/development/python-modules/cvxpy/default.nix +++ b/pkgs/development/python-modules/cvxpy/default.nix @@ -11,18 +11,19 @@ , scs , six # Check inputs +, pytestCheckHook , nose }: buildPythonPackage rec { pname = "cvxpy"; - version = "1.1.4"; + version = "1.1.5"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1f37da2f891508ebc2bbb2b75c46a2076be39a60a45c8a88261e000e8aabeef2"; + sha256 = "7c826a874db2e4cefe54e63ebd3a3763d0d72e55a17c7d1cfec80008a87b8d81"; }; propagatedBuildInputs = [ @@ -36,15 +37,19 @@ buildPythonPackage rec { six ]; - checkInputs = [ nose ]; - checkPhase = '' - nosetests cvxpy - ''; + checkInputs = [ pytestCheckHook nose ]; + pytestFlagsArray = [ "./cvxpy" ]; + # Disable the slowest benchmarking tests, cuts test time in half + disabledTests = [ + "test_tv_inpainting" + "test_diffcp_sdp_example" + ]; meta = with lib; { description = "A domain-specific language for modeling convex optimization problems in Python."; homepage = "https://www.cvxpy.org/"; downloadPage = "https://github.com/cvxgrp/cvxpy/releases"; + changelog = "https://github.com/cvxgrp/cvxpy/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 98d3460d757..e9292bfa737 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cx_Freeze"; - version = "6.1"; + version = "6.2"; src = fetchPypi { inherit pname version; - sha256 = "a0181bdb0ed16b292f4cfb8cd3afc84e956fc187431f25392bd981460dd73da0"; + sha256 = "44bbbcea3196b79da77cc22637cb28a825b51182d32209e8a3f6cd4042edc247"; }; propagatedBuildInputs = [ ncurses ]; diff --git a/pkgs/development/python-modules/cx_oracle/default.nix b/pkgs/development/python-modules/cx_oracle/default.nix index 6ba8f338638..cecb41c3d88 100644 --- a/pkgs/development/python-modules/cx_oracle/default.nix +++ b/pkgs/development/python-modules/cx_oracle/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "cx_Oracle"; - version = "7.3.0"; + version = "8.0.0"; buildInputs = [ odpic ]; src = fetchPypi { inherit pname version; - sha256 = "2e0da54e948b55e5c75fab14b391d58aa8b9be1eddfd9ec9a8a0e500bc8bfc7e"; + sha256 = "cddc298301789c724de5817611f7bd38b4859b371928e2e85a9c37af222f73c8"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/dask-ml/default.nix b/pkgs/development/python-modules/dask-ml/default.nix index 7aca68b396c..d4a6663e7a5 100644 --- a/pkgs/development/python-modules/dask-ml/default.nix +++ b/pkgs/development/python-modules/dask-ml/default.nix @@ -20,13 +20,13 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.6.0"; pname = "dask-ml"; disabled = pythonOlder "3.6"; # >= 3.6 src = fetchPypi { inherit pname version; - sha256 = "8a9879b7d1642ed8cd48115d81f92a246eb7ffeadc42748053c5339a56f569b4"; + sha256 = "ce686b7fd49b3f876d651c87e8468ad71bcd2707399140d6baf198184c45d970"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dask-mpi/default.nix b/pkgs/development/python-modules/dask-mpi/default.nix index 741e39423a9..2794bcba7ae 100644 --- a/pkgs/development/python-modules/dask-mpi/default.nix +++ b/pkgs/development/python-modules/dask-mpi/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.21.0"; pname = "dask-mpi"; src = fetchPypi { inherit pname version; - sha256 = "774cd2d69e5f7154e1fa133c22498062edd31507ffa2ea19f4ab4d8975c27bc3"; + sha256 = "76e153fc8c58047d898970b33ede0ab1990bd4e69cc130c6627a96f11b12a1a7"; }; checkInputs = [ pytest requests ]; diff --git a/pkgs/development/python-modules/dask-xgboost/default.nix b/pkgs/development/python-modules/dask-xgboost/default.nix index 9b9388e56c7..9730ca8a2fe 100644 --- a/pkgs/development/python-modules/dask-xgboost/default.nix +++ b/pkgs/development/python-modules/dask-xgboost/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "0.1.10"; + version = "0.1.11"; pname = "dask-xgboost"; src = fetchPypi { inherit pname version; - sha256 = "454c47ccf64315d35beeca32c7cedf20d8a8d42471d5e6ce0c51f4af0a6e021e"; + sha256 = "3fbe1bf4344dc74edfbe9f928c7e3e6acc26dc57cefd8da8ae56a15469c6941c"; }; checkInputs = [ pytest scikitlearn ]; diff --git a/pkgs/development/python-modules/databricks-connect/default.nix b/pkgs/development/python-modules/databricks-connect/default.nix new file mode 100644 index 00000000000..59ebd4ef114 --- /dev/null +++ b/pkgs/development/python-modules/databricks-connect/default.nix @@ -0,0 +1,32 @@ +{ lib, jdk, buildPythonPackage, fetchPypi, six, py4j }: + +buildPythonPackage rec { + pname = "databricks-connect"; + version = "7.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "996a9d0f271f6c7edbd2d85b2efb6ff4e58d15222e80f87ca17fdbf224e17056"; + }; + + sourceRoot = "."; + + propagatedBuildInputs = [ py4j six jdk ]; + + # requires network access + doCheck = false; + + preFixup = '' + substituteInPlace "$out/bin/find-spark-home" \ + --replace find_spark_home.py .find_spark_home.py-wrapped + ''; + + pythonImportsCheck = [ "pyspark" "six" "py4j" ]; + + meta = with lib; { + description = "Client for connecting to remote Databricks clusters"; + homepage = "https://pypi.org/project/databricks-connect"; + license = licenses.databricks; + maintainers = with maintainers; [ kfollesdal ]; + }; +} diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 807ed5f9a3d..748c0a53521 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -1,21 +1,22 @@ -{ lib, buildPythonPackage, fetchPypi -, decorator, requests, simplejson, pillow +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, decorator, requests, simplejson, pillow, typing , nose, mock, pytest, freezegun }: buildPythonPackage rec { pname = "datadog"; - version = "0.36.0"; + version = "0.38.0"; src = fetchPypi { inherit pname version; - sha256 = "1kkbsrzxc2a6k319lh98qkinn99dzcqz8h4fm25q17dlgmc9gq9z"; + sha256 = "401cd1dcf2d5de05786016a1c790bff28d1428d12ae1dbe11485f9cb5502939b"; }; postPatch = '' find . -name '*.pyc' -exec rm {} \; ''; - propagatedBuildInputs = [ decorator requests simplejson pillow ]; + propagatedBuildInputs = [ decorator requests simplejson pillow ] + ++ lib.optionals (pythonOlder "3.5") [ typing ]; checkInputs = [ nose mock pytest freezegun ]; checkPhase = '' diff --git a/pkgs/development/python-modules/dbf/default.nix b/pkgs/development/python-modules/dbf/default.nix index a2f7b603b84..9eb6e4f89a2 100644 --- a/pkgs/development/python-modules/dbf/default.nix +++ b/pkgs/development/python-modules/dbf/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "dbf"; - version = "0.98.3"; + version = "0.99.0"; src = fetchPypi { inherit pname version; - sha256 = "01d71vya2x87f3kl9x0s8xp0n7wixn6ksrd054y7idq3n1mjaxzh"; + sha256 = "a4a7a8cdc113d840142d21a796c16c7d329ad35c48f17156446732c83ebc571a"; }; propagatedBuildInputs = [ aenum ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; diff --git a/pkgs/development/python-modules/deepdiff/default.nix b/pkgs/development/python-modules/deepdiff/default.nix index 228d5a78239..e8d2731eb55 100644 --- a/pkgs/development/python-modules/deepdiff/default.nix +++ b/pkgs/development/python-modules/deepdiff/default.nix @@ -3,6 +3,7 @@ , fetchPypi , mock , jsonpickle +, mmh3 , ordered-set , numpy , pytestCheckHook @@ -10,11 +11,11 @@ buildPythonPackage rec { pname = "deepdiff"; - version = "4.3.2"; + version = "5.0.2"; src = fetchPypi { inherit pname version; - sha256 = "91360be1d9d93b1d9c13ae9c5048fa83d9cff17a88eb30afaa0d7ff2d0fee17d"; + sha256 = "e2b74af4da0ef9cd338bb6e8c97242c1ec9d81fcb28298d7bb24acdc19ea79d7"; }; # # Extra packages (may not be necessary) @@ -24,14 +25,9 @@ buildPythonPackage rec { pytestCheckHook ]; - disabledTests = [ - # skipped tests require murmur module - "test_prep_str_murmur3_64bit" - "test_prep_str_murmur3_128bit" - ]; - propagatedBuildInputs = [ jsonpickle + mmh3 ordered-set ]; diff --git a/pkgs/development/python-modules/defcon/default.nix b/pkgs/development/python-modules/defcon/default.nix new file mode 100644 index 00000000000..25c59029992 --- /dev/null +++ b/pkgs/development/python-modules/defcon/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder +, fonttools +, pytest, pytestrunner, lxml, fs, unicodedata2, fontpens +}: + +buildPythonPackage rec { + pname = "defcon"; + version = "0.7.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1lfqsvxmq1j0nvp26gidnqkj1dyxv7jalc6i7fz1r3nc7niflrqr"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + fonttools + ]; + + checkInputs = [ + pytest + pytestrunner + lxml + fs + unicodedata2 + fontpens + ]; + + meta = with lib; { + description = "A set of UFO based objects for use in font editing applications"; + homepage = "https://github.com/robotools/defcon"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/dependency-injector/default.nix b/pkgs/development/python-modules/dependency-injector/default.nix index 63fad6467c2..ea0ef783573 100644 --- a/pkgs/development/python-modules/dependency-injector/default.nix +++ b/pkgs/development/python-modules/dependency-injector/default.nix @@ -9,11 +9,11 @@ in buildPythonPackage rec { pname = "dependency-injector"; - version = "3.15.6"; + version = "3.30.4"; src = fetchPypi { inherit pname version; - sha256 = "fcca1464f567d902983bff507b9e2e3fda0f932ee009e36f74ed5b8c348d17f4"; + sha256 = "717388a9346883eb5def3e96def7275763f2a607cac48c272f352e3834e0bd0d"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/diff-match-patch/default.nix b/pkgs/development/python-modules/diff-match-patch/default.nix index ba33eeda386..3e05deb5e2d 100644 --- a/pkgs/development/python-modules/diff-match-patch/default.nix +++ b/pkgs/development/python-modules/diff-match-patch/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "diff-match-patch"; - version = "20181111"; + version = "20200713"; meta = { homepage = "https://github.com/diff-match-patch-python/diff-match-patch"; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a809a996d0f09b9bbd59e9bbd0b71eed8c807922512910e05cbd3f9480712ddb"; + sha256 = "da6f5a01aa586df23dfc89f3827e1cafbb5420be9d87769eeb079ddfd9477a18"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index ba115121441..fe4213d13f0 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -27,12 +27,12 @@ buildPythonPackage rec { pname = "distributed"; - version = "2.18.0"; + version = "2.23.0"; # get full repository need conftest.py to run tests src = fetchPypi { inherit pname version; - sha256 = "902f098fb7558f035333804a5aeba2fb26a2a715388808205a17cbb2e02e0558"; + sha256 = "469e505fd7ce75f600188bdb69a95641899d5b372f74246c8f308376b6929e9c"; }; checkInputs = [ pytest pytest-repeat pytest-timeout mock joblib ]; diff --git a/pkgs/development/python-modules/django-auth-ldap/default.nix b/pkgs/development/python-modules/django-auth-ldap/default.nix index c419fff7902..84b9df28bce 100644 --- a/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -1,7 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi, isPy27 -, ldap , django +, ldap , django , mock }: @@ -14,8 +14,8 @@ buildPythonPackage rec { sha256 = "11af1773b08613339d2c3a0cec1308a4d563518f17b1719c3759994d0b4d04bf"; }; - propagatedBuildInputs = [ ldap django ]; - checkInputs = [ mock ]; + propagatedBuildInputs = [ ldap django ]; + checkInputs = [ mock ]; # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/pkgs/development/python-modules/django-cleanup/default.nix b/pkgs/development/python-modules/django-cleanup/default.nix index 1f5e313c39c..bb933fd0343 100644 --- a/pkgs/development/python-modules/django-cleanup/default.nix +++ b/pkgs/development/python-modules/django-cleanup/default.nix @@ -4,10 +4,10 @@ buildPythonPackage rec { pname = "django-cleanup"; - version = "4.0.1"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "4d0fd9ad3117a219e4cb3e35dd32f39c764a860ce56b820abb88ad3ec063ffd7"; + sha256 = "84f0c0e0a74545adae4c944a76ccf8fb0c195dddccf3b7195c59267abb7763dd"; }; checkInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-cors-headers/default.nix b/pkgs/development/python-modules/django-cors-headers/default.nix index 11c935df996..3614114a3d4 100644 --- a/pkgs/development/python-modules/django-cors-headers/default.nix +++ b/pkgs/development/python-modules/django-cors-headers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-cors-headers"; - version = "3.3.0"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "73d654950b5f5e7e4f67c05183d2169d4f7518ceb87734eb0d68f9e43be59f1c"; + sha256 = "f5218f2f0bb1210563ff87687afbf10786e080d8494a248e705507ebd92d7153"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-dynamic-preferences/default.nix b/pkgs/development/python-modules/django-dynamic-preferences/default.nix index d472a595568..34fb7a1d7b5 100644 --- a/pkgs/development/python-modules/django-dynamic-preferences/default.nix +++ b/pkgs/development/python-modules/django-dynamic-preferences/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "django-dynamic-preferences"; - version = "1.9"; + version = "1.10"; src = fetchPypi { inherit pname version; - sha256 = "407db27bf55d391c4c8a4944e0521f35eff82c2f2fd5a2fc843fb1b4cc1a31f4"; + sha256 = "2310291c7f40606be045938d65e117383549aa8a979c6c4b700464c6a6204a34"; }; - propagatedBuildInputs = [ six django persisting-theory ]; + propagatedBuildInputs = [ six django persisting-theory ]; # django.core.exceptions.ImproperlyConfigured: Requested setting DYNAMIC_PREFERENCES, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; diff --git a/pkgs/development/python-modules/django-ipware/default.nix b/pkgs/development/python-modules/django-ipware/default.nix index 4049f8722fc..940bd1f1cb8 100644 --- a/pkgs/development/python-modules/django-ipware/default.nix +++ b/pkgs/development/python-modules/django-ipware/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "2.1.0"; + version = "3.0.1"; meta = { description = "A Django application to retrieve user's IP address"; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "a7c7a8fd019dbdc9c357e6e582f65034e897572fc79a7e467674efa8aef9d00b"; + sha256 = "73a640a5bff00aa7503a35e92e462001cfabb07d73d649c262f117423beee953"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django-multiselectfield/default.nix b/pkgs/development/python-modules/django-multiselectfield/default.nix index 3561f1d8c1c..046c60989a7 100644 --- a/pkgs/development/python-modules/django-multiselectfield/default.nix +++ b/pkgs/development/python-modules/django-multiselectfield/default.nix @@ -23,4 +23,4 @@ buildPythonPackage rec { homepage = "https://github.com/goinnn/django-multiselectfield"; license = lib.licenses.lgpl3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/django-q/default.nix b/pkgs/development/python-modules/django-q/default.nix index 9c19903a3f5..a81aa2a63cd 100644 --- a/pkgs/development/python-modules/django-q/default.nix +++ b/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.2.4"; + version = "1.3.3"; src = fetchPypi { inherit pname version; - sha256 = "6838e6dda377ab6bd31f5721a66aa6d19ad9a88ca9c03cbb464b2321d3c4c979"; + sha256 = "de7077660ede36bfdd89ab9405d6393b598bb3e0bfed61f59a0a9074cc4942bb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/django/1_11.nix b/pkgs/development/python-modules/django/1_11.nix deleted file mode 100644 index b38962f4efa..00000000000 --- a/pkgs/development/python-modules/django/1_11.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ stdenv, buildPythonPackage, fetchurl, substituteAll, - geos, gdal, pytz, - withGdal ? false -}: - -buildPythonPackage rec { - pname = "Django"; - version = "1.11.28"; - - src = fetchurl { - url = "https://www.djangoproject.com/m/releases/1.11/${pname}-${version}.tar.gz"; - sha256 = "1ss1jyip7mlbfjn27m0j6wx80s8h4ksg6g5annkgwigp8xgy6g5k"; - }; - - patches = stdenv.lib.optionals withGdal [ - (substituteAll { - src = ./1.10-gis-libs.template.patch; - geos = geos; - gdal = gdal; - extension = stdenv.hostPlatform.extensions.sharedLibrary; - }) - ]; - - propagatedBuildInputs = [ pytz ]; - - # too complicated to setup - doCheck = false; - - meta = with stdenv.lib; { - description = "A high-level Python Web framework"; - homepage = "https://www.djangoproject.com/"; - license = licenses.bsd3; - }; -} diff --git a/pkgs/development/python-modules/django_evolution/default.nix b/pkgs/development/python-modules/django_evolution/default.nix index 7d53d458043..eac119ef01e 100644 --- a/pkgs/development/python-modules/django_evolution/default.nix +++ b/pkgs/development/python-modules/django_evolution/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "django_evolution"; - version = "0.7.8"; + version = "2.0"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "493ff2adad760990ce8cf87c13955af85d4dcff097427bc3619ed01672fac4a8"; + sha256 = "a0bc983657de1b0bc5c8d29ddcbf7b6fb113685bf306ccc266cf22b8a77bd862"; }; propagatedBuildInputs = [ django ]; diff --git a/pkgs/development/python-modules/django_guardian/default.nix b/pkgs/development/python-modules/django_guardian/default.nix index b03524aa590..364a5e12f52 100644 --- a/pkgs/development/python-modules/django_guardian/default.nix +++ b/pkgs/development/python-modules/django_guardian/default.nix @@ -4,11 +4,11 @@ }: buildPythonPackage rec { pname = "django-guardian"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "8cacf49ebcc1e545f0a8997971eec0fe109f5ed31fc2a569a7bf5615453696e2"; + sha256 = "ed2de26e4defb800919c5749fb1bbe370d72829fbd72895b6cf4f7f1a7607e1b"; }; checkInputs = [ pytest pytestrunner pytest-django django_environ mock ]; diff --git a/pkgs/development/python-modules/djangoql/default.nix b/pkgs/development/python-modules/djangoql/default.nix index 28aa28c3b99..0d5190aba77 100644 --- a/pkgs/development/python-modules/djangoql/default.nix +++ b/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.13.1"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "366293d7d4e416f9f7d6e2b98775c2129222fbb4dc660f3e6c7b9e35a3cf3fce"; + sha256 = "1b1f80940bb15982e06208b97d7b3d08e1d5f8fb62aa07e5e33599c7ce4c0334"; }; propagatedBuildInputs = [ ply ]; diff --git a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix index 626d704f1d8..f4c50a71149 100644 --- a/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix +++ b/pkgs/development/python-modules/djangorestframework-simplejwt/default.nix @@ -3,17 +3,17 @@ buildPythonPackage rec { pname = "djangorestframework_simplejwt"; version = "4.4.0"; - + src = fetchPypi { inherit pname version; sha256 = "c315be70aa12a5f5790c0ab9acd426c3a58eebea65a77d0893248c5144a5080c"; }; - + propagatedBuildInputs = [ django djangorestframework pyjwt ]; - + # Test raises django.core.exceptions.ImproperlyConfigured doCheck = false; - + meta = with lib; { description = "A minimal JSON Web Token authentication plugin for Django REST Framework"; homepage = "https://github.com/davesque/django-rest-framework-simplejwt"; diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 9147435076d..aaecda77780 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256:088iz5cqjqh4c7141d94pvn13bh25aizqlrifwv6fs5g16zj094s"; + sha256 = "9a2420bf09af686736773153fca32a02ae11ecbe24b540c26104628959f91121"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/dlib/default.nix b/pkgs/development/python-modules/dlib/default.nix index a57d8307551..027500ff2ab 100644 --- a/pkgs/development/python-modules/dlib/default.nix +++ b/pkgs/development/python-modules/dlib/default.nix @@ -1,4 +1,6 @@ -{ buildPythonPackage, dlib, python, pytest, more-itertools, avxSupport ? true, lib }: +{ buildPythonPackage, stdenv, lib, dlib, python, pytest, more-itertools +, avxSupport ? stdenv.hostPlatform.avxSupport +}: buildPythonPackage { inherit (dlib) name src nativeBuildInputs buildInputs meta; diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix index 6a65dba767c..c699638083a 100644 --- a/pkgs/development/python-modules/dnspython/default.nix +++ b/pkgs/development/python-modules/dnspython/default.nix @@ -1,13 +1,14 @@ -{ buildPythonPackage, fetchPypi, lib }: +{ buildPythonPackage, fetchPypi, lib, pythonOlder }: buildPythonPackage rec { pname = "dnspython"; - version = "1.16.0"; + version = "2.0.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "36c5e8e38d4369a08b6780b7f27d790a292b2b08eea01607865bf0936c558e01"; + sha256 = "044af09374469c3a39eeea1a146e8cac27daec951f1f1f157b1962fc7cb9d1b7"; }; # needs networking for some tests diff --git a/pkgs/development/python-modules/docker/default.nix b/pkgs/development/python-modules/docker/default.nix index fd43e8cf77c..fff9b272293 100644 --- a/pkgs/development/python-modules/docker/default.nix +++ b/pkgs/development/python-modules/docker/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.2.2"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0m4vgk2831yfdjy8vqyvvfnmwv270a44z358frdzb672wzfbmvi6"; + sha256 = "431a268f2caf85aa30613f9642da274c62f6ee8bae7d70d968e01529f7d6af93"; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/pkgs/development/python-modules/dockerfile-parse/default.nix b/pkgs/development/python-modules/dockerfile-parse/default.nix index 580945656b4..c0b14bf88ca 100644 --- a/pkgs/development/python-modules/dockerfile-parse/default.nix +++ b/pkgs/development/python-modules/dockerfile-parse/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, six, pytestcov, pytest }: buildPythonPackage rec { - version = "0.0.18"; + version = "1.0.0"; pname = "dockerfile-parse"; src = fetchPypi { inherit pname version; - sha256 = "a09eae6871b7b314f8a8bddb67b6c5002708b22247511906cf2a9a45564b83db"; + sha256 = "9ed92ede29a646094b52b8b302e477f08e63465b6ee524f5750810280143712e"; }; postPatch = '' diff --git a/pkgs/development/python-modules/docplex/default.nix b/pkgs/development/python-modules/docplex/default.nix index d79aec5b8d1..74ac3bbfdf3 100644 --- a/pkgs/development/python-modules/docplex/default.nix +++ b/pkgs/development/python-modules/docplex/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "docplex"; - version = "2.14.186"; + version = "2.15.194"; # No source available from official repo src = fetchPypi { inherit pname version; - sha256 = "ba78897869e938c9ad1cb58e7d82bcf693f5e9a0dfa5e2dbfcee2ae5ea5e87f8"; + sha256 = "976e9b4e18bccbabae04149c33247a795edb1f00110f1b511c5517ac6ac353bb"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/dogpile.cache/default.nix b/pkgs/development/python-modules/dogpile.cache/default.nix index cdc244bc1b4..de0354f786c 100644 --- a/pkgs/development/python-modules/dogpile.cache/default.nix +++ b/pkgs/development/python-modules/dogpile.cache/default.nix @@ -1,14 +1,14 @@ { stdenv, buildPythonPackage, fetchPypi -, pytest, pytestcov, mock, Mako, decorator +, pytest, pytestcov, mock, Mako, decorator, stevedore }: buildPythonPackage rec { pname = "dogpile.cache"; - version = "0.9.2"; + version = "1.0.2"; src = fetchPypi { inherit pname version; - sha256 = "bc9dde1ffa5de0179efbcdc73773ef0553921130ad01955422f2932be35c059e"; + sha256 = "64fda39d25b46486a4876417ca03a4af06f35bfadba9f59613f9b3d748aa21ef"; }; # Disable concurrency tests that often fail, @@ -26,7 +26,7 @@ buildPythonPackage rec { checkInputs = [ pytest pytestcov mock Mako ]; - propagatedBuildInputs = [ decorator ]; + propagatedBuildInputs = [ decorator stevedore ]; meta = with stdenv.lib; { description = "A caching front-end based on the Dogpile lock"; diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index f271411a285..51ddaa0de23 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dropbox"; - version = "10.3.0"; + version = "10.3.1"; src = fetchPypi { inherit pname version; - sha256 = "082ylb6xn8xzix61lv2n8ya1k0gd494kr9vr2ys8ldbwxq9nyaaz"; + sha256 = "6de5f6f36aad32d4382f3d0ad88ee85a22d81d638c960667b8e1ada05db2f98c"; }; # Set DROPBOX_TOKEN environment variable to a valid token. diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 7e9dae53bbc..aabebe1c521 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "emoji"; - version = "0.5.4"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "0x61xypwswhghchp5svs084didkgfwqpq2fbiapvirff5lx2srb0"; + sha256 = "e42da4f8d648f8ef10691bc246f682a1ec6b18373abfd9be10ec0b398823bd11"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/eventlet/default.nix b/pkgs/development/python-modules/eventlet/default.nix index 14c5cfcb390..300a660f324 100644 --- a/pkgs/development/python-modules/eventlet/default.nix +++ b/pkgs/development/python-modules/eventlet/default.nix @@ -12,22 +12,32 @@ buildPythonPackage rec { pname = "eventlet"; - version = "0.25.2"; + version = "0.26.1"; src = fetchPypi { inherit pname version; - sha256 = "4c8ab42c51bff55204fef43cff32616558bedbc7538d876bb6a96ce820c7f9ed"; + sha256 = "4f4a43366b4cbd4a3f2f231816e5c3dae8ab316df9b7da11f0525e2800559f33"; }; + propagatedBuildInputs = [ dnspython greenlet monotonic six ] + ++ lib.optional (pythonOlder "3.4") enum34; + + prePatch = '' + substituteInPlace setup.py \ + --replace "dnspython >= 1.15.0, < 2.0.0" "dnspython" + ''; + checkInputs = [ nose ]; doCheck = false; # too much transient errors to bother - propagatedBuildInputs = [ dnspython greenlet monotonic six ] ++ lib.optional (pythonOlder "3.4") enum34; + # unfortunately, it needs /etc/protocol to be present to not fail + #pythonImportsCheck = [ "eventlet" ]; meta = with lib; { homepage = "https://pypi.python.org/pypi/eventlet/"; description = "A concurrent networking library for Python"; + license = licenses.mit; }; } diff --git a/pkgs/development/python-modules/factory_boy/default.nix b/pkgs/development/python-modules/factory_boy/default.nix index 92e889564af..052551a4727 100644 --- a/pkgs/development/python-modules/factory_boy/default.nix +++ b/pkgs/development/python-modules/factory_boy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "factory_boy"; - version = "2.12.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "0w53hjgag6ad5i2vmrys8ysk54agsqvgbjy9lg8g0d8pi9h8vx7s"; + sha256 = "2ce2f665045d9f15145a6310565fcb8255d52fc6fd867f3b783b3ac3de6cf10e"; }; propagatedBuildInputs = [ faker ] ++ lib.optionals isPy27 [ ipaddress ]; diff --git a/pkgs/development/python-modules/fixtures/default.nix b/pkgs/development/python-modules/fixtures/default.nix index 35bf7cb90df..3042acbbe84 100644 --- a/pkgs/development/python-modules/fixtures/default.nix +++ b/pkgs/development/python-modules/fixtures/default.nix @@ -27,4 +27,4 @@ buildPythonPackage rec { homepage = "https://pypi.python.org/pypi/fixtures"; license = lib.licenses.asl20; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/flake8/default.nix b/pkgs/development/python-modules/flake8/default.nix index 761690ba9c0..e44aac202cf 100644 --- a/pkgs/development/python-modules/flake8/default.nix +++ b/pkgs/development/python-modules/flake8/default.nix @@ -19,8 +19,9 @@ buildPythonPackage rec { ++ stdenv.lib.optionals (pythonOlder "3.5") [ typing ] ++ stdenv.lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; + # fixtures fail to initialize correctly checkPhase = '' - py.test tests + py.test tests --ignore=tests/integration/test_checker.py ''; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/flaky/default.nix b/pkgs/development/python-modules/flaky/default.nix index 4fe79864791..9bf20e6cc3b 100644 --- a/pkgs/development/python-modules/flaky/default.nix +++ b/pkgs/development/python-modules/flaky/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "flaky"; - version = "3.6.1"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "8cd5455bb00c677f787da424eaf8c4a58a922d0e97126d3085db5b279a98b698"; + sha256 = "3ad100780721a1911f57a165809b7ea265a7863305acb66708220820caf8aa0d"; }; checkInputs = [ mock nose pytest ]; diff --git a/pkgs/development/python-modules/flask-marshmallow/default.nix b/pkgs/development/python-modules/flask-marshmallow/default.nix index bd28280a47a..5d783f6c7c4 100644 --- a/pkgs/development/python-modules/flask-marshmallow/default.nix +++ b/pkgs/development/python-modules/flask-marshmallow/default.nix @@ -4,17 +4,17 @@ buildPythonPackage rec { pname = "flask-marshmallow"; - version = "0.12.0"; + version = "0.13.0"; meta = { homepage = "https://github.com/marshmallow-code/flask-marshmallow"; description = "Flask + marshmallow for beautiful APIs"; license = lib.licenses.mit; - }; + }; src = fetchPypi { inherit pname version; - sha256 = "6e6aec171b8e092e0eafaf035ff5b8637bf3a58ab46f568c4c1bab02f2a3c196"; + sha256 = "aefc1f1d96256c430a409f08241bab75ffe97e5d14ac5d1f000764e39bf4873a"; }; propagatedBuildInputs = [ flask marshmallow ]; diff --git a/pkgs/development/python-modules/flit/default.nix b/pkgs/development/python-modules/flit/default.nix index 88a4028aa6d..c0944f4ff17 100644 --- a/pkgs/development/python-modules/flit/default.nix +++ b/pkgs/development/python-modules/flit/default.nix @@ -7,7 +7,7 @@ , requests_download , zipfile36 , pythonOlder -, pytest_4 +, pytest , testpath , responses , pytoml @@ -39,7 +39,7 @@ buildPythonPackage rec { zipfile36 ]; - checkInputs = [ pytest_4 testpath responses ]; + checkInputs = [ pytest testpath responses ]; # Disable test that needs some ini file. # Disable test that wants hg diff --git a/pkgs/development/python-modules/fluent-logger/default.nix b/pkgs/development/python-modules/fluent-logger/default.nix index d47465c9723..e99ececc24e 100644 --- a/pkgs/development/python-modules/fluent-logger/default.nix +++ b/pkgs/development/python-modules/fluent-logger/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ msgpack ]; - + # Tests fail because absent in package doCheck = false; diff --git a/pkgs/development/python-modules/fontmath/default.nix b/pkgs/development/python-modules/fontmath/default.nix new file mode 100644 index 00000000000..7a23abdd037 --- /dev/null +++ b/pkgs/development/python-modules/fontmath/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, fonttools +, pytest, pytestrunner +}: + +buildPythonPackage rec { + pname = "fontMath"; + version = "0.6.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "09xdqdjyjlx5k9ymi36d7hkgvn55zzjzd65l2yqidkfazlmh14ss"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fonttools ]; + checkInputs = [ pytest pytestrunner ]; + + meta = with lib; { + description = "A collection of objects that implement fast font, glyph, etc. math"; + homepage = "https://github.com/robotools/fontMath/"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/fontparts/default.nix b/pkgs/development/python-modules/fontparts/default.nix new file mode 100644 index 00000000000..dd341fef8b3 --- /dev/null +++ b/pkgs/development/python-modules/fontparts/default.nix @@ -0,0 +1,39 @@ +{ lib, buildPythonPackage, fetchPypi, python +, fonttools, lxml, fs, unicodedata2 +, defcon, fontpens, fontmath, booleanoperations +, pytest +}: + +buildPythonPackage rec { + pname = "fontParts"; + version = "0.9.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "0hwzdppmrrw1xz49x36h6mcsrwya1f3zpqrc206y73j4pbn7fh0k"; + extension = "zip"; + }; + + propagatedBuildInputs = [ + booleanoperations + fonttools + unicodedata2 # fonttools[unicode] extra + lxml # fonttools[lxml] extra + fs # fonttools[ufo] extra + defcon + fontpens # defcon[pens] extra + fontmath + ]; + + checkPhase = '' + ${python.interpreter} Lib/fontParts/fontshell/test.py + ''; + checkInputs = [ pytest ]; + + meta = with lib; { + description = "An API for interacting with the parts of fonts during the font development process."; + homepage = "https://github.com/robotools/fontParts"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/fontpens/default.nix b/pkgs/development/python-modules/fontpens/default.nix new file mode 100644 index 00000000000..02adb3b0642 --- /dev/null +++ b/pkgs/development/python-modules/fontpens/default.nix @@ -0,0 +1,38 @@ +{ lib, buildPythonPackage, fetchPypi, fonttools }: + +buildPythonPackage rec { + pname = "fontPens"; + version = "0.2.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "1za15dzsnymq6d9x7xdfqwgw4a3003wj75fn2crhyidkfd2s3nd6"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fonttools ]; + + # can't run normal tests due to circular dependency with fontParts + doCheck = false; + pythonImportsCheck = [ "fontPens" ] ++ (builtins.map (s: "fontPens." + s) [ + "angledMarginPen" + "digestPointPen" + "flattenPen" + "guessSmoothPointPen" + "marginPen" + "penTools" + "printPen" + "printPointPen" + "recordingPointPen" + "thresholdPen" + "thresholdPointPen" + "transformPointPen" + ]); + + meta = with lib; { + description = "A collection of classes implementing the pen protocol for manipulating glyphs"; + homepage = "https://github.com/robotools/fontPens"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/fonttools/default.nix b/pkgs/development/python-modules/fonttools/default.nix index 8aae67443ae..a1433d08bd0 100644 --- a/pkgs/development/python-modules/fonttools/default.nix +++ b/pkgs/development/python-modules/fonttools/default.nix @@ -1,38 +1,70 @@ { lib , buildPythonPackage -, fetchPypi -, isPy27 -, numpy +, fetchFromGitHub +, pythonOlder +, brotlipy +, zopfli +, fs +, lxml +, scipy +, munkres +, unicodedata2 +, sympy +, matplotlib +, reportlab , pytest -, pytestrunner +, pytest-randomly , glibcLocales }: buildPythonPackage rec { pname = "fonttools"; - version = "4.11.0"; - disabled = isPy27; + version = "4.14.0"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "7fe5937206099ef284055b8c94798782e0993a740eed87f0dd262ed9870788aa"; - extension = "zip"; + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "0aiaxjg2v2391gxnhp4nvmgfb3ygm6x7n080s5mnkfjq2bq319in"; }; - buildInputs = [ - numpy - ]; - + # all dependencies are optional, but + # we run the checks with them checkInputs = [ pytest - pytestrunner + pytest-randomly glibcLocales + # etree extra + lxml + # ufo extra + fs + # woff extra + brotlipy + zopfli + # unicode extra + unicodedata2 + # interpolatable extra + scipy + munkres + # symfont + sympy + # varLib + matplotlib + # pens + reportlab ]; preCheck = '' export LC_ALL="en_US.UTF-8" ''; + # avoid timing issues with timestamps in subset_test.py and ttx_test.py + checkPhase = '' + pytest Tests fontTools \ + -k 'not ttcompile_timestamp_calcs and not recalc_timestamp' + ''; + meta = { homepage = "https://github.com/fonttools/fonttools"; description = "A library to manipulate font files from Python"; diff --git a/pkgs/development/python-modules/ftputil/default.nix b/pkgs/development/python-modules/ftputil/default.nix index 941b5792f30..7ca97cba883 100644 --- a/pkgs/development/python-modules/ftputil/default.nix +++ b/pkgs/development/python-modules/ftputil/default.nix @@ -1,12 +1,12 @@ { lib, buildPythonPackage, fetchPypi, pytest }: buildPythonPackage rec { - version = "3.4"; + version = "4.0.0"; pname = "ftputil"; src = fetchPypi { inherit pname version; - sha256 = "374b01e174079e91babe2a462fbd6f6c00dbfbfa299dec04239ca4229fbf8762"; + sha256 = "d494c47f24fd3f8fbe92d40d90e0902c0e04288f200688af2b16d6b46fe441e1"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/fuse-python/default.nix b/pkgs/development/python-modules/fuse-python/default.nix index 8c69ead0ae0..ab87f57be39 100644 --- a/pkgs/development/python-modules/fuse-python/default.nix +++ b/pkgs/development/python-modules/fuse-python/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { buildInputs = [ fuse ]; nativeBuildInputs = [ pkgconfig ]; - + # no tests in the Pypi archive doCheck = false; @@ -22,4 +22,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/pkgs/development/python-modules/gast/default.nix b/pkgs/development/python-modules/gast/default.nix index 3d073df843d..49687ebe318 100644 --- a/pkgs/development/python-modules/gast/default.nix +++ b/pkgs/development/python-modules/gast/default.nix @@ -2,10 +2,10 @@ buildPythonPackage rec { pname = "gast"; - version = "0.3.3"; + version = "0.4.0"; src = fetchPypi { inherit pname version; - sha256 = "b881ef288a49aa81440d2c5eb8aeefd4c2bb8993d5f50edae7413a85bfdb3b57"; + sha256 = "40feb7b8b8434785585ab224d1568b857edb18297e5a3047f1ba012bc83b42c1"; }; checkInputs = [ astunparse ] ; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/gdown/default.nix b/pkgs/development/python-modules/gdown/default.nix index 74eb5de4865..37bc4ef0bf1 100644 --- a/pkgs/development/python-modules/gdown/default.nix +++ b/pkgs/development/python-modules/gdown/default.nix @@ -9,11 +9,11 @@ buildPythonApplication rec { pname = "gdown"; - version = "3.11.1"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1p023812hh7w7d08njjsfn0xzldl4m73yx8p243yb2q49ypjl6nz"; + sha256 = "bf5f001e3a7add296e5298240c64db88ba88e5c136bd1fe84fcbd542feb6fccd"; }; propagatedBuildInputs = [ filelock requests tqdm setuptools ]; diff --git a/pkgs/development/python-modules/geoip2/default.nix b/pkgs/development/python-modules/geoip2/default.nix index fea7d226a1c..329fe7aa07d 100644 --- a/pkgs/development/python-modules/geoip2/default.nix +++ b/pkgs/development/python-modules/geoip2/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "06q9r5sdmncj4yaxrdf0mls05jb5n6pwhf8j8r74825cks4mvysa"; + sha256 = "4afb5d899eac08444e461239c8afb165c90234adc0b5dc952792d9da74c9091b"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix index f7a89732467..ead4b297b8b 100644 --- a/pkgs/development/python-modules/globus-sdk/default.nix +++ b/pkgs/development/python-modules/globus-sdk/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - + checkInputs = [ flake8 nose2 mock ]; - + propagatedBuildInputs = [ requests pyjwt ]; - + meta = with lib; { description = "A convenient Pythonic interface to Globus REST APIs, including the Transfer API and the Globus Auth API."; homepage = "https://github.com/globus/globus-sdk-python"; diff --git a/pkgs/development/python-modules/glom/default.nix b/pkgs/development/python-modules/glom/default.nix index 4188bdccf91..6f52eb392a5 100644 --- a/pkgs/development/python-modules/glom/default.nix +++ b/pkgs/development/python-modules/glom/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "glom"; - version = "20.5.0"; + version = "20.8.0"; src = fetchPypi { inherit pname version; - sha256 = "e753d2e8d16647ffcd9f0f99ac85d3db523ff0a1f097cf0a154a60702bca7e42"; + sha256 = "5fa3a9d99c7f3e5410a810fa8a158c0f71e39036c47b77745c7f2e4630372f82"; }; propagatedBuildInputs = [ boltons attrs face ]; diff --git a/pkgs/development/python-modules/google-api-python-client/default.nix b/pkgs/development/python-modules/google-api-python-client/default.nix index 2a7f7629704..492a0519d18 100644 --- a/pkgs/development/python-modules/google-api-python-client/default.nix +++ b/pkgs/development/python-modules/google-api-python-client/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "google-api-python-client"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "01zzlr21rgl1skl7ayppp0qwn6s883i50xcvxs8jxzr4c5zz097s"; + sha256 = "0yxrz897kpjypfqzcy0ry90hc34w47q4fzqidp81h6pg01c03x6a"; }; # No tests included in archive diff --git a/pkgs/development/python-modules/google_api_core/default.nix b/pkgs/development/python-modules/google_api_core/default.nix index 9033f320425..a72f68c19ff 100644 --- a/pkgs/development/python-modules/google_api_core/default.nix +++ b/pkgs/development/python-modules/google_api_core/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.20.1"; + version = "1.22.1"; disabled = isPy27; # google namespace no longer works on python2 src = fetchPypi { inherit pname version; - sha256 = "6b757736bbc699db858794e9b71e2bbf17996075773a40551ef5e6b0fad2a2f9"; + sha256 = "35cba563034d668ae90ffe1f03193a84e745b38f09592f60258358b5e5ee6238"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_auth/default.nix b/pkgs/development/python-modules/google_auth/default.nix index 43c2ff8aa48..59ed94d3486 100644 --- a/pkgs/development/python-modules/google_auth/default.nix +++ b/pkgs/development/python-modules/google_auth/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "google-auth"; - version = "1.17.2"; + version = "1.20.1"; src = fetchPypi { inherit pname version; - sha256 = "e634b649967d83c02dd386ecae9ce4a571528d59d51a4228757e45f5404a060b"; + sha256 = "2f34dd810090d0d4c9d5787c4ad7b4413d1fbfb941e13682c7a2298d3b6cdcc8"; }; propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; diff --git a/pkgs/development/python-modules/google_cloud_asset/default.nix b/pkgs/development/python-modules/google_cloud_asset/default.nix index 5d4328ead52..927ad94e78f 100644 --- a/pkgs/development/python-modules/google_cloud_asset/default.nix +++ b/pkgs/development/python-modules/google_cloud_asset/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-asset"; - version = "0.10.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d25ab222daaa0b827b00dae8c76e4c1b13ba5c687f0acdfd66529b805d41b7f3"; + sha256 = "fd4c0f7f61a8a1c5907cd6cc27a028b16236bf3d982ff412df0d2c981cef5ae5"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_automl/default.nix b/pkgs/development/python-modules/google_cloud_automl/default.nix index 6900b4f212f..43ffdc7a70d 100644 --- a/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-automl"; - version = "0.10.0"; + version = "1.0.1"; src = fetchPypi { inherit pname version; - sha256 = "031331fs97jpyxacwsmhig0ndidn97r288qnkrzfdvg1wxw5rdhi"; + sha256 = "f08abe78d37fb94a3748aa43e66dae2bad52f991cc7740501a341bc6f6387fd5"; }; checkInputs = [ pandas pytest mock google_cloud_storage ]; diff --git a/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/pkgs/development/python-modules/google_cloud_bigquery/default.nix index 0b7c5d5c16e..b8120285917 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.24.0"; + version = "1.26.1"; src = fetchPypi { inherit pname version; - sha256 = "1ca22hzql8x1z6bx9agidx0q09w24jwzkgg49k5j1spcignwxz3z"; + sha256 = "51c29b95d460486d9e0210f63e8193691cd08480b69775270e84dd3db87c1bf2"; }; checkInputs = [ pytest mock ipython freezegun ]; diff --git a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix index dc5098fd67a..97ad04334fc 100644 --- a/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigquery_datatransfer/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery-datatransfer"; - version = "1.0.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "6eae79e6950f70d48b0578ae95f93530b4eac28216b96e2279cb2f94c5f2ba33"; + sha256 = "71791a38a0ec535fdd4970d3403aa4cb2d9ca5c2729f80730858be2776b3c518"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_bigtable/default.nix b/pkgs/development/python-modules/google_cloud_bigtable/default.nix index 0eb606bf7f4..91c3109e91a 100644 --- a/pkgs/development/python-modules/google_cloud_bigtable/default.nix +++ b/pkgs/development/python-modules/google_cloud_bigtable/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-bigtable"; - version = "1.2.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "1wwhjfhvz5g4720qcdrj01fqb8kh3n36sxjpz8pzwhc7z4z5srs8"; + sha256 = "e777333cbe85888f888c034d32880bb6a602ad83d8c81a95edca7c522cf430d8"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_container/default.nix b/pkgs/development/python-modules/google_cloud_container/default.nix index e79a3ac56fe..ec41592b48b 100644 --- a/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/pkgs/development/python-modules/google_cloud_container/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-container"; - version = "0.5.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "9dd4523291401d8d872f89a87fa5a1d2bcbf6b8ceb1ec0659098fec37d9250e4"; + sha256 = "6f714e3d427e2b36d1365fc400f4d379972529fb40f798d9c0e06c7c3418fc89"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_core/default.nix b/pkgs/development/python-modules/google_cloud_core/default.nix index c5a0ead7c50..f277711e8f1 100644 --- a/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/pkgs/development/python-modules/google_cloud_core/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.3.0"; + version = "1.4.1"; src = fetchPypi { inherit pname version; - sha256 = "1n19q57y4d89cjgmrg0f2a7yp7l1np2448mrhpndq354h389m3w7"; + sha256 = "613e56f164b6bee487dd34f606083a0130f66f42f7b10f99730afdf1630df507"; }; propagatedBuildInputs = [ google_api_core grpcio setuptools ]; diff --git a/pkgs/development/python-modules/google_cloud_dataproc/default.nix b/pkgs/development/python-modules/google_cloud_dataproc/default.nix index 9c6067b50ed..3db04fb7d4b 100644 --- a/pkgs/development/python-modules/google_cloud_dataproc/default.nix +++ b/pkgs/development/python-modules/google_cloud_dataproc/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-dataproc"; - version = "0.8.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1ff15c9a06fd7b0402a2549142146f951ca92ebcf5f70f4c96dc9b9397d5279d"; + sha256 = "d6d94af6c0d5aee0bb88d058a180f4d3341209e112f85a1c7ce0df7887cbf867"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_datastore/default.nix b/pkgs/development/python-modules/google_cloud_datastore/default.nix index 6305da93d8c..ff2d0b3baa9 100644 --- a/pkgs/development/python-modules/google_cloud_datastore/default.nix +++ b/pkgs/development/python-modules/google_cloud_datastore/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-datastore"; - version = "1.12.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "c98690833ee2e6341a4b802f278ba17d582ce58eb2e73152516ebc77522d82d7"; + sha256 = "c94bc357e975ce7bd5e5636497316c1bf4d015891e0ed96df9e7ce901415b94a"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_dlp/default.nix b/pkgs/development/python-modules/google_cloud_dlp/default.nix index b0d3aa5a634..8273f40565f 100644 --- a/pkgs/development/python-modules/google_cloud_dlp/default.nix +++ b/pkgs/development/python-modules/google_cloud_dlp/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "0.15.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9abef093fb344ec556a94e5466b480046c18b8bb0a12f1d202f06c43f3e01f7d"; + sha256 = "2ccf04209f96b4759d8ed76da2c916a456386836caacd47ce01b6344f5b8f212"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_firestore/default.nix b/pkgs/development/python-modules/google_cloud_firestore/default.nix index abb849f63a8..efc52657fd9 100644 --- a/pkgs/development/python-modules/google_cloud_firestore/default.nix +++ b/pkgs/development/python-modules/google_cloud_firestore/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "1.7.0"; + version = "1.8.1"; src = fetchPypi { inherit pname version; - sha256 = "afd986bc4bb5a92d6ebe02977cc1d5dc56bf401590d1df43c07609dbec21155d"; + sha256 = "dfe02fc0a77a4e28144c46d441553352d81498ffd8f49906b57342d06c7f5b54"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/google_cloud_kms/default.nix b/pkgs/development/python-modules/google_cloud_kms/default.nix index c333a1fa137..0cc5b76f7db 100644 --- a/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-kms"; - version = "1.4.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9d108b2754cb2c6ccc60604d27855c7139dad4b2455342e1e7bfffc27c5193bd"; + sha256 = "5af43d30adbb19023f9fec9d481b1d2d35be690d2a8dcdf9d6abc2c1d302cc17"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_logging/default.nix b/pkgs/development/python-modules/google_cloud_logging/default.nix index fa4590ff0b2..6aeef14b692 100644 --- a/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "1.15.0"; + version = "1.15.1"; src = fetchPypi { inherit pname version; - sha256 = "0smpvzdbz3ih3vc0nmn9619xa40mmqk9rs9ic1mwwyh1iyi44waz"; + sha256 = "cb0d4af9d684eb8a416f14c39d9fa6314be3adf41db2dd8ee8e30db9e8853d90"; }; checkInputs = [ pytest mock webapp2 django flask ]; diff --git a/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/pkgs/development/python-modules/google_cloud_pubsub/default.nix index e5d62dd8f46..b1e4eae52ad 100644 --- a/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "1.5.0"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "d396ae1938e966e1ac3b981d14db7b0f9fabab553b0876c3202e187e4b477ab6"; + sha256 = "c8d098ebd208d00c8f3bb55eefecd8553e7391d59700426a97d35125f0dcb248"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index c953407af8f..08e2c38ea1b 100644 --- a/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; - version = "0.31.0"; + version = "0.32.0"; src = fetchPypi { inherit pname version; - sha256 = "3e0218abc438f2f43605db27189fa7a48c3ca3defc45054dac01835527058a4c"; + sha256 = "3d125c01817d5bef2b644095b044d22b03b9d8d4591088cadd8e97851f7a150a"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix index e6b0fe5f221..a3992825d2e 100644 --- a/pkgs/development/python-modules/google_cloud_securitycenter/default.nix +++ b/pkgs/development/python-modules/google_cloud_securitycenter/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-securitycenter"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "e2c14e01697e54aef9d755bd8abff01af748f42f4e3559efcbb3b0db659f66ac"; + sha256 = "14ebad262cd01c9a3998561684617be2e97ad5d27dab1918c14b964f97e1f8f7"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_storage/default.nix b/pkgs/development/python-modules/google_cloud_storage/default.nix index 9446200b657..db113962336 100644 --- a/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-storage"; - version = "1.29.0"; + version = "1.30.0"; src = fetchPypi { inherit pname version; - sha256 = "07lsdrxypz5i21x99m1zkxwiax89q80v0av6ak0k4fkys48spj0m"; + sha256 = "0634addb7576d48861d9963312fc82a0436042b8f282414ed58ca76d73edee54"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index 2c3ef0d39fe..3a052c73cda 100644 --- a/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-texttospeech"; - version = "2.0.0"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "4ed3d9f17fa7b8d53dbc4992d976f72d845266786a81938444315e5a7b194b53"; + sha256 = "cbbd397e72b6189668134f3c8e8c303198188334a4e6a5f77cc90c3220772f9e"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_trace/default.nix b/pkgs/development/python-modules/google_cloud_trace/default.nix index 4c49b0e70eb..5b19243709f 100644 --- a/pkgs/development/python-modules/google_cloud_trace/default.nix +++ b/pkgs/development/python-modules/google_cloud_trace/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-trace"; - version = "0.23.0"; + version = "0.24.0"; src = fetchPypi { inherit pname version; - sha256 = "1a3fad1ae2b780dd5e6d5ddc626db722749405b7b66f3c2e5e87a9d29a4819c8"; + sha256 = "0c342dbd9daf5375b3f8bb94302b7ea9a9946f76684e457a38ff0d420b3b6556"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_translate/default.nix b/pkgs/development/python-modules/google_cloud_translate/default.nix index 7537b6fe52d..f25f4badc81 100644 --- a/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "2.0.1"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "02wlqlrxk0x6a9wifcly2pr84r6k8i97ws0prx21379fss39gf2a"; + sha256 = "ecdea3e176e80f606d08c4c7fd5acea6b3dd960f4b2e9a65951aaf800350a759"; }; # google_cloud_core[grpc] -> grpcio diff --git a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix index 07fb02ea595..a8da09dec64 100644 --- a/pkgs/development/python-modules/google_cloud_videointelligence/default.nix +++ b/pkgs/development/python-modules/google_cloud_videointelligence/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-videointelligence"; - version = "1.14.0"; + version = "1.15.0"; src = fetchPypi { inherit pname version; - sha256 = "c91f605d00926416bcd4d32d6ca195e0e5bd6fb794bc67b09910a19ee2ca6570"; + sha256 = "c2b4b3579196c0bb7301fbe1de7008ac5081f88afc0599a10ee79a5ade385922"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index 55c370717e1..a43f7fd5f9c 100644 --- a/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; - version = "0.4.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1c8031e6eec59ee3e2d4af88090ba36521ceb67d79cb297d3c128d2a16af0798"; + sha256 = "1de60f880487b898b499345f46f7acf38651f5356ebca8673116003a57f25393"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/google_resumable_media/default.nix b/pkgs/development/python-modules/google_resumable_media/default.nix index 40c8f2596bb..ac8a111b3e7 100644 --- a/pkgs/development/python-modules/google_resumable_media/default.nix +++ b/pkgs/development/python-modules/google_resumable_media/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "0.5.1"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "97155236971970382b738921f978a6f86a7b5a0b0311703d991e065d3cb55773"; + sha256 = "57841f5e65fb285c01071f439724745b2549a72eb75e5fd979198eb518608ed0"; }; checkInputs = [ pytest mock ]; diff --git a/pkgs/development/python-modules/graphviz/default.nix b/pkgs/development/python-modules/graphviz/default.nix index fcb2867050d..f531c547f9c 100644 --- a/pkgs/development/python-modules/graphviz/default.nix +++ b/pkgs/development/python-modules/graphviz/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "graphviz"; - version = "0.10.1"; + version = "0.14.1"; # patch does not apply to PyPI tarball due to different line endings src = fetchFromGitHub { owner = "xflr6"; repo = "graphviz"; rev = version; - sha256 = "1vqk4xy45c72la56j24z9jmjp5a0aa2k32fybnlbkzqjvvbl72d8"; + sha256 = "02bdiac5x93f2mjw5kpgs6kv81hzg07y0mw1nxvhyg8aignzmh3c"; }; patches = [ @@ -30,9 +30,9 @@ buildPythonPackage rec { }) ]; - # Fontconfig error: Cannot load default config file - FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; + # Fontconfig error: Cannot load default config file + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ freefont_ttf ]; }; checkInputs = [ mock pytest pytest-mock pytestcov ]; diff --git a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch index ad632974c28..d6da1ff47ce 100644 --- a/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch +++ b/pkgs/development/python-modules/graphviz/hardcode-graphviz-path.patch @@ -1,38 +1,39 @@ diff --git a/graphviz/backend.py b/graphviz/backend.py -index 704017b..fe4aefe 100644 +index 6f4cc0c..bc4781e 100644 --- a/graphviz/backend.py +++ b/graphviz/backend.py -@@ -114,7 +114,7 @@ def command(engine, format, filepath=None, renderer=None, formatter=None): - suffix = '.'.join(reversed(format_arg)) - format_arg = ':'.join(format_arg) +@@ -122,7 +122,7 @@ def command(engine, format_, filepath=None, renderer=None, formatter=None): + raise ValueError('unknown formatter: %r' % formatter) -- cmd = [engine, '-T%s' % format_arg] -+ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % format_arg] - rendered = None - if filepath is not None: - cmd.extend(['-O', filepath]) -@@ -217,7 +217,7 @@ def version(): + output_format = [f for f in (format_, renderer, formatter) if f is not None] +- cmd = [engine, '-T%s' % ':'.join(output_format)] ++ cmd = [os.path.join('@graphviz@/bin', engine), '-T%s' % ':'.join(output_format)] + + if filepath is None: + rendered = None +@@ -255,7 +255,7 @@ def version(): subprocess.CalledProcessError: If the exit status is non-zero. RuntimmeError: If the output cannot be parsed into a version number. """ - cmd = ['dot', '-V'] + cmd = ['@graphviz@/bin/dot', '-V'] - out, _ = run(cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - - info = out.decode('ascii') + out, _ = run(cmd, check=True, encoding='ascii', + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT) diff --git a/tests/test_backend.py b/tests/test_backend.py -index 7ec12f7..2e8550d 100644 +index 9f307f5..e43bf5b 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py -@@ -47,6 +47,7 @@ def test_render_formatter_unknown(): - render('dot', 'ps', 'nonfilepath', 'ps', '') +@@ -50,7 +50,7 @@ def test_run_encoding_mocked(mocker, Popen, input=u'sp\xe4m', encoding='utf-8'): + m.decode.assert_called_once_with(encoding) +-@pytest.exe +@pytest.mark.skip(reason='empty $PATH has no effect') @pytest.mark.usefixtures('empty_path') - def test_render_missing_executable(): - with pytest.raises(ExecutableNotFound, match=r'execute'): -@@ -85,7 +86,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): + @pytest.mark.parametrize('func, args', [ + (render, ['dot', 'pdf', 'nonfilepath']), +@@ -143,7 +143,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): # noqa: N803 assert render('dot', 'pdf', 'nonfilepath', quiet=quiet) == 'nonfilepath.pdf' @@ -40,25 +41,17 @@ index 7ec12f7..2e8550d 100644 + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpdf', '-O', 'nonfilepath'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, - startupinfo=mocker.ANY) -@@ -94,6 +95,7 @@ def test_render_mocked(capsys, mocker, Popen, quiet): - assert capsys.readouterr() == ('', '' if quiet else 'stderr') - - -+@pytest.mark.skip(reason='empty $PATH has no effect') - @pytest.mark.usefixtures('empty_path') - def test_pipe_missing_executable(): - with pytest.raises(ExecutableNotFound, match=r'execute'): -@@ -143,7 +145,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803 - assert e.value.returncode is mocker.sentinel.returncode + cwd=None, startupinfo=mocker.ANY) +@@ -201,7 +201,7 @@ def test_pipe_pipe_invalid_data_mocked(mocker, py2, Popen, quiet): # noqa: N803 assert e.value.stdout is mocker.sentinel.out - assert e.value.stderr is err + e.value.stdout = mocker.sentinel.new_stdout + assert e.value.stdout is mocker.sentinel.new_stdout - Popen.assert_called_once_with(['dot', '-Tpng'], + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-Tpng'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, -@@ -166,7 +168,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 +@@ -224,7 +224,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 assert pipe('dot', 'png', b'nongraph', quiet=quiet) is mocker.sentinel.out @@ -67,16 +60,8 @@ index 7ec12f7..2e8550d 100644 stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, -@@ -176,6 +178,7 @@ def test_pipe_mocked(capsys, mocker, Popen, quiet): # noqa: N803 - assert capsys.readouterr() == ('', '' if quiet else 'stderr') - - -+@pytest.mark.skip(reason='empty $PATH has no effect') - @pytest.mark.usefixtures('empty_path') - def test_version_missing_executable(): - with pytest.raises(ExecutableNotFound, match=r'execute'): -@@ -196,7 +199,7 @@ def test_version_parsefail_mocked(mocker, Popen): - with pytest.raises(RuntimeError): +@@ -250,7 +250,7 @@ def test_version_parsefail_mocked(mocker, Popen): # noqa: N803 + with pytest.raises(RuntimeError, match=r'nonversioninfo'): version() - Popen.assert_called_once_with(['dot', '-V'], @@ -84,9 +69,9 @@ index 7ec12f7..2e8550d 100644 stdout=subprocess.PIPE, stderr=subprocess.STDOUT, startupinfo=mocker.ANY) -@@ -211,7 +214,7 @@ def test_version_mocked(mocker, Popen): +@@ -269,7 +269,7 @@ def test_version_mocked(mocker, Popen, stdout, expected): # noqa: N803 - assert version() == (1, 2, 3) + assert version() == expected - Popen.assert_called_once_with(['dot', '-V'], + Popen.assert_called_once_with(['@graphviz@/bin/dot', '-V'], diff --git a/pkgs/development/python-modules/green/default.nix b/pkgs/development/python-modules/green/default.nix index de1831e3317..1d35978824f 100644 --- a/pkgs/development/python-modules/green/default.nix +++ b/pkgs/development/python-modules/green/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "green"; - version = "3.1.4"; + version = "3.2.1"; src = fetchPypi { inherit pname version; - sha256 = "65f87e4c0d2aca63eb32b01c78233e6f920a58ebabc4f85dd9d8f1c6a92a5184"; + sha256 = "c5a90e247237ac7e320120961608cf65191134fa400d327cbd4d09864c880935"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/gspread/default.nix b/pkgs/development/python-modules/gspread/default.nix index 5c9c644abd3..5fd73541dd4 100644 --- a/pkgs/development/python-modules/gspread/default.nix +++ b/pkgs/development/python-modules/gspread/default.nix @@ -3,6 +3,7 @@ , fetchPypi , requests , google_auth +, google-auth-oauthlib }: buildPythonPackage rec { @@ -14,14 +15,12 @@ buildPythonPackage rec { sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests google_auth google-auth-oauthlib ]; meta = with stdenv.lib; { description = "Google Spreadsheets client library"; homepage = "https://github.com/burnash/gspread"; license = licenses.mit; - # missing multiple google libraries - broken = true; # 2020-08-15 }; # No tests included diff --git a/pkgs/development/python-modules/h5netcdf/default.nix b/pkgs/development/python-modules/h5netcdf/default.nix index 3d66291aed8..316c5bc4d48 100644 --- a/pkgs/development/python-modules/h5netcdf/default.nix +++ b/pkgs/development/python-modules/h5netcdf/default.nix @@ -35,4 +35,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/hcloud/default.nix b/pkgs/development/python-modules/hcloud/default.nix index 7886746e31e..9a99fb0953a 100644 --- a/pkgs/development/python-modules/hcloud/default.nix +++ b/pkgs/development/python-modules/hcloud/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.9.0"; + version = "1.9.1"; src = fetchPypi { inherit pname version; - sha256 = "0dk30ga59lhqba1facram6ls52z45sld6b81gy5cl63q67smy08f"; + sha256 = "069bf78a3c6cd642aae0b1a562b443d2670e6d73d507ce77cbf8a2c16974ca29"; }; propagatedBuildInputs = [ future requests python-dateutil ]; diff --git a/pkgs/development/python-modules/helpdev/default.nix b/pkgs/development/python-modules/helpdev/default.nix index c4caf0e46ad..34b4d697447 100644 --- a/pkgs/development/python-modules/helpdev/default.nix +++ b/pkgs/development/python-modules/helpdev/default.nix @@ -27,4 +27,4 @@ buildPythonPackage rec { license = lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/hickle/default.nix b/pkgs/development/python-modules/hickle/default.nix index 179830f8b5f..f481509e6a3 100644 --- a/pkgs/development/python-modules/hickle/default.nix +++ b/pkgs/development/python-modules/hickle/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "hickle"; - version = "3.4.8"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "09e73029dc6c122f483fca4313a27cc483534145961e4786e65d60895054d940"; + sha256 = "fcf2c4f9e4b7f0d9dae7aa6c59a58473884017875d3b17898d56eaf8a9c1da96"; }; postPatch = '' diff --git a/pkgs/development/python-modules/hieroglyph/default.nix b/pkgs/development/python-modules/hieroglyph/default.nix index ab6203581cd..0959d117de3 100644 --- a/pkgs/development/python-modules/hieroglyph/default.nix +++ b/pkgs/development/python-modules/hieroglyph/default.nix @@ -1,12 +1,13 @@ -{ stdenv, fetchPypi, buildPythonPackage, sphinx }: +{ stdenv, fetchPypi, buildPythonPackage, isPy27, sphinx }: buildPythonPackage rec { pname = "hieroglyph"; - version = "1.0.0"; + version = "2.1.0"; + disabled = isPy27; # python2 compatible sphinx is too low src = fetchPypi { inherit pname version; - sha256 = "8e137f0b1cd60c47b870011089790d3c8ddb74fcf409a75ddf2c7f2516ff337c"; + sha256 = "b4b5db13a9d387438e610c2ca1d81386ccd206944d9a9dd273f21874486cddaf"; }; propagatedBuildInputs = [ sphinx ]; diff --git a/pkgs/development/python-modules/hiredis/default.nix b/pkgs/development/python-modules/hiredis/default.nix index c22de6d8a66..eaeb45627b1 100644 --- a/pkgs/development/python-modules/hiredis/default.nix +++ b/pkgs/development/python-modules/hiredis/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "hiredis"; - version = "1.0.1"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "aa59dd63bb3f736de4fc2d080114429d5d369dfb3265f771778e8349d67a97a4"; + sha256 = "996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132"; }; propagatedBuildInputs = [ redis ]; diff --git a/pkgs/development/python-modules/howdoi/default.nix b/pkgs/development/python-modules/howdoi/default.nix index c98192e9b0a..83f340fc8d8 100644 --- a/pkgs/development/python-modules/howdoi/default.nix +++ b/pkgs/development/python-modules/howdoi/default.nix @@ -2,27 +2,37 @@ , buildPythonPackage , fetchPypi , six -, requests-cache , pygments , pyquery , cachelib , appdirs +, keep }: buildPythonPackage rec { pname = "howdoi"; - version = "1.2.1"; + version = "2.0.4"; src = fetchPypi { inherit pname version; - sha256 = "3b322668606d29d8a841c3b28c0574851f512b55c33a7ceb982b6a98d82fa3e3"; + sha256 = "0hq5biy0mpycbji2mikfbflw4r39prylr47iqhlz234kvwdy0jsg"; }; - propagatedBuildInputs = [ six requests-cache pygments pyquery cachelib appdirs ]; + postPatch = '' + substituteInPlace setup.py --replace 'cachelib==0.1' 'cachelib' + ''; + + propagatedBuildInputs = [ six pygments pyquery cachelib appdirs keep ]; + # author hasn't included page_cache directory (which allows tests to run without + # external requests) in pypi tarball. github repo doesn't have release revisions + # clearly tagged. re-enable tests when either is sorted. + doCheck = false; preCheck = '' + mv howdoi _howdoi export HOME=$(mktemp -d) ''; + pythonImportsCheck = [ "howdoi" ]; meta = with lib; { description = "Instant coding answers via the command line"; diff --git a/pkgs/development/python-modules/html5lib/default.nix b/pkgs/development/python-modules/html5lib/default.nix index 81042ac3409..f0abbcfbecc 100644 --- a/pkgs/development/python-modules/html5lib/default.nix +++ b/pkgs/development/python-modules/html5lib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "html5lib"; - version = "1.0.1"; + version = "1.1"; src = fetchPypi { inherit pname version; - sha256 = "66cb0dcfdbbc4f9c3ba1a63fdb511ffdbd4f513b2b6d81b80cd26ce6b3fb3736"; + sha256 = "b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"; }; checkInputs = [ flake8 pytest_4 pytest-expect mock ]; diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 70489cc3bfc..4676c300471 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "2.4.1"; + version = "2.6.0"; pname = "humanize"; disabled = isPy27; # setup.py no longer compatible src = fetchPypi { inherit pname version; - sha256 = "4b4ce2fc1c9d79c63f68009ddf5a12ad238aa78e2fceb256b5aa921763551422"; + sha256 = "8ee358ea6c23de896b9d1925ebe6a8504bb2ba7e98d5ccf4d07ab7f3b28f3819"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/hyperlink/default.nix b/pkgs/development/python-modules/hyperlink/default.nix index 1fc49017821..bab7986eda2 100644 --- a/pkgs/development/python-modules/hyperlink/default.nix +++ b/pkgs/development/python-modules/hyperlink/default.nix @@ -1,17 +1,18 @@ -{ stdenv, buildPythonPackage, fetchPypi, idna }: +{ lib, buildPythonPackage, fetchPypi, isPy27, idna, typing }: buildPythonPackage rec { pname = "hyperlink"; - version = "19.0.0"; + version = "20.0.1"; src = fetchPypi { inherit pname version; - sha256 = "4288e34705da077fada1111a24a0aa08bb1e76699c9ce49876af722441845654"; + sha256 = "47fcc7cd339c6cb2444463ec3277bdcfe142c8b1daf2160bdd52248deec815af"; }; - propagatedBuildInputs = [ idna ]; + propagatedBuildInputs = [ idna ] + ++ lib.optionals isPy27 [ typing ]; - meta = with stdenv.lib; { + meta = with lib; { description = "A featureful, correct URL for Python"; license = licenses.mit; platforms = platforms.all; diff --git a/pkgs/development/python-modules/hypothesis-auto/default.nix b/pkgs/development/python-modules/hypothesis-auto/default.nix new file mode 100644 index 00000000000..692db49adce --- /dev/null +++ b/pkgs/development/python-modules/hypothesis-auto/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi +, hypothesis +, poetry +, pydantic +, pytest +}: + +buildPythonPackage rec { + pname = "hypothesis-auto"; + version = "1.1.4"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "1c9jksza0gg2gva3liy0s8riv6imjavhnqw05m8l5660knq2yb2y"; + }; + + nativeBuildInputs = [ + poetry + ]; + + propagatedBuildInputs = [ + pydantic + hypothesis + pytest + ]; + + pythonImportsCheck = [ "hypothesis_auto" ]; + + meta = with lib; { + description = "Enables fully automatic tests for type annotated functions"; + homepage = "https://github.com/timothycrosley/hypothesis-auto/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/i3ipc/default.nix b/pkgs/development/python-modules/i3ipc/default.nix index 4cc8574c842..231cb4f1d41 100644 --- a/pkgs/development/python-modules/i3ipc/default.nix +++ b/pkgs/development/python-modules/i3ipc/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage, fetchFromGitHub -, xorgserver, pytest, pytest-xvfb, pytest-asyncio, i3, python, xlib, xdpyinfo +, xorgserver, pytest, pytest-xvfb, i3, python, xlib, xdpyinfo , makeFontsConf, coreutils }: @@ -19,7 +19,7 @@ buildPythonPackage rec { fontDirectories = [ ]; }; FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file - checkInputs = [ pytest xdpyinfo pytest-asyncio pytest-xvfb xorgserver i3 ]; + checkInputs = [ pytest xdpyinfo pytest-xvfb xorgserver i3 ]; postPatch = '' substituteInPlace test/i3.config \ diff --git a/pkgs/development/python-modules/iapws/default.nix b/pkgs/development/python-modules/iapws/default.nix index 3605e88edd3..76330af43ee 100644 --- a/pkgs/development/python-modules/iapws/default.nix +++ b/pkgs/development/python-modules/iapws/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "iapws"; - version = "1.4.1"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "d65c813bb6b100a8d1ed79e00148832a0321b3063e9632a990344890acb02493"; + sha256 = "781285acaedff49d72c074aa308aabf7ca17f486cca490e5ed3f35526bbe4153"; }; propagatedBuildInputs = [ scipy ]; diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix index 6aba70d3a50..52b1ffd89b9 100644 --- a/pkgs/development/python-modules/identify/default.nix +++ b/pkgs/development/python-modules/identify/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "identify"; - version = "1.4.25"; + version = "1.4.27"; src = fetchPypi { inherit pname version; - sha256 = "110ed090fec6bce1aabe3c72d9258a9de82207adeaa5a05cd75c635880312f9a"; + sha256 = "4c3646d765127b003d2bed8db1e125d68f5f83ad0cd85e21c908ef87a5e24be1"; }; # Tests not included in PyPI tarball diff --git a/pkgs/development/python-modules/idna/default.nix b/pkgs/development/python-modules/idna/default.nix index 13e8fb43bb2..613fde773a7 100644 --- a/pkgs/development/python-modules/idna/default.nix +++ b/pkgs/development/python-modules/idna/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "idna"; - version = "2.9"; + version = "2.10"; src = fetchPypi { inherit pname version; - sha256 = "7588d1c14ae4c77d74036e8c22ff447b26d0fde8f007354fd48a7814db15b7cb"; + sha256 = "b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6"; }; meta = { @@ -17,4 +17,4 @@ buildPythonPackage rec { description = "Internationalized Domain Names in Applications (IDNA)"; license = lib.licenses.bsd3; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/ijson/default.nix b/pkgs/development/python-modules/ijson/default.nix index 4bcbe6a061a..d877c098354 100644 --- a/pkgs/development/python-modules/ijson/default.nix +++ b/pkgs/development/python-modules/ijson/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ijson"; - version = "3.0.4"; + version = "3.1.1"; src = fetchPypi { inherit pname version; - sha256 = "6e25448318cda55e82a5de52beb6813b003cb8e4a7b5753305912a30055a29f8"; + sha256 = "815e9ce9d2de7ddd58ba01834d8f55790b7daddbac6c844cba0fc459b7d5005a"; }; doCheck = false; # something about yajl diff --git a/pkgs/development/python-modules/imagecorruptions/default.nix b/pkgs/development/python-modules/imagecorruptions/default.nix index f77e2dcab0d..3ebd22ffeb2 100644 --- a/pkgs/development/python-modules/imagecorruptions/default.nix +++ b/pkgs/development/python-modules/imagecorruptions/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { substituteInPlace setup.py \ --replace "'opencv-python >= 3.4.5'," "" ''; - + propagatedBuildInputs = [ numpy scikitimage diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix index 4868f3ae371..ce24dfb5896 100644 --- a/pkgs/development/python-modules/imageio/default.nix +++ b/pkgs/development/python-modules/imageio/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "imageio"; - version = "2.8.0"; + version = "2.9.0"; disabled = isPy27; src = fetchPypi { - sha256 = "fb5fd6d3d17126bbaac9af29fe340e2c97a196eb9416d4f28c0e543744a152cf"; + sha256 = "52ddbaeca2dccf53ba2d6dec5676ca7bc3b2403ef8b37f7da78b7654bb3e10f0"; inherit pname version; }; diff --git a/pkgs/development/python-modules/imbalanced-learn/default.nix b/pkgs/development/python-modules/imbalanced-learn/default.nix index 49a98d675e5..1cb3dc2a7b9 100644 --- a/pkgs/development/python-modules/imbalanced-learn/default.nix +++ b/pkgs/development/python-modules/imbalanced-learn/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "imbalanced-learn"; - version = "0.6.2"; + version = "0.7.0"; disabled = isPy27; # scikit-learn>=0.21 doesn't work on python2 src = fetchPypi { inherit pname version; - sha256 = "942b9a7f2e1df831097fbee587c5c90a4cc6afa6105b23d3e30d8798f1a9b17d"; + sha256 = "da59de0d1c0fa66f62054dd9a0a295a182563aa1abbb3bf9224a3678fcfe8fa4"; }; propagatedBuildInputs = [ scikitlearn ]; diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix index 2fa46c2ed9d..7e9a6b5daa8 100644 --- a/pkgs/development/python-modules/img2pdf/default.nix +++ b/pkgs/development/python-modules/img2pdf/default.nix @@ -1,16 +1,17 @@ -{ lib, pillow, fetchPypi, buildPythonPackage, isPy27 }: +{ lib, pillow, fetchPypi, buildPythonPackage, isPy27, pikepdf }: buildPythonPackage rec { pname = "img2pdf"; - version = "0.3.6"; + version = "0.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1yx0ljbg7phpix507wq584qvspp2jgax7flpp1148pxpc2d51mcc"; + sha256 = "eaee690ab8403dd1a9cb4db10afee41dd3e6c7ed63bdace02a0121f9feadb0c9"; }; propagatedBuildInputs = [ + pikepdf pillow ]; diff --git a/pkgs/development/python-modules/importlib-metadata/default.nix b/pkgs/development/python-modules/importlib-metadata/default.nix index 5a313792247..edab68aa18a 100644 --- a/pkgs/development/python-modules/importlib-metadata/default.nix +++ b/pkgs/development/python-modules/importlib-metadata/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "importlib-metadata"; - version = "1.6.0"; + version = "1.7.0"; src = fetchPypi { pname = "importlib_metadata"; inherit version; - sha256 = "07icyggasn38yv2swdrd8z6i0plazmc9adavsdkbqqj91j53ll9l"; + sha256 = "10vz0ydrzspdhdbxrzwr9vhs693hzh4ff71lnqsifvdzvf66bfwh"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/importlib-resources/default.nix b/pkgs/development/python-modules/importlib-resources/default.nix index 7faefd4c0e1..0e1d4654c59 100644 --- a/pkgs/development/python-modules/importlib-resources/default.nix +++ b/pkgs/development/python-modules/importlib-resources/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "importlib_resources"; - version = "1.5.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "1jilyxyb2z7hzcjhx1ddni52mq00i728wqh8f5k4469yhdkdz1vg"; + sha256 = "19f745a6eca188b490b1428c8d1d4a0d2368759f32370ea8fb89cad2ab1106c3"; }; nativeBuildInputs = [ setuptools_scm toml ]; diff --git a/pkgs/development/python-modules/inflection/default.nix b/pkgs/development/python-modules/inflection/default.nix index bf370d7ebf3..5721615c0c5 100644 --- a/pkgs/development/python-modules/inflection/default.nix +++ b/pkgs/development/python-modules/inflection/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "inflection"; - version = "0.4.0"; + version = "0.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "32a5c3341d9583ec319548b9015b7fbdf8c429cbcb575d326c33ae3a0e90d52c"; + sha256 = "f576e85132d34f5bf7df5183c2c6f94cfb32e528f53065345cf71329ba0b8924"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/iniconfig/default.nix b/pkgs/development/python-modules/iniconfig/default.nix new file mode 100644 index 00000000000..f6383e46d23 --- /dev/null +++ b/pkgs/development/python-modules/iniconfig/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "iniconfig"; + version = "1.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0s9z9n4603fdpv2vzh6ddzfgsjmb09n6qalkjl2xwrss6n4jzyg5"; + }; + + doCheck = false; # avoid circular import with pytest + pythonImportsCheck = [ "iniconfig" ]; + + meta = with lib; { + description = "brain-dead simple parsing of ini files"; + homepage = "https://github.com/CHANGE/iniconfig/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/development/python-modules/inquirer/default.nix b/pkgs/development/python-modules/inquirer/default.nix index 58e7f61b676..560ae55293b 100644 --- a/pkgs/development/python-modules/inquirer/default.nix +++ b/pkgs/development/python-modules/inquirer/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "inquirer"; - version = "2.6.3"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "01lf51y3bxsxkghbdk9hr42yvihpwi2s5zpxnra3bx41r35msvjz"; + sha256 = "e819188de0ca7985a99c282176c6f50fb08b0d33867fd1965d3f3e97d6c8f83f"; }; propagatedBuildInputs = [ python-editor readchar blessings ]; diff --git a/pkgs/development/python-modules/intervaltree/default.nix b/pkgs/development/python-modules/intervaltree/default.nix index 209920db2b6..8b0bbf2dd39 100644 --- a/pkgs/development/python-modules/intervaltree/default.nix +++ b/pkgs/development/python-modules/intervaltree/default.nix @@ -2,12 +2,12 @@ , python, pytest, sortedcontainers }: buildPythonPackage rec { - version = "3.0.2"; + version = "3.1.0"; pname = "intervaltree"; src = fetchPypi { inherit pname version; - sha256 = "0wz234g6irlm4hivs2qzmnywk0ss06ckagwh15nflkyb3p462kyb"; + sha256 = "902b1b88936918f9b2a19e0e5eb7ccb430ae45cde4f39ea4b36932920d33952d"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/ipykernel/default.nix b/pkgs/development/python-modules/ipykernel/default.nix index edf9d0863a1..c8539598fe6 100644 --- a/pkgs/development/python-modules/ipykernel/default.nix +++ b/pkgs/development/python-modules/ipykernel/default.nix @@ -42,9 +42,9 @@ buildPythonPackage rec { "test_subprocess_print" "test_subprocess_error" "test_ipython_start_kernel_no_userns" - + # https://github.com/ipython/ipykernel/issues/506 - "test_unc_paths" + "test_unc_paths" ] ++ lib.optionals (pythonOlder "3.8") [ # flaky test https://github.com/ipython/ipykernel/issues/485 "test_shutdown" diff --git a/pkgs/development/python-modules/ipython/default.nix b/pkgs/development/python-modules/ipython/default.nix index 9700737f485..5e48accfe35 100644 --- a/pkgs/development/python-modules/ipython/default.nix +++ b/pkgs/development/python-modules/ipython/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "ipython"; - version = "7.16.1"; + version = "7.17.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "9f4fcb31d3b2c533333893b9172264e4821c1ac91839500f31bd43f2c59b3ccf"; + sha256 = "b70974aaa2674b05eb86a910c02ed09956a33f2dd6c71afc60f0b128a77e7f28"; }; prePatch = lib.optionalString stdenv.isDarwin '' diff --git a/pkgs/development/python-modules/ipyvue/default.nix b/pkgs/development/python-modules/ipyvue/default.nix index 8507dfc7e60..c9426473ba6 100644 --- a/pkgs/development/python-modules/ipyvue/default.nix +++ b/pkgs/development/python-modules/ipyvue/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ipyvue"; - version = "1.3.4"; + version = "1.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "009815638f33e67f0fd9cc4fa2087b2faa438e32703877ca14ecf9826508b724"; + sha256 = "3253727e8e12e3c157550e3e8d6986edf61ad0d68299992fbf3fa6acec41a12e"; }; propagatedBuildInputs = [ ipywidgets ]; diff --git a/pkgs/development/python-modules/ipyvuetify/default.nix b/pkgs/development/python-modules/ipyvuetify/default.nix index 45d18085cc4..b3874c50617 100644 --- a/pkgs/development/python-modules/ipyvuetify/default.nix +++ b/pkgs/development/python-modules/ipyvuetify/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "ipyvuetify"; - version = "1.4.1"; + version = "1.5.0"; # GitHub version tries to run npm (Node JS) src = fetchPypi { inherit pname version; - sha256 = "eb940d89fb7c877a3d42e08e7ae1d5cf8a501e059db165007687fdf648598b06"; + sha256 = "5c311308d3ec9c92e48ab6ca021b5b51295e9e39de640f69827e30d5f03a244b"; }; propagatedBuildInputs = [ ipyvue ]; diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index b04ab3febdb..9bd2b4ab288 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "irc"; - version = "18.0.0"; + version = "19.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1qg5996mzvhnkm74ksaa4d47fz5vrpw6hvxyaq9kf6y4cf1l76wq"; + sha256 = "29026b1e977dacb621c710ae9531fcab6fa21825b743c616c220da0e58a32233"; }; doCheck = false; diff --git a/pkgs/development/python-modules/islpy/default.nix b/pkgs/development/python-modules/islpy/default.nix index 22426d331c2..5b2a8e16146 100644 --- a/pkgs/development/python-modules/islpy/default.nix +++ b/pkgs/development/python-modules/islpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "islpy"; - version = "2019.1.2"; + version = "2020.2"; src = fetchPypi { inherit pname version; - sha256 = "834b6b946f33d578d5c6b2f863dd93f7ecc4c0a2bf73407c96ef9f95b6b71bbf"; + sha256 = "ee797e1284bffe897568f9cc1f063f1a6fac8d7b87596308b7467e9b870a90ef"; }; postConfigure = '' diff --git a/pkgs/development/python-modules/iterm2/default.nix b/pkgs/development/python-modules/iterm2/default.nix index 33504323802..4d4cf95fc88 100644 --- a/pkgs/development/python-modules/iterm2/default.nix +++ b/pkgs/development/python-modules/iterm2/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "iterm2"; - version = "1.14"; + version = "1.16"; src = fetchPypi { inherit pname version; - sha256 = "089pln3c41n6dyh91hw9gy6mpm9s663lpmdc4gamig3g6pfmbsk4"; + sha256 = "8dead057b09ed4ac03c6caae7890489da1d823215ec5166789739ece941bdcbc"; }; propagatedBuildInputs = [ protobuf websockets ]; diff --git a/pkgs/development/python-modules/jdcal/default.nix b/pkgs/development/python-modules/jdcal/default.nix index 4fd89c83abc..c2dd66ac663 100644 --- a/pkgs/development/python-modules/jdcal/default.nix +++ b/pkgs/development/python-modules/jdcal/default.nix @@ -25,4 +25,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ lihop ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/jedi/default.nix b/pkgs/development/python-modules/jedi/default.nix index 59c22caf314..9ee4ae26622 100644 --- a/pkgs/development/python-modules/jedi/default.nix +++ b/pkgs/development/python-modules/jedi/default.nix @@ -13,6 +13,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ parso ]; + # remove next bump, >=0.17.2, already fixed in master + prePatch = '' + substituteInPlace requirements.txt \ + --replace "parso>=0.7.0,<0.8.0" "parso" + ''; + checkPhase = '' LC_ALL="en_US.UTF-8" py.test test ''; diff --git a/pkgs/development/python-modules/jenkins-job-builder/default.nix b/pkgs/development/python-modules/jenkins-job-builder/default.nix index e5f4fae63d3..e185cf8b6bd 100644 --- a/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.4.0"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "80a7e8d3bebb1e792ff347e9dd072879ce105424224fe804e6671c32a2e8e4bf"; + sha256 = "20efe98718e61ea7bd69b2178d93c5435bbf2e1ba78a47366632c84970e026c9"; }; postPatch = '' diff --git a/pkgs/development/python-modules/jinja2/default.nix b/pkgs/development/python-modules/jinja2/default.nix index 42e45d162ba..45178377026 100644 --- a/pkgs/development/python-modules/jinja2/default.nix +++ b/pkgs/development/python-modules/jinja2/default.nix @@ -3,7 +3,9 @@ , isPy3k , fetchPypi , pytest -, markupsafe }: +, markupsafe +, setuptools +}: buildPythonPackage rec { pname = "Jinja2"; @@ -15,7 +17,7 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - propagatedBuildInputs = [ markupsafe ]; + propagatedBuildInputs = [ markupsafe setuptools ]; # Multiple tests run out of stack space on 32bit systems with python2. # See https://github.com/pallets/jinja/issues/1158 diff --git a/pkgs/development/python-modules/joblib/default.nix b/pkgs/development/python-modules/joblib/default.nix index da6e53fa129..de60f142670 100644 --- a/pkgs/development/python-modules/joblib/default.nix +++ b/pkgs/development/python-modules/joblib/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "joblib"; - version = "0.15.1"; + version = "0.16.0"; src = fetchPypi { inherit pname version; - sha256 = "61e49189c84b3c5d99a969d314853f4d1d263316cc694bec17548ebaa9c47b6e"; + sha256 = "8f52bf24c64b608bf0b2563e0e47d6fcf516abc8cfafe10cfd98ad66d94f92d6"; }; checkInputs = [ sphinx numpydoc pytest ]; diff --git a/pkgs/development/python-modules/jsbeautifier/default.nix b/pkgs/development/python-modules/jsbeautifier/default.nix index 225fa48c72c..f3eb0a173db 100644 --- a/pkgs/development/python-modules/jsbeautifier/default.nix +++ b/pkgs/development/python-modules/jsbeautifier/default.nix @@ -2,14 +2,14 @@ buildPythonApplication rec { pname = "jsbeautifier"; - version = "1.11.0"; + version = "1.12.0"; propagatedBuildInputs = [ six editorconfig ]; checkInputs = [ pytest ]; src = fetchPypi { inherit pname version; - sha256 = "4f670c6f4f8d4caca9a348271010742f494becb96fe0a9be6ffac8b3d46350ca"; + sha256 = "65dea76bf2f551d7f1686111d2794506e07b6c7c477feca2124596376feb8713"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/jsonpatch/default.nix b/pkgs/development/python-modules/jsonpatch/default.nix index 82ef58bab5d..a4a66aab44c 100644 --- a/pkgs/development/python-modules/jsonpatch/default.nix +++ b/pkgs/development/python-modules/jsonpatch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jsonpatch"; - version = "1.25"; + version = "1.26"; src = fetchPypi { inherit pname version; - sha256 = "ddc0f7628b8bfdd62e3cbfbc24ca6671b0b6265b50d186c2cf3659dc0f78fd6a"; + sha256 = "e45df18b0ab7df1925f20671bbc3f6bd0b4b556fb4b9c5d97684b0a7eac01744"; }; # test files are missing diff --git a/pkgs/development/python-modules/junos-eznc/default.nix b/pkgs/development/python-modules/junos-eznc/default.nix index 1f92045c41a..9215344c55d 100644 --- a/pkgs/development/python-modules/junos-eznc/default.nix +++ b/pkgs/development/python-modules/junos-eznc/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.4.1"; + version = "2.5.1"; src = fetchPypi { inherit pname version; - sha256 = "8f3ecf06ab4d630f27e7ed7a7b605122ee5c5e5386b1f5186f6cb52810750b18"; + sha256 = "0e3a1e74b9254b4832a6cdbf8e6f26f9a269f574cb8cf2dd292dc131e0f4b245"; }; diff --git a/pkgs/development/python-modules/jupyter-sphinx/default.nix b/pkgs/development/python-modules/jupyter-sphinx/default.nix index 9f2143e2f20..4d2efcf00b7 100644 --- a/pkgs/development/python-modules/jupyter-sphinx/default.nix +++ b/pkgs/development/python-modules/jupyter-sphinx/default.nix @@ -27,6 +27,6 @@ buildPythonPackage rec { description = "Jupyter Sphinx Extensions"; homepage = "https://github.com/jupyter/jupyter-sphinx/"; license = licenses.bsd3; - }; + }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix index 9d5d2a4c23f..38fac27ad43 100644 --- a/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix +++ b/pkgs/development/python-modules/jupyterhub-ldapauthenticator/default.nix @@ -7,16 +7,16 @@ buildPythonPackage rec { pname = "jupyterhub-ldapauthenticator"; - version = "1.3.0"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "920b115babdc32e7b159fc497a0a794bb0f57b222ce2c26c74a23594892f9d3c"; + sha256 = "913cc67a1e8c50e7e301a16f25a4125ffd020a7c5dd22ccfb3f7707af2ee9157"; }; # No tests implemented doCheck = false; - + propagatedBuildInputs = [ jupyterhub ldap3 ]; meta = with lib; { diff --git a/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix new file mode 100644 index 00000000000..2aef23fe4a4 --- /dev/null +++ b/pkgs/development/python-modules/jupyterhub-tmpauthenticator/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, jupyterhub +}: + +buildPythonPackage rec { + pname = "jupyterhub-tmpauthenticator"; + version = "0.6"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "064x1ypxwx1l270ic97p8czbzb7swl9758v40k3w2gaqf9762f0l"; + }; + + propagatedBuildInputs = [ jupyterhub ]; + + # No tests available in the package + doCheck = false; + + pythonImportsCheck = [ "tmpauthenticator" ]; + + meta = with lib; { + description = "Simple Jupyterhub authenticator that allows anyone to log in."; + license = with licenses; [ bsd3 ]; + homepage = "https://github.com/jupyterhub/tmpauthenticator"; + maintainers = with maintainers; [ chiroptical ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab-git/default.nix b/pkgs/development/python-modules/jupyterlab-git/default.nix new file mode 100644 index 00000000000..91ae426147c --- /dev/null +++ b/pkgs/development/python-modules/jupyterlab-git/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, notebook +, nbdime +, git +, pytest +}: + +buildPythonPackage rec { + pname = "jupyterlab_git"; + version = "0.20.0"; + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "0qs3wrcils07xlz698xr7giqf9v63n2qb338mlh7wql93rmjg45i"; + }; + + propagatedBuildInputs = [ notebook nbdime git ]; + + checkInputs = [ pytest ]; + + checkPhase = '' + pytest jupyterlab_git/ --ignore=jupyterlab_git/tests/test_handlers.py + ''; + + pythonImportsCheck = [ "jupyterlab_git" ]; + + meta = with lib; { + description = "Jupyter lab extension for version control with Git."; + license = with licenses; [ bsd3 ]; + homepage = "https://github.com/jupyterlab/jupyterlab-git"; + maintainers = with maintainers; [ chiroptical ]; + }; +} diff --git a/pkgs/development/python-modules/jupyterlab/default.nix b/pkgs/development/python-modules/jupyterlab/default.nix index 0aab09117e7..0ee36a5c0c0 100644 --- a/pkgs/development/python-modules/jupyterlab/default.nix +++ b/pkgs/development/python-modules/jupyterlab/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "2.1.5"; + version = "2.2.4"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "162jn51cg36fsn4l2zhnb5n4nbkhm9wlv974ggcnmdij3i4r4yya"; + sha256 = "e9d26c4c1cf4f7760dfa9ccd3fd5ea5027ae2767f22c7766dbb2fbb5e5dfcd4b"; }; propagatedBuildInputs = [ jupyterlab_server notebook ]; diff --git a/pkgs/development/python-modules/jupyterlab_server/default.nix b/pkgs/development/python-modules/jupyterlab_server/default.nix index c101ae8e2e1..0344a66cf66 100644 --- a/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "132xby7531rbrjg9bqvsx86birr1blynjxy8gi5kcnb6x7fxjcal"; + sha256 = "5431d9dde96659364b7cc877693d5d21e7b80cea7ae3959ecc2b87518e5f5d8c"; }; checkInputs = [ requests pytest ]; diff --git a/pkgs/development/python-modules/jupytext/default.nix b/pkgs/development/python-modules/jupytext/default.nix index cee21edd243..e4b285d4ea7 100644 --- a/pkgs/development/python-modules/jupytext/default.nix +++ b/pkgs/development/python-modules/jupytext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.4.2"; + version = "1.5.2"; src = fetchPypi { inherit pname version; - sha256 = "58b4c6bf48ba2e18bfc2d8358e852b6e3538ff664843398be09157c184ee1a27"; + sha256 = "1cebc9f5975b4c08db3de6d7d61b35f8c33a24cf2c8c04eee7b8a7aab8ddc39b"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index 997e3aedf53..42ed4cf8794 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "jwcrypto"; - version = "0.7"; + version = "0.8"; src = fetchPypi { inherit pname version; - sha256 = "002i60yidafpr642qcxrd74d8frbc4ci8vfysm05vqydcri1zgmd"; + sha256 = "b7fee2635bbefdf145399392f5be26ad54161c8271c66b5fe107b4b452f06c24"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/keep/default.nix b/pkgs/development/python-modules/keep/default.nix new file mode 100644 index 00000000000..6108ea50689 --- /dev/null +++ b/pkgs/development/python-modules/keep/default.nix @@ -0,0 +1,36 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, PyGithub +, terminaltables +, click +, requests +}: + +buildPythonPackage rec { + pname = "keep"; + version = "2.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "0902kcvhbmy5q5n0ai1df29ybf87qaljz306c5ssl8j9xdjipcq2"; + }; + + propagatedBuildInputs = [ + click + requests + terminaltables + PyGithub + ]; + + # no tests + pythonImportsCheck = [ "keep" ]; + + meta = with stdenv.lib; { + homepage = "https://github.com/orkohunter/keep"; + description = "A Meta CLI toolkit: Personal shell command keeper and snippets manager"; + platforms = platforms.all; + license = licenses.mit; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix index e255789aaf7..8b6301ab59b 100644 --- a/pkgs/development/python-modules/keras/default.nix +++ b/pkgs/development/python-modules/keras/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Keras"; - version = "2.3.1"; + version = "2.4.3"; src = fetchPypi { inherit pname version; - sha256 = "321d43772006a25a1d58eea17401ef2a34d388b588c9f7646c34796151ebc8cc"; + sha256 = "fedd729b52572fb108a98e3d97e1bac10a81d3917d2103cc20ab2a5f03beb973"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/keyring/default.nix b/pkgs/development/python-modules/keyring/default.nix index 9495245ea6c..ebb1031796b 100644 --- a/pkgs/development/python-modules/keyring/default.nix +++ b/pkgs/development/python-modules/keyring/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "keyring"; - version = "21.2.1"; + version = "21.3.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c53e0e5ccde3ad34284a40ce7976b5b3a3d6de70344c3f8ee44364cc340976ec"; + sha256 = "22df6abfed49912fc560806030051067fba9f0069cffa79da72899aeea4ccbd5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix index 23cff218e83..393e2d134cc 100644 --- a/pkgs/development/python-modules/kiwisolver/default.nix +++ b/pkgs/development/python-modules/kiwisolver/default.nix @@ -14,9 +14,9 @@ buildPythonPackage rec { inherit pname version; sha256 = "247800260cd38160c362d211dcaf4ed0f7816afb5efe56544748b21d6ad6d17f"; }; - + NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; - + nativeBuildInputs = [ cppy ]; diff --git a/pkgs/development/python-modules/kubernetes/default.nix b/pkgs/development/python-modules/kubernetes/default.nix index 15c8a8144c6..d5ed1b4cc7c 100644 --- a/pkgs/development/python-modules/kubernetes/default.nix +++ b/pkgs/development/python-modules/kubernetes/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { doCheck = pythonAtLeast "3"; checkPhase = '' - py.test + py.test --ignore=kubernetes/dynamic/test_client.py ''; src = fetchPypi { diff --git a/pkgs/development/python-modules/labelbox/default.nix b/pkgs/development/python-modules/labelbox/default.nix index ffc393ab452..ad8d2853b1d 100644 --- a/pkgs/development/python-modules/labelbox/default.nix +++ b/pkgs/development/python-modules/labelbox/default.nix @@ -10,17 +10,17 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.4.1"; + version = "2.4.4"; src = fetchPypi { inherit pname version; - sha256 = "1d7a7304fe6a33c1345ab569e70019f7fa11c97d49948e4fc4bf3bbc1f202703"; + sha256 = "a455ae30ccb9328731fca7f7f4cefaa7da69a2fe3e43d1b742bae5ff4693c695"; }; propagatedBuildInputs = [ jinja2 requests pillow rasterio shapely ]; # Test cases are not running on pypi or GitHub - doCheck = false; + doCheck = false; meta = with lib; { homepage = "https://github.com/Labelbox/Labelbox"; diff --git a/pkgs/development/python-modules/lazy/default.nix b/pkgs/development/python-modules/lazy/default.nix index ff967d62dc6..1e5f72ff803 100644 --- a/pkgs/development/python-modules/lazy/default.nix +++ b/pkgs/development/python-modules/lazy/default.nix @@ -18,4 +18,4 @@ buildPythonPackage rec { license = lib.licenses.bsd2; homepage = "https://github.com/stefanholek/lazy"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/ldap3/default.nix b/pkgs/development/python-modules/ldap3/default.nix index eb2d09d8d26..9842c4d7596 100644 --- a/pkgs/development/python-modules/ldap3/default.nix +++ b/pkgs/development/python-modules/ldap3/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ldap3"; - version = "2.7"; + version = "2.8"; src = fetchPypi { inherit pname version; - sha256 = "1h1q8g1c2nkhx8p5n91bzkvjx5js5didi9xqbnmfrxqbnyc45w0p"; + sha256 = "59d1adcd5ead263387039e2a37d7cd772a2006b1cdb3ecfcbaab5192a601c515"; }; propagatedBuildInputs = [ pyasn1 ]; diff --git a/pkgs/development/python-modules/librosa/default.nix b/pkgs/development/python-modules/librosa/default.nix index ade83d6721a..0fc5d857fb8 100644 --- a/pkgs/development/python-modules/librosa/default.nix +++ b/pkgs/development/python-modules/librosa/default.nix @@ -9,26 +9,33 @@ , audioread , resampy , soundfile +, pooch }: buildPythonPackage rec { pname = "librosa"; - version = "0.7.2"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "656bbda80e98e6330db1ead79cd084b13a762284834d7603fcf7cf7c0dc65f3c"; + sha256 = "af0b9f2ed4bbf6aecbc448a4cd27c16453c397cb6bef0f0cfba0e63afea2b839"; }; - propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile ]; + propagatedBuildInputs = [ joblib matplotlib six scikitlearn decorator audioread resampy soundfile pooch ]; # No tests + # 1. Internet connection is required + # 2. Got error "module 'librosa' has no attribute 'version'" doCheck = false; + # check that import works, this allows to capture errors like https://github.com/librosa/librosa/issues/1160 + pythonImportsCheck = [ "librosa" ]; + meta = with stdenv.lib; { description = "Python module for audio and music processing"; homepage = "http://librosa.github.io/"; license = licenses.isc; + maintainers = with maintainers; [ GuillaumeDesforges ]; }; } diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix index 65accea559a..605cbe04026 100644 --- a/pkgs/development/python-modules/libtmux/default.nix +++ b/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.8.2"; + version = "0.8.3"; src = fetchPypi { inherit pname version; - sha256 = "0nh6dvf8g93hv7cma6r8l88k8l20zck6a0ax29mrdg03f9hqdk9a"; + sha256 = "a4c7379604ccdc684aa865723211184709f9a2b45511772989b5f26ad156650e"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/lightparam/default.nix b/pkgs/development/python-modules/lightparam/default.nix index 6681b528b8c..b3ddb7655c0 100644 --- a/pkgs/development/python-modules/lightparam/default.nix +++ b/pkgs/development/python-modules/lightparam/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "lightparam"; - version = "0.3.7"; + version = "0.4.6"; disabled = !isPy3k; format = "wheel"; @@ -12,7 +12,7 @@ buildPythonPackage rec { inherit pname version; format = "wheel"; python = "py3"; - sha256 = "53d5d5b225bac27bc14929c9ad4e51ece4f692813dd367f317fb1586145d93f1"; + sha256 = "eca63016524208afb6a06db19baf659e698cce3ae2e57be15b37bc988549c631"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/llvmlite/default.nix b/pkgs/development/python-modules/llvmlite/default.nix index c96975412b9..7a7106a5eaa 100644 --- a/pkgs/development/python-modules/llvmlite/default.nix +++ b/pkgs/development/python-modules/llvmlite/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "llvmlite"; - version = "0.33.0"; + version = "0.34.0"; disabled = isPyPy || !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9c8aae96f7fba10d9ac864b443d1e8c7ee4765c31569a2b201b3d0b67d8fc596"; + sha256 = "f03ee0d19bca8f2fe922bb424a909d05c28411983b0c2bc58b020032a0d11f63"; }; nativeBuildInputs = [ llvm ]; diff --git a/pkgs/development/python-modules/lmdb/default.nix b/pkgs/development/python-modules/lmdb/default.nix index 5f31511451d..328e5a428fc 100644 --- a/pkgs/development/python-modules/lmdb/default.nix +++ b/pkgs/development/python-modules/lmdb/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "lmdb"; - version = "0.98"; + version = "0.99"; src = fetchPypi { inherit pname version; - sha256 = "0625bc28bf0893e6000a83be7234f915ca078c32f9e73d8ae48b3508db7af708"; + sha256 = "f9eb844aaaacc8a4bc175e1c1f8a8fb538c330e378fd9eb40e8708d4dca7dc89"; }; checkInputs = [ pytest cffi ]; diff --git a/pkgs/development/python-modules/lml/default.nix b/pkgs/development/python-modules/lml/default.nix new file mode 100644 index 00000000000..c1320eef04c --- /dev/null +++ b/pkgs/development/python-modules/lml/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, mock +}: + +buildPythonPackage rec { + pname = "lml"; + version = "0.0.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "6luoF7Styen1whclzSR1+RKTO34t/fB5Ku2AB3FU9j8="; + }; + + checkInputs = [ + nose + mock + ]; + + checkPhase = "nosetests"; + + meta = { + description = "Load me later. A lazy plugin management system for Python"; + homepage = "http://lml.readthedocs.io/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/lmtpd/default.nix b/pkgs/development/python-modules/lmtpd/default.nix index 0078c917567..e9dd42219eb 100644 --- a/pkgs/development/python-modules/lmtpd/default.nix +++ b/pkgs/development/python-modules/lmtpd/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "lmtpd"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; - sha256 = "256e23a3292818ecccf9a76ef52e0064c6f7e1f8602904e15337c8917ed0fafe"; + sha256 = "2c6825d2ffa1de099440411a742f58e1b3e8deeb3345adcfd4c2c38d4baf62b3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/logfury/default.nix b/pkgs/development/python-modules/logfury/default.nix index a52f194b8be..5f83c8633dc 100644 --- a/pkgs/development/python-modules/logfury/default.nix +++ b/pkgs/development/python-modules/logfury/default.nix @@ -28,4 +28,4 @@ buildPythonPackage rec { license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jwiegley ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/loguru/default.nix b/pkgs/development/python-modules/loguru/default.nix index fbda4989a24..18b1594b280 100644 --- a/pkgs/development/python-modules/loguru/default.nix +++ b/pkgs/development/python-modules/loguru/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "loguru"; version = "0.5.1"; - + disabled = isPy27; src = fetchPypi { inherit pname version; diff --git a/pkgs/development/python-modules/ludios_wpull/default.nix b/pkgs/development/python-modules/ludios_wpull/default.nix index 7bea2b04bbd..e87146f6fbc 100644 --- a/pkgs/development/python-modules/ludios_wpull/default.nix +++ b/pkgs/development/python-modules/ludios_wpull/default.nix @@ -8,15 +8,16 @@ , lxml , namedlist , sqlalchemy -, tornado_4 +, tornado , Yapsy +, pythonAtLeast }: buildPythonPackage rec { pname = "ludios_wpull"; version = "3.0.7"; - disabled = !isPy3k; + disabled = (!isPy3k) || (pythonAtLeast "3.8"); src = fetchFromGitHub { rev = version; @@ -25,7 +26,7 @@ buildPythonPackage rec { sha256 = "1j96avm0ynbazypzp766wh26n4qc73y7wgsiqfrdfl6x7rx20wgf"; }; - propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado_4 Yapsy ]; + propagatedBuildInputs = [ chardet dnspython html5-parser lxml namedlist sqlalchemy tornado Yapsy ]; # Test suite has tests that fail on all platforms doCheck = false; @@ -35,5 +36,6 @@ buildPythonPackage rec { homepage = "https://github.com/ludios/wpull"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ ivan ]; + broken = lib.versions.major tornado.version != "4"; }; } diff --git a/pkgs/development/python-modules/marionette-harness/default.nix b/pkgs/development/python-modules/marionette-harness/default.nix index 29d38a1f2f0..187e3a646a0 100644 --- a/pkgs/development/python-modules/marionette-harness/default.nix +++ b/pkgs/development/python-modules/marionette-harness/default.nix @@ -21,8 +21,8 @@ buildPythonPackage rec { sha256 = "041cd779ae383fb5c56f2bb44824f4e80ba895febd9a3f21570ac274221c82e0"; }; - propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest - wptserve manifestparser marionette_driver ]; + propagatedBuildInputs = [ mozprofile mozversion browsermob-proxy moztest + wptserve manifestparser marionette_driver ]; meta = { description = "Mozilla Marionette protocol test automation harness"; diff --git a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix index 60e9e0460e7..28193528ed2 100644 --- a/pkgs/development/python-modules/marionette-harness/marionette_driver.nix +++ b/pkgs/development/python-modules/marionette-harness/marionette_driver.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { sha256 = "99ca2513d4e2ca29a08e550346f23947a50627a2b02f6ad36a4550e779fa0ce8"; }; - propagatedBuildInputs = [ mozversion mozrunner ]; + propagatedBuildInputs = [ mozversion mozrunner ]; meta = { description = "Mozilla Marionette driver"; diff --git a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix index 3520d23081b..9f5a77549da 100644 --- a/pkgs/development/python-modules/marionette-harness/mozhttpd.nix +++ b/pkgs/development/python-modules/marionette-harness/mozhttpd.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "10y1cr933ajx9ni701ayb7r361pak9wrzr7pdpyx81kkbjddq7qa"; }; - propagatedBuildInputs = [ moznetwork ]; + propagatedBuildInputs = [ moznetwork ]; meta = { description = "Webserver for Mozilla testing"; diff --git a/pkgs/development/python-modules/marionette-harness/moznetwork.nix b/pkgs/development/python-modules/marionette-harness/moznetwork.nix index 3029f7ed546..6bdc93f680a 100644 --- a/pkgs/development/python-modules/marionette-harness/moznetwork.nix +++ b/pkgs/development/python-modules/marionette-harness/moznetwork.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0ws20l4ggb6mj7ycwrk5h7hj1jmj3mj0ca48k5jzsa4n042ahwrd"; }; - propagatedBuildInputs = [ mozlog mozinfo ]; + propagatedBuildInputs = [ mozlog mozinfo ]; meta = { description = "Network utilities for Mozilla testing"; diff --git a/pkgs/development/python-modules/markdown/3_1.nix b/pkgs/development/python-modules/markdown/3_1.nix index b07d36e22c7..eb9b2e59ec8 100644 --- a/pkgs/development/python-modules/markdown/3_1.nix +++ b/pkgs/development/python-modules/markdown/3_1.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { sha256 = "2e50876bcdd74517e7b71f3e7a76102050edec255b3983403f1a63e7c8a41e7a"; }; - propagatedBuildInputs = [ - setuptools + propagatedBuildInputs = [ + setuptools ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/markdown/default.nix b/pkgs/development/python-modules/markdown/default.nix index aa076cddadc..c97f74a2f2a 100644 --- a/pkgs/development/python-modules/markdown/default.nix +++ b/pkgs/development/python-modules/markdown/default.nix @@ -18,8 +18,8 @@ buildPythonPackage rec { sha256 = "1fafe3f1ecabfb514a5285fca634a53c1b32a81cb0feb154264d55bf2ff22c17"; }; - propagatedBuildInputs = [ - setuptools + propagatedBuildInputs = [ + setuptools ] ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; diff --git a/pkgs/development/python-modules/marshmallow-polyfield/default.nix b/pkgs/development/python-modules/marshmallow-polyfield/default.nix index 3b18c10cbc3..e3b629b3034 100644 --- a/pkgs/development/python-modules/marshmallow-polyfield/default.nix +++ b/pkgs/development/python-modules/marshmallow-polyfield/default.nix @@ -31,4 +31,4 @@ buildPythonPackage rec { license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix index 4dd2ac8bcaa..cf54e38385d 100644 --- a/pkgs/development/python-modules/marshmallow/default.nix +++ b/pkgs/development/python-modules/marshmallow/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "marshmallow"; - version = "3.6.1"; + version = "3.7.1"; disabled = isPy27; meta = { @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "35ee2fb188f0bd9fc1cf9ac35e45fd394bd1c153cee430745a465ea435514bd5"; + sha256 = "a2a5eefb4b75a3b43f05be1cca0b6686adf56af7465c3ca629e5ad8d1e1fe13d"; }; propagatedBuildInputs = [ dateutil simplejson ]; diff --git a/pkgs/development/python-modules/mask-rcnn/default.nix b/pkgs/development/python-modules/mask-rcnn/default.nix index e9362f4e077..ae07e7928a6 100644 --- a/pkgs/development/python-modules/mask-rcnn/default.nix +++ b/pkgs/development/python-modules/mask-rcnn/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "mask-rcnn"; version = "2.1"; - + src = fetchFromGitHub { owner = "matterport"; repo = "Mask_RCNN"; @@ -49,4 +49,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ rakesh4g ]; }; } - diff --git a/pkgs/development/python-modules/mathlibtools/default.nix b/pkgs/development/python-modules/mathlibtools/default.nix new file mode 100644 index 00000000000..f9c1cf6839f --- /dev/null +++ b/pkgs/development/python-modules/mathlibtools/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchPypi, PyGithub, GitPython, toml, click, tqdm, + paramiko, networkx, pydot, pyyaml }: + +buildPythonPackage rec { + pname = "mathlibtools"; + version = "0.0.10"; + + src = fetchPypi { + inherit pname version; + sha256 = "0d708bgsxjhhchqc56afi1h7k87vbfn7v40f4y1zlv7hsjc69s36"; + }; + + propagatedBuildInputs = [ + PyGithub GitPython toml click tqdm paramiko networkx pydot pyyaml + ]; + + # requires internet access + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/leanprover-community/mathlib-tools"; + description = "leanproject is a supporting tool for Lean's mathlib"; + license = licenses.asl20; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix index 774fbc28793..45f31739746 100644 --- a/pkgs/development/python-modules/matplotlib/default.nix +++ b/pkgs/development/python-modules/matplotlib/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchPypi, python, buildPythonPackage, isPy3k, pycairo, backports_functools_lru_cache , which, cycler, dateutil, nose, numpy, pyparsing, sphinx, tornado, kiwisolver , freetype, libpng, pkgconfig, mock, pytz, pygobject3, gobject-introspection -, pillow +, certifi, pillow , enableGhostscript ? true, ghostscript ? null, gtk3 , enableGtk3 ? false, cairo # darwin has its own "MacOSX" backend @@ -20,14 +20,14 @@ assert enableTk -> (tcl != null) assert enableQt -> pyqt5 != null; buildPythonPackage rec { - version = "3.3.0"; + version = "3.3.1"; pname = "matplotlib"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "24e8db94948019d531ce0bcd637ac24b1c8f6744ac86d2aa0eb6dbaeb1386f82"; + sha256 = "87f53bcce90772f942c2db56736788b39332d552461a5cb13f05ff45c1680f0e"; }; XDG_RUNTIME_DIR = "/tmp"; @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ cycler dateutil numpy pyparsing tornado freetype kiwisolver - libpng mock pytz pillow ] + certifi libpng mock pytz pillow ] ++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ] ++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ] ++ stdenv.lib.optionals enableQt [ pyqt5 ]; diff --git a/pkgs/development/python-modules/maxminddb/default.nix b/pkgs/development/python-modules/maxminddb/default.nix index f92b96c9ada..0afdeef2228 100644 --- a/pkgs/development/python-modules/maxminddb/default.nix +++ b/pkgs/development/python-modules/maxminddb/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "15z5557rn4yvrhnpdm9l4kczr151qv9px736hd361rlr2z98wpdr"; + sha256 = "b95d8ed21799e6604683669c7ed3c6a184fcd92434d5762dccdb139b4f29e597"; }; buildInputs = [ libmaxminddb ]; diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix index 6fdc962cdb4..bd1e5417069 100644 --- a/pkgs/development/python-modules/minio/default.nix +++ b/pkgs/development/python-modules/minio/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "minio"; - version = "5.0.10"; + version = "6.0.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "6ecb7637a35f806733e9d112eacfa599a58d7c3d4698fda2b5c86fff5d34b417"; + sha256 = "97d275ff01ddae45101eced0d9d5258f2869308c949b17d86a77b77a2a50b7b3"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix index 4d65d7fce43..1acd8bf5690 100644 --- a/pkgs/development/python-modules/mlflow/default.nix +++ b/pkgs/development/python-modules/mlflow/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "mlflow"; - version = "1.8.0"; + version = "1.10.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "bab1b95da17ffb1856fec35fc1a0bc9d16e1811e41610a97c2c955884eb6ac53"; + sha256 = "11fe050373f3dbd422aa476c42cb0ed15467268bc1ad07e221e550bc54f94b75"; }; # run into https://stackoverflow.com/questions/51203641/attributeerror-module-alembic-context-has-no-attribute-config diff --git a/pkgs/development/python-modules/mmh3/default.nix b/pkgs/development/python-modules/mmh3/default.nix new file mode 100644 index 00000000000..8ac24188003 --- /dev/null +++ b/pkgs/development/python-modules/mmh3/default.nix @@ -0,0 +1,23 @@ +{ lib +, fetchPypi +, buildPythonPackage +}: + +buildPythonPackage rec { + pname = "mmh3"; + version = "2.5.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0265pvfbcsijf51szsh14qk3l3zgs0rb5rbrw11zwan52yi0jlhq"; + }; + + pythonImportsCheck = [ "mmh3" ]; + + meta = with lib; { + description = "Python wrapper for MurmurHash3, a set of fast and robust hash functions"; + homepage = "https://pypi.org/project/mmh3/"; + license = licenses.cc0; + maintainers = [ maintainers.danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/mock/2.nix b/pkgs/development/python-modules/mock/2.nix index 9ab8de1ba50..190297b41a2 100644 --- a/pkgs/development/python-modules/mock/2.nix +++ b/pkgs/development/python-modules/mock/2.nix @@ -41,4 +41,4 @@ buildPythonPackage rec { license = licenses.bsd2; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/more-itertools/default.nix b/pkgs/development/python-modules/more-itertools/default.nix index 8806bdf11cf..ec6ce4ed3b2 100644 --- a/pkgs/development/python-modules/more-itertools/default.nix +++ b/pkgs/development/python-modules/more-itertools/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "more-itertools"; - version = "8.3.0"; + version = "8.4.0"; src = fetchPypi { inherit pname version; - sha256 = "558bb897a2232f5e4f8e2399089e35aecb746e1f9191b6584a151647e89267be"; + sha256 = "68c70cc7167bdf5c7c9d8f6954a7837089c6a36bf565383919bb595efb8a17e5"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/morphys/default.nix b/pkgs/development/python-modules/morphys/default.nix index 8f8525f7afe..b89055829ef 100644 --- a/pkgs/development/python-modules/morphys/default.nix +++ b/pkgs/development/python-modules/morphys/default.nix @@ -21,4 +21,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix index e07be20b264..a75560e3b55 100644 --- a/pkgs/development/python-modules/msal/default.nix +++ b/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.3.0"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "5442a3a9d006506e653d3c4daff40538bdf067bf07b6b73b32d1b231d5e77a92"; + sha256 = "51b8e8e0d918d9b4813f006324e7c4e21eb76268dd4c1a06d811a3475ad4ac57"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mt-940/default.nix b/pkgs/development/python-modules/mt-940/default.nix index 01abd718c75..e1699292944 100644 --- a/pkgs/development/python-modules/mt-940/default.nix +++ b/pkgs/development/python-modules/mt-940/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "4.21.0"; + version = "4.23.0"; pname = "mt-940"; src = fetchPypi { inherit pname version; - sha256 = "7cbd88fd7252d5a2694593633b31f819eb302423058fecb9f9959e74c01c2b86"; + sha256 = "9274bc8298b2d4b69cb3936bdcda315b50e45975789f519a237bdec58346b8d7"; }; propagatedBuildInputs = lib.optional (!isPy3k) enum34; diff --git a/pkgs/development/python-modules/multitasking/default.nix b/pkgs/development/python-modules/multitasking/default.nix new file mode 100644 index 00000000000..8ea4d633f66 --- /dev/null +++ b/pkgs/development/python-modules/multitasking/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "multitasking"; + version = "0.0.9"; + + # GitHub source releases aren't tagged + src = fetchPypi { + inherit pname version; + sha256 = "b59d99f709d2e17d60ccaa2be09771b6e9ed9391c63f083c0701e724f624d2e0"; + }; + + doCheck = false; # No tests included + pythonImportsCheck = [ "multitasking" ]; + + meta = with lib; { + description = "Non-blocking Python methods using decorators"; + homepage = "https://github.com/ranaroussi/multitasking"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/mutagen/default.nix b/pkgs/development/python-modules/mutagen/default.nix index 9494d2c84a6..df0872242a1 100644 --- a/pkgs/development/python-modules/mutagen/default.nix +++ b/pkgs/development/python-modules/mutagen/default.nix @@ -3,6 +3,7 @@ , fetchPypi , isPy27 , fetchpatch +, flake8 , hypothesis , pycodestyle , pyflakes @@ -13,18 +14,18 @@ buildPythonPackage rec { pname = "mutagen"; - version = "1.44.0"; + version = "1.45.1"; disabled = isPy27; # abandoned src = fetchPypi { inherit pname version; - sha256 = "56065d8a9ca0bc64610a4d0f37e2bd4453381dde3226b8835ee656faa3287be4"; + sha256 = "6397602efb3c2d7baebd2166ed85731ae1c1d475abca22090b7141ff5034b3e1"; }; propagatedBuildInputs = [ setuptools ]; checkInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz - pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis + pkgs.glibcLocales pycodestyle pyflakes pytest hypothesis flake8 ]; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/mutatormath/default.nix b/pkgs/development/python-modules/mutatormath/default.nix new file mode 100644 index 00000000000..9336dbf354a --- /dev/null +++ b/pkgs/development/python-modules/mutatormath/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi +, defcon, fontmath +, unicodedata2, fs +}: + +buildPythonPackage rec { + pname = "MutatorMath"; + version = "3.0.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0r1qq45np49x14zz1zwkaayqrn7m8dn2jlipjldg2ihnmpzw29w1"; + extension = "zip"; + }; + + propagatedBuildInputs = [ fontmath unicodedata2 defcon ]; + checkInputs = [ unicodedata2 fs ]; + + meta = with lib; { + description = "Piecewise linear interpolation in multiple dimensions with multiple, arbitrarily placed, masters"; + homepage = "https://github.com/LettError/MutatorMath"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/mwoauth/default.nix b/pkgs/development/python-modules/mwoauth/default.nix index 94a85d41d9e..0a73e99391e 100644 --- a/pkgs/development/python-modules/mwoauth/default.nix +++ b/pkgs/development/python-modules/mwoauth/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { # package has no tests doCheck = false; - + propagatedBuildInputs = [ six pyjwt requests oauthlib requests_oauthlib ]; meta = with lib; { diff --git a/pkgs/development/python-modules/myfitnesspal/default.nix b/pkgs/development/python-modules/myfitnesspal/default.nix index a4a937d18d2..53e5f825344 100644 --- a/pkgs/development/python-modules/myfitnesspal/default.nix +++ b/pkgs/development/python-modules/myfitnesspal/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "myfitnesspal"; - version = "1.14.0"; + version = "1.16.1"; src = fetchPypi { inherit pname version; - sha256 = "66bf61c3d782cd80f380d3856da5f635f5b8de032e62d916c26d48dc322846a6"; + sha256 = "c2275e91c794a3569a76c47c78cf2ff04d7f569a98558227e899ead7b30af0d6"; }; # Remove overly restrictive version constraints on keyring and keyrings.alt diff --git a/pkgs/development/python-modules/mypy-protobuf/default.nix b/pkgs/development/python-modules/mypy-protobuf/default.nix index 5eda75d9c7f..3e0ab2cf182 100644 --- a/pkgs/development/python-modules/mypy-protobuf/default.nix +++ b/pkgs/development/python-modules/mypy-protobuf/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "mypy-protobuf"; - version = "1.21"; + version = "1.23"; src = fetchPypi { inherit pname version; - sha256 = "0eb8db49b014d1082f370a39eeaf272d1cc9978f728b64ee6fcc822d00a8793c"; + sha256 = "cf79c77e828a2de9bdc74b43ad4abd4c2a3a30f0471b46e9b4e01b9877f166fb"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/pkgs/development/python-modules/mysqlclient/default.nix b/pkgs/development/python-modules/mysqlclient/default.nix index 72bf06893ed..0d4aa542325 100644 --- a/pkgs/development/python-modules/mysqlclient/default.nix +++ b/pkgs/development/python-modules/mysqlclient/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "mysqlclient"; - version = "1.4.6"; + version = "2.0.1"; nativeBuildInputs = [ libmysqlclient @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f3fdaa9a38752a3b214a6fe79d7cae3653731a53e577821f9187e67cbecb2e16"; + sha256 = "fb2f75aea14722390d2d8ddf384ad99da708c707a96656210a7be8af20a2c5e5"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/nassl/default.nix b/pkgs/development/python-modules/nassl/default.nix index 08cfb66408d..0df4b0218b5 100644 --- a/pkgs/development/python-modules/nassl/default.nix +++ b/pkgs/development/python-modules/nassl/default.nix @@ -80,14 +80,14 @@ buildPythonPackage rec { cp ${opensslLegacyStatic.out}/lib/libssl.a \ ${opensslLegacyStatic.out}/lib/libcrypto.a \ deps/openssl-OpenSSL_1_0_2e/ - ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include + ln -s ${opensslLegacyStatic.out.dev}/include deps/openssl-OpenSSL_1_0_2e/include ln -s ${opensslLegacyStatic.bin}/bin deps/openssl-OpenSSL_1_0_2e/apps mkdir -p deps/openssl-OpenSSL_1_1_1/ cp ${opensslStatic.out}/lib/libssl.a \ ${opensslStatic.out}/lib/libcrypto.a \ deps/openssl-OpenSSL_1_1_1/ - ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include + ln -s ${opensslStatic.out.dev}/include deps/openssl-OpenSSL_1_1_1/include ln -s ${opensslStatic.bin}/bin deps/openssl-OpenSSL_1_1_1/apps mkdir -p deps/zlib-1.2.11/ diff --git a/pkgs/development/python-modules/nbconflux/default.nix b/pkgs/development/python-modules/nbconflux/default.nix index 2ca203e65ac..e86119036b5 100644 --- a/pkgs/development/python-modules/nbconflux/default.nix +++ b/pkgs/development/python-modules/nbconflux/default.nix @@ -3,22 +3,22 @@ buildPythonPackage rec { pname = "nbconflux"; version = "0.7.0"; - + src = fetchFromGitHub { owner = "Valassis-Digital-Media"; repo = "nbconflux"; rev = version; sha256 = "1708qkb275d6f7b4b5zmqx3i0jh56nrx2n9rwwp5nbaah5p2wwlh"; }; - + propagatedBuildInputs = [ nbconvert requests ]; - + checkInputs = [ pytest responses ]; - + checkPhase = '' pytest tests ''; - + meta = with lib; { description = "Converts Jupyter Notebooks to Atlassian Confluence (R) pages using nbconvert"; homepage = "https://github.com/Valassis-Digital-Media/nbconflux"; diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix index ca0a9d34b3e..203ffc65680 100644 --- a/pkgs/development/python-modules/ncclient/default.nix +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "ncclient"; - version = "0.6.7"; + version = "0.6.9"; src = fetchPypi { inherit pname version; - sha256 = "efdf3c868cd9f104d4e9fe4c233df78bfbbed4b3d78ba19dc27cec3cf6a63680"; + sha256 = "0112f2ad41fb658f52446d870853a63691d69299c73c7351c520d38dbd8dc0c4"; }; checkInputs = [ nose rednose ]; diff --git a/pkgs/development/python-modules/netdisco/default.nix b/pkgs/development/python-modules/netdisco/default.nix index 3d5c1520d31..a641f4cf558 100644 --- a/pkgs/development/python-modules/netdisco/default.nix +++ b/pkgs/development/python-modules/netdisco/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "netdisco"; - version = "2.7.1"; + version = "2.8.1"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0rkaz9377f4ldxcqxcmcc9hwdv5dda8nl7vrnp2pj3ppivq5629w"; + sha256 = "05ca5a8a0be88aa1a919818b0c5208293aa1197518a561545c6947232ee22bc1"; }; propagatedBuildInputs = [ requests zeroconf netifaces ]; diff --git a/pkgs/development/python-modules/nix-prefetch-github/default.nix b/pkgs/development/python-modules/nix-prefetch-github/default.nix index 6ee4d937cfb..67873f929ad 100644 --- a/pkgs/development/python-modules/nix-prefetch-github/default.nix +++ b/pkgs/development/python-modules/nix-prefetch-github/default.nix @@ -15,17 +15,13 @@ buildPythonPackage rec { pname = "nix-prefetch-github"; - version = "2.4"; + version = "3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-PVB/cL0NVB5pHxRMjg8TLatvIvHjfCvaRWBanVHYT+E="; + sha256 = "sha256-EN+EbVXUaf+id5UsK4EBm/9k9FYaH79g08kblvW60XA="; }; - # The tests for this package require nix and network access. That's - # why we cannot execute them inside the building process. - doCheck = false; - propagatedBuildInputs = [ attrs click @@ -34,6 +30,9 @@ buildPythonPackage rec { ]; checkInputs = [ pytestCheckHook pytest-black pytestcov pytest-isort git ]; + checkPhase = '' + pytest -m 'not network' + ''; # latest version of isort will cause tests to fail # ignore tests which are impure diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix index 4550bb63631..7ac4bc5fdbe 100644 --- a/pkgs/development/python-modules/notebook/default.nix +++ b/pkgs/development/python-modules/notebook/default.nix @@ -2,6 +2,7 @@ , lib , buildPythonPackage , fetchPypi +, argon2_cffi , nose , nose_warnings_filters , glibcLocales @@ -11,6 +12,7 @@ , tornado , ipython_genutils , traitlets +, jupyter , jupyter_core , jupyter_client , nbformat @@ -21,27 +23,28 @@ , send2trash , pexpect , prometheus_client +, pytestCheckHook }: buildPythonPackage rec { pname = "notebook"; - version = "6.0.3"; + version = "6.1.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "47a9092975c9e7965ada00b9a20f0cf637d001db60d241d479f53c0be117ad48"; + sha256 = "9990d51b9931a31e681635899aeb198b4c4b41586a9e87fbfaaed1a71d0a05b6"; }; LC_ALL = "en_US.utf8"; - checkInputs = [ nose glibcLocales ] + checkInputs = [ nose pytestCheckHook glibcLocales ] ++ (if isPy3k then [ nose_warnings_filters ] else [ mock ]); propagatedBuildInputs = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect - prometheus_client + prometheus_client argon2_cffi ]; # disable warning_filters @@ -52,18 +55,19 @@ buildPythonPackage rec { postPatch = '' # Remove selenium tests rm -rf notebook/tests/selenium - + export HOME=$TMPDIR ''; - checkPhase = '' - runHook preCheck - mkdir tmp - HOME=tmp nosetests -v ${if (stdenv.isDarwin) then '' - --exclude test_delete \ - --exclude test_checkpoints_follow_file - '' - else ""} - ''; + disabledTests = [ + # a "system_config" is generated, and fails many tests + "config" + "load_ordered" + # requires jupyter, but will cause circular imports + "test_run" + "TestInstallServerExtension" + "launch_socket" + "sock_server" + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/pkgs/development/python-modules/notify2/default.nix b/pkgs/development/python-modules/notify2/default.nix index a7928fb66c6..28c74415c5d 100644 --- a/pkgs/development/python-modules/notify2/default.nix +++ b/pkgs/development/python-modules/notify2/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { # Tests require Xorg and Dbus instance doCheck = false; propagatedBuildInputs = [ pygobject3 - dbus-python ]; + dbus-python ]; meta = { description = "Pure Python interface to DBus notifications"; diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix index f34301a5d70..c46bd4a2f18 100644 --- a/pkgs/development/python-modules/numba/default.nix +++ b/pkgs/development/python-modules/numba/default.nix @@ -13,14 +13,14 @@ }: buildPythonPackage rec { - version = "0.50.1"; + version = "0.51.0"; pname = "numba"; # uses f-strings disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "89e81b51b880f9b18c82b7095beaccc6856fcf84ba29c4f0ced42e4e5748a3a7"; + sha256 = "da57ef00bc814bf54446fb3f8c0374557a7476e40279ceabefd9f12b05cc3c0c"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1"; diff --git a/pkgs/development/python-modules/numpy/default.nix b/pkgs/development/python-modules/numpy/default.nix index 4501eafe7bd..98ba0b5c688 100644 --- a/pkgs/development/python-modules/numpy/default.nix +++ b/pkgs/development/python-modules/numpy/default.nix @@ -3,6 +3,7 @@ , python , buildPythonPackage , gfortran +, hypothesis , pytest , blas , lapack @@ -67,6 +68,8 @@ in buildPythonPackage rec { doCheck = !isPyPy; # numpy 1.16+ hits a bug in pypy's ctypes, using either numpy or pypy HEAD fixes this (https://github.com/numpy/numpy/issues/13807) + checkInputs = [ hypothesis ]; + checkPhase = '' runHook preCheck pushd dist diff --git a/pkgs/development/python-modules/numpydoc/default.nix b/pkgs/development/python-modules/numpydoc/default.nix index 725d1f9968b..0f57847b3a6 100644 --- a/pkgs/development/python-modules/numpydoc/default.nix +++ b/pkgs/development/python-modules/numpydoc/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, isPy27 , jinja2 , nose , pytest @@ -7,12 +7,13 @@ buildPythonPackage rec { pname = "numpydoc"; - version = "1.0.0"; + version = "1.1.0"; + disabled = isPy27; src = fetchPypi { inherit pname; inherit version; - sha256 = "e481c0799dfda208b6a2c2cb28757fa6b6cbc4d6e43722173697996cf556df7f"; + sha256 = "c36fd6cb7ffdc9b4e165a43f67bf6271a7b024d0bb6b00ac468c9e2bfc76448e"; }; checkInputs = [ nose pytest ]; diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 96247c93000..da0b106b7ce 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "nunavut"; - version = "0.3.0"; + version = "0.3.4"; disabled = pythonOlder "3.5"; # only python>=3.5 is supported src = fetchPypi { inherit pname version; - sha256 = "1ycnxrw2qgm7kdapsnhz80jsqkghgvb5giqwapn0m30rplwc3s36"; + sha256 = "5455946d069ac8cfd86e93d3977c1bd31ee7d68d22accdf130addb038e73564a"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/oauthenticator/default.nix b/pkgs/development/python-modules/oauthenticator/default.nix index 56c9eece4e8..bf2ad31ec3d 100644 --- a/pkgs/development/python-modules/oauthenticator/default.nix +++ b/pkgs/development/python-modules/oauthenticator/default.nix @@ -29,10 +29,10 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - + checkInputs = [ globus-sdk mwoauth codecov flake8 pytest pytestcov pytest-tornado requests-mock pyjwt ]; - + propagatedBuildInputs = [ jupyterhub ]; disabled = pythonOlder "3.4"; diff --git a/pkgs/development/python-modules/opentracing/default.nix b/pkgs/development/python-modules/opentracing/default.nix index 63107ec372a..f499470e25c 100644 --- a/pkgs/development/python-modules/opentracing/default.nix +++ b/pkgs/development/python-modules/opentracing/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { propagatedBuildInputs = lib.optional isPy27 futures; checkInputs = [ gevent mock pytest tornado ]; - + checkPhase = '' pytest ''; diff --git a/pkgs/development/python-modules/packet-python/default.nix b/pkgs/development/python-modules/packet-python/default.nix index 747b4c14cd2..02255f4bfd7 100644 --- a/pkgs/development/python-modules/packet-python/default.nix +++ b/pkgs/development/python-modules/packet-python/default.nix @@ -12,10 +12,10 @@ buildPythonPackage rec { pname = "packet-python"; - version = "1.42.0"; + version = "1.43.0"; src = fetchPypi { inherit pname version; - sha256 = "c3342085b2b96591b9d214d10fe39d85e1a2487c5b0883a90ff0bf6123086f07"; + sha256 = "48fcc5ca6e7f3d84ef91016585d1894bb9deb3dae6591ffab90fdf05006c3e48"; }; nativeBuildInputs = [ pytestrunner ]; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/palettable/default.nix b/pkgs/development/python-modules/palettable/default.nix index 9f1aed30ff7..f96e05950b8 100644 --- a/pkgs/development/python-modules/palettable/default.nix +++ b/pkgs/development/python-modules/palettable/default.nix @@ -10,9 +10,9 @@ buildPythonPackage rec { }; checkInputs = [ pytest ]; - + checkPhase = '' - pytest + pytest ''; meta = with stdenv.lib; { @@ -22,4 +22,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 09cda279730..8353e8d7895 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.3.0"; + version = "3.0.1"; pname = "pamqp"; src = fetchPypi { inherit pname version; - sha256 = "1s4lwbsiikz3czqad7jarb7k303q0wamla0rirghvwl9bslgbl2w"; + sha256 = "0a9b49bde3f554ec49b47ebdb789133979985f24d5f4698935ed589a2d4392a4"; }; buildInputs = [ mock nose pep8 pylint mccabe ]; diff --git a/pkgs/development/python-modules/parse/default.nix b/pkgs/development/python-modules/parse/default.nix index bb09646b6b4..4fb029bad50 100644 --- a/pkgs/development/python-modules/parse/default.nix +++ b/pkgs/development/python-modules/parse/default.nix @@ -3,11 +3,11 @@ }: buildPythonPackage rec { pname = "parse"; - version = "1.15.0"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "1h4m5df5grjpaf087g8ciishz5ajl28s3140s8bngppvy71f5m56"; + sha256 = "cd89e57aed38dcf3e0ff8253f53121a3b23e6181758993323658bffc048a5c19"; }; checkPhase = '' diff --git a/pkgs/development/python-modules/parso/default.nix b/pkgs/development/python-modules/parso/default.nix index 4406524bdaa..4ab09f5938e 100644 --- a/pkgs/development/python-modules/parso/default.nix +++ b/pkgs/development/python-modules/parso/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "parso"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "caba44724b994a8a5e086460bb212abc5a8bc46951bf4a9a1210745953622eb9"; + sha256 = "2b6db14759c528d857eeb9eac559c2166b2554548af39f5198bdfb976f72aa64"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix index 46601c16755..81d9e50b28f 100644 --- a/pkgs/development/python-modules/patator/default.nix +++ b/pkgs/development/python-modules/patator/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "patator"; - version = "0.7"; + version = "0.9"; disabled = !(isPy3k); src = fetchPypi { inherit pname version; - sha256 = "335e432e6cc591437e316ba8c1da935484ca39fc79e595ccf60ccd9166e965f1"; + sha256 = "68cb24bdc3042ee0d47a288b19a8b99a6c54bdbd4ddf0c5817d9b9ac0a0d8a15"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pathspec/default.nix b/pkgs/development/python-modules/pathspec/default.nix index 1cba07ba6bc..bb52cd51a14 100644 --- a/pkgs/development/python-modules/pathspec/default.nix +++ b/pkgs/development/python-modules/pathspec/default.nix @@ -18,4 +18,4 @@ buildPythonPackage rec { license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ copumpkin ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pcpp/default.nix b/pkgs/development/python-modules/pcpp/default.nix index f621140f137..f57798c40a8 100644 --- a/pkgs/development/python-modules/pcpp/default.nix +++ b/pkgs/development/python-modules/pcpp/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "0k52qyxzdngdhyn4sya2qn1w1a4ll0mcla4h4gb1v91fk4lw25dm"; fetchSubmodules = true; }; - + meta = with stdenv.lib; { homepage = "https://github.com/ned14/pcpp"; description = "A C99 preprocessor written in pure Python"; diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 41459a8f4a1..08f482e6221 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "pdfminer_six"; - version = "20200720"; + version = "20200726"; disabled = !isPy3k; @@ -11,7 +11,7 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "19cnl1b6mrk9i18a1k4vdl5k85ww8yhfq89w3fxh6rb0fla5d71i"; + sha256 = "1hlaz7ax1czb028x3nhk3l2jy07f26q5hbhmdirljaaga24vd96z"; }; propagatedBuildInputs = [ chardet cryptography sortedcontainers ]; diff --git a/pkgs/development/python-modules/pdftotext/default.nix b/pkgs/development/python-modules/pdftotext/default.nix index 24be7ce7f86..a52160363df 100644 --- a/pkgs/development/python-modules/pdftotext/default.nix +++ b/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.1.4"; + version = "2.1.5"; src = fetchPypi { inherit pname version; - sha256 = "00xf3jmpb4m3q758wvk4khpcmiys4gmd88vvrz6i7yw1jl268y6k"; + sha256 = "98aeb8b07a4127e1a30223bd933ef080bbd29aa88f801717ca6c5618380b8aa6"; }; buildInputs = [ poppler ]; diff --git a/pkgs/development/python-modules/pelican/default.nix b/pkgs/development/python-modules/pelican/default.nix index c7c1ced34f1..30d6546d570 100644 --- a/pkgs/development/python-modules/pelican/default.nix +++ b/pkgs/development/python-modules/pelican/default.nix @@ -1,18 +1,20 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub +{ stdenv, buildPythonPackage, fetchFromGitHub, isPy27 , glibcLocales, git , mock, nose, markdown, lxml, typogrify , jinja2, pygments, docutils, pytz, unidecode, six, dateutil, feedgenerator -, blinker, pillow, beautifulsoup4, markupsafe }: +, blinker, pillow, beautifulsoup4, markupsafe, pandoc }: buildPythonPackage rec { pname = "pelican"; - version = "4.2.0"; + version = "4.5.0"; + + disabled = isPy27; src = fetchFromGitHub { owner = "getpelican"; repo = "pelican"; rev = version; - sha256 = "0w9nqdw2jmqc6kqwg4rh6irr5k6j7hk8axg6vgd137rs50v62yv5"; + sha256 = "0p8p84fcpkr19d54dhxvldd8ijbg334wmrmkr99pnbrdl1gf64qi"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -24,15 +26,15 @@ buildPythonPackage rec { # Exclude custom locale test, which files were removed above to fix the source checksum checkPhase = '' - nosetests -sv --exclude=test_custom_locale_generation_works pelican + nosetests -s \ + --exclude=test_custom_locale_generation_works \ + --exclude=test_log_filter \ + pelican ''; buildInputs = [ glibcLocales - # Note: Pelican has to adapt to a changed CLI of pandoc before enabling this - # again. Compare https://github.com/getpelican/pelican/pull/2252. - # Version 4.2.0 is incompatible with our current pandoc version. - # pandoc + pandoc git mock markdown @@ -46,21 +48,16 @@ buildPythonPackage rec { checkInputs = [ nose + pandoc ]; postPatch= '' substituteInPlace pelican/tests/test_pelican.py \ --replace "'git'" "'${git}/bin/git'" - - # Markdown-3.1 changed footnote separator to colon - # https://github.com/getpelican/pelican/issues/2493#issuecomment-491723744 - sed -i '/test_article_with_footnote/i\ - @unittest.skip("")' pelican/tests/test_readers.py ''; LC_ALL="en_US.UTF-8"; - # We only want to patch shebangs in /bin, and not those # of the project scripts that are created by Pelican. # See https://github.com/NixOS/nixpkgs/issues/30116 diff --git a/pkgs/development/python-modules/pep517/default.nix b/pkgs/development/python-modules/pep517/default.nix index 1eb2895068a..a5636656984 100644 --- a/pkgs/development/python-modules/pep517/default.nix +++ b/pkgs/development/python-modules/pep517/default.nix @@ -49,4 +49,4 @@ buildPythonPackage rec { license = lib.licenses.mit; homepage = "https://github.com/pypa/pep517"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix index 0212e7ea425..e4a158a7183 100644 --- a/pkgs/development/python-modules/pg8000/default.nix +++ b/pkgs/development/python-modules/pg8000/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "pg8000"; - version = "1.15.3"; + version = "1.16.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "af97353076b8e5d271d91c64c8ca806e2157d11b7862c90ff6f0e23be0fc217d"; + sha256 = "8af70cdfcc1fadafa32468a6af563e1c0b5271c4dcc99a4490030a128cb295a3"; }; propagatedBuildInputs = [ passlib ]; diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix index 1668cd94ade..032524fc5df 100644 --- a/pkgs/development/python-modules/pglast/default.nix +++ b/pkgs/development/python-modules/pglast/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pglast"; - version = "1.11"; + version = "1.12"; src = fetchPypi { inherit pname version; - sha256 = "8463d60b9065daf26e3c0fa6e7515d2a4594847ab417be018858832a475105f1"; + sha256 = "b5d6a105928d2285e43afb87d638ada844ed8933cc306c23a3c095684f3d3af4"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/phonenumbers/default.nix b/pkgs/development/python-modules/phonenumbers/default.nix index e3e23fa8e88..1aef55e8211 100644 --- a/pkgs/development/python-modules/phonenumbers/default.nix +++ b/pkgs/development/python-modules/phonenumbers/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.7"; + version = "8.12.8"; src = fetchPypi { inherit pname version; - sha256 = "652c418f8e97c8438f227a524ddf8d7d325c4a47e4924ce865b827c24ec3194d"; + sha256 = "3a8b8f7b60ea00b83ca588b5ca57e48d9a3c223aa42f1a3d5fa88566424216c3"; }; meta = { diff --git a/pkgs/development/python-modules/phonopy/default.nix b/pkgs/development/python-modules/phonopy/default.nix index 5dd4e25b662..3bc510f678a 100644 --- a/pkgs/development/python-modules/phonopy/default.nix +++ b/pkgs/development/python-modules/phonopy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.4.2"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "6e6ce41ce8a51723b94d974adfee032cddce5b9300984dd23b59e101ed0a2861"; + sha256 = "482c6ff29c058d091ac885e561e28ba3e516ea9e91c44a951cad11f3ae19856c"; }; propagatedBuildInputs = [ numpy pyyaml matplotlib h5py ]; diff --git a/pkgs/development/python-modules/picos/default.nix b/pkgs/development/python-modules/picos/default.nix index ca6346d1cd2..a6f1aa1a141 100644 --- a/pkgs/development/python-modules/picos/default.nix +++ b/pkgs/development/python-modules/picos/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { checkInputs = [ networkx ]; - + propagatedBuildInputs = [ numpy cvxopt @@ -31,7 +31,7 @@ buildPythonPackage rec { checkPhase = '' ${python.interpreter} test.py ''; - + meta = with lib; { description = "A Python interface to conic optimization solvers"; homepage = "https://gitlab.com/picos-api/picos"; diff --git a/pkgs/development/python-modules/pikepdf/default.nix b/pkgs/development/python-modules/pikepdf/default.nix index e3498923856..3db9a2642c7 100644 --- a/pkgs/development/python-modules/pikepdf/default.nix +++ b/pkgs/development/python-modules/pikepdf/default.nix @@ -22,12 +22,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "1.14.0"; + version = "1.18.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "5b371c71b0da42d87371ed39973f07c7eb67d939ca5031f0c1637cfb3a2d79f5"; + sha256 = "4d0840a5c16b535f9b6e56fb4421a43f88760e6cabcf7fd44bdd0436107b61dc"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pillow/default.nix b/pkgs/development/python-modules/pillow/default.nix index cc9a77be782..ab971e4201b 100644 --- a/pkgs/development/python-modules/pillow/default.nix +++ b/pkgs/development/python-modules/pillow/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "Pillow"; - version = "7.1.2"; + version = "7.2.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1pdh1zzdwxilvsjg6rnl4q810pc2p2y16q6lx9gzzihb25h9kd50"; + sha256 = "97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626"; }; # Disable imagefont tests, because they don't work well with infinality: diff --git a/pkgs/development/python-modules/pims/default.nix b/pkgs/development/python-modules/pims/default.nix index c7037cf5385..76eaa4fac69 100644 --- a/pkgs/development/python-modules/pims/default.nix +++ b/pkgs/development/python-modules/pims/default.nix @@ -10,12 +10,12 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "0.5"; pname = "PIMS"; src = fetchPypi { inherit pname version; - sha256 = "6a53a155e900b44e71127a1e1fccbfbaed7eec3c2b52497c40c23a05f334c9dd"; + sha256 = "a02cdcbb153e2792042fb0bae7df4f30878bbba1f2d176114a87ee0dc18715a0"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pint/default.nix b/pkgs/development/python-modules/pint/default.nix index 939eeafd9b9..bb2a20cf62f 100644 --- a/pkgs/development/python-modules/pint/default.nix +++ b/pkgs/development/python-modules/pint/default.nix @@ -1,10 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 , pythonOlder -, funcsigs , setuptools_scm +, importlib-metadata +, packaging # Check Inputs , pytestCheckHook , numpy @@ -24,9 +24,10 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ - setuptools_scm - ] ++ lib.optional isPy27 funcsigs; + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ packaging ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; # Test suite explicitly requires pytest checkInputs = [ diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix index e9d3159382e..104619711a7 100644 --- a/pkgs/development/python-modules/pip-tools/default.nix +++ b/pkgs/development/python-modules/pip-tools/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pip-tools"; - version = "5.2.1"; + version = "5.3.1"; src = fetchPypi { inherit pname version; - sha256 = "5b4b6e7b6e66357685c73e856296b4792b2d159ff6074729e250e291834bfd9d"; + sha256 = "5672c2b6ca0f1fd803f3b45568c2cf7fadf135b4971e7d665232b2075544c0ef"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/python-modules/pipdate/default.nix b/pkgs/development/python-modules/pipdate/default.nix index c0a34d1d8a3..35fbb624e6b 100644 --- a/pkgs/development/python-modules/pipdate/default.nix +++ b/pkgs/development/python-modules/pipdate/default.nix @@ -7,11 +7,13 @@ , importlib-metadata , requests , pytest +, wheel }: buildPythonPackage rec { pname = "pipdate"; version = "0.5.2"; + format = "pyproject"; disabled = isPy27; # abandoned src = fetchPypi { @@ -19,6 +21,8 @@ buildPythonPackage rec { sha256 = "507065231f2d50b6319d483432cba82aadad78be21b7a2969b5881ed8dee9ab4"; }; + nativeBuildInputs = [ wheel ]; + propagatedBuildInputs = [ appdirs requests @@ -26,12 +30,6 @@ buildPythonPackage rec { importlib-metadata ]; - # can be removed when https://github.com/nschloe/pipdate/pull/41 gets merged - postPatch = '' - substituteInPlace setup.cfg \ - --replace "importlib_metadata" "importlib_metadata; python_version < \"3.8\"" - ''; - checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pipx/default.nix b/pkgs/development/python-modules/pipx/default.nix new file mode 100644 index 00000000000..3b35b67bf09 --- /dev/null +++ b/pkgs/development/python-modules/pipx/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, userpath +, argcomplete +, packaging +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pipx"; + version = "0.15.5.1"; + + disabled = pythonOlder "3.6"; + + # no tests in the pypi tarball, so we directly fetch from github + src = fetchFromGitHub { + owner = "pipxproject"; + repo = pname; + rev = version; + sha256 = "0lq8dfkq4ji11r4k5csqzyv0757fbxiax6ixn94f9747zrikssf6"; + }; + + propagatedBuildInputs = [ userpath argcomplete packaging ]; + + checkInputs = [ pytestCheckHook ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + # disable tests, which require internet connection + disabledTests = [ + "install" + "inject" + "ensure_null_pythonpath" + "missing_interpreter" + "cache" + "internet" + "runpip" + "upgrade" + ]; + + meta = with lib; { + description = + "Install and Run Python Applications in Isolated Environments"; + homepage = "https://github.com/pipxproject/pipx"; + license = licenses.mit; + maintainers = with maintainers; [ yevhenshymotiuk ]; + }; +} diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix index a9a46bfc9e2..cc33babd64b 100644 --- a/pkgs/development/python-modules/plotly/default.nix +++ b/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.8.2"; + version = "4.9.0"; src = fetchPypi { inherit pname version; - sha256 = "ce55e1a9669ea7455574ddbfe2fb52636eb63a6c29387ee0c0a929ed2325f916"; + sha256 = "257f530ffd73754bd008454826905657b329053364597479bb9774437a396837"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix index 796f9418497..e08537ff1ab 100644 --- a/pkgs/development/python-modules/plumbum/default.nix +++ b/pkgs/development/python-modules/plumbum/default.nix @@ -16,4 +16,4 @@ buildPythonPackage rec { inherit pname version; sha256 = "1ps37vamqav6p277dlp51jnacd5q4x4z1x8y0nfjw3y8jsfy3f8n"; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index a81e1e52aea..937a758b9c8 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pythonOlder +{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pythonOlder, fetchpatch , cachecontrol , cachy , cleo @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace "requests-toolbelt = \"^0.8.0\"" "requests-toolbelt = \"^0.9.1\"" \ --replace 'importlib-metadata = {version = "~1.1.3", python = "<3.8"}' \ 'importlib-metadata = {version = ">=1.3,<2", python = "<3.8"}' \ - --replace "tomlkit = \"^0.5.11\"" "tomlkit = \"^0.6.0\"" \ + --replace "tomlkit = \"^0.5.11\"" "tomlkit = \"<2\"" \ --replace "cleo = \"^0.7.6\"" "cleo = \"^0.8.0\"" \ --replace "version = \"^20.0.1\", python = \"^3.5\"" "version = \"^21.0.0\", python = \"^3.5\"" \ --replace "clikit = \"^0.4.2\"" "clikit = \"^0.6.2\"" @@ -90,6 +90,8 @@ buildPythonPackage rec { "prereleases_if_they_are_compatible" # requires git history to work correctly "default_with_excluded_data" + # toml ordering has changed + "lock" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pooch/default.nix b/pkgs/development/python-modules/pooch/default.nix new file mode 100644 index 00000000000..378035bb7a5 --- /dev/null +++ b/pkgs/development/python-modules/pooch/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, buildPythonPackage +, isPy27 +, fetchPypi +, pytestCheckHook +, packaging +, appdirs +, requests +}: + +buildPythonPackage rec { + pname = "pooch"; + version = "1.0.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "1k2vinlhkzl7lzhvbz20x3a2r2zqqila0yxg3a3fax2r6qxbxxzi"; + }; + + propagatedBuildInputs = [ packaging appdirs requests ]; + + checkInputs = [ pytestCheckHook ]; + disabledTests = [ + "pooch_custom_url" + "pooch_download" + "pooch_logging_level" + "pooch_update" + "pooch_corrupted" + "check_availability" + "downloader" + "test_fetch" + "decompress" + "extractprocessor_fails" + "processor" + "integration" + ]; + + meta = with stdenv.lib; { + description = "A friend to fetch your data files."; + homepage = "https://github.com/fatiando/pooch"; + license = licenses.bsd3; + maintainers = with maintainers; [ GuillaumeDesforges ]; + }; + +} diff --git a/pkgs/development/python-modules/pq/default.nix b/pkgs/development/python-modules/pq/default.nix index 1227a674988..75a722d831e 100644 --- a/pkgs/development/python-modules/pq/default.nix +++ b/pkgs/development/python-modules/pq/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pq"; - version = "1.8.1"; + version = "1.8.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9e2c0195488263902ebc9da8df6c82bebe4ee32c79d9ecd0cdc2945afbf7ad32"; + sha256 = "f54143844e73f4182532e68548dee447dd78dd00310a087e8cdee756d476a173"; }; # psycopg2cffi is compatible with psycopg2 and author states that diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index c0f536480da..88fb6e3abf9 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.6.0"; + version = "2.7.1"; disabled = isPy27; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "05d9635v0yzrj2848m2hn9axbvds0dymv49rlyj238v3vlzncmqn"; + sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5"; }; patches = [ diff --git a/pkgs/development/python-modules/preshed/default.nix b/pkgs/development/python-modules/preshed/default.nix index 050295204bc..96a015076df 100644 --- a/pkgs/development/python-modules/preshed/default.nix +++ b/pkgs/development/python-modules/preshed/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { checkPhase = '' ${python.interpreter} setup.py test ''; - + meta = with stdenv.lib; { description = "Cython hash tables that assume keys are pre-hashed"; homepage = "https://github.com/explosion/preshed"; diff --git a/pkgs/development/python-modules/prompt_toolkit/default.nix b/pkgs/development/python-modules/prompt_toolkit/default.nix index 9d969b5d341..47fbace69df 100644 --- a/pkgs/development/python-modules/prompt_toolkit/default.nix +++ b/pkgs/development/python-modules/prompt_toolkit/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "prompt_toolkit"; - version = "3.0.5"; + version = "3.0.6"; src = fetchPypi { inherit pname version; - sha256 = "563d1a4140b63ff9dd587bda9557cffb2fe73650205ab6f4383092fb882e7dc8"; + sha256 = "7630ab85a23302839a0f26b31cc24f518e6155dea1ed395ea61b42c45941b6a6"; }; checkPhase = '' py.test -k 'not test_pathcompleter_can_expanduser' diff --git a/pkgs/development/python-modules/psautohint/default.nix b/pkgs/development/python-modules/psautohint/default.nix new file mode 100644 index 00000000000..0f89069c7d8 --- /dev/null +++ b/pkgs/development/python-modules/psautohint/default.nix @@ -0,0 +1,40 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder +, fonttools, lxml, fs +, setuptools_scm +, pytest, pytestcov, pytest_xdist, pytest-randomly +}: + +buildPythonPackage rec { + pname = "psautohint"; + version = "2.1.0"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "adobe-type-tools"; + repo = pname; + sha256 = "1k1rx1adqxdxj5v3788lwnvygylp73sps1p0q44hws2vmsag2s8r"; + rev = "v${version}"; + fetchSubmodules = true; # data dir for tests + }; + + postPatch = '' + echo '#define PSAUTOHINT_VERSION "${version}"' > libpsautohint/src/version.h + sed -i '/use_scm_version/,+3d' setup.py + sed -i '/setup(/a \ version="${version}",' setup.py + ''; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ fonttools lxml fs ]; + + checkInputs = [ pytest pytestcov pytest_xdist pytest-randomly ]; + checkPhase = "pytest tests"; + + meta = with lib; { + description = "Script to normalize the XML and other data inside of a UFO"; + homepage = "https://github.com/adobe-type-tools/psautohint"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix index 89797c4802c..ab3a3c1665e 100644 --- a/pkgs/development/python-modules/psutil/default.nix +++ b/pkgs/development/python-modules/psutil/default.nix @@ -25,9 +25,7 @@ buildPythonPackage rec { # cpu_times is flakey on darwin checkPhase = '' pytest $out/${python.sitePackages}/psutil/tests/test_system.py \ - -k 'not user \ - and not disk_io_counters and not sensors_battery \ - and not cpu_times' + -k 'not user and not disk_io_counters and not sensors_battery and not cpu_times' ''; buildInputs = lib.optionals stdenv.isDarwin [ darwin.IOKit ]; diff --git a/pkgs/development/python-modules/ptpython/default.nix b/pkgs/development/python-modules/ptpython/default.nix index 47fd2b33458..e92a99d9989 100644 --- a/pkgs/development/python-modules/ptpython/default.nix +++ b/pkgs/development/python-modules/ptpython/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "ptpython"; - version = "3.0.3"; + version = "3.0.5"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "9ac4e4047ca3a03133702a353a93cf56ca1ec1162bc7ecaff087a91c03e3827b"; + sha256 = "5094e7e4daa77453d3c33eb7b7ebbf1060be4446521865a94e698bc85ff15930"; }; propagatedBuildInputs = [ appdirs prompt_toolkit docopt jedi pygments ] diff --git a/pkgs/development/python-modules/pulp/default.nix b/pkgs/development/python-modules/pulp/default.nix index ab6fda9d3d4..60b34f09833 100644 --- a/pkgs/development/python-modules/pulp/default.nix +++ b/pkgs/development/python-modules/pulp/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "PuLP"; - version = "2.1"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "06swbi7wygh7y0kxc85q1pdhzk662375d9a5jnahgr76hkwwkybn"; + sha256 = "9d8ecf532868cc31fa9ff59ee5d5b2049600c5c902c18c794a2bad677c1f92e5"; }; propagatedBuildInputs = [ pyparsing ]; diff --git a/pkgs/development/python-modules/pure-eval/default.nix b/pkgs/development/python-modules/pure-eval/default.nix new file mode 100644 index 00000000000..d7e92f09784 --- /dev/null +++ b/pkgs/development/python-modules/pure-eval/default.nix @@ -0,0 +1,27 @@ +{ lib, buildPythonPackage, fetchFromGitHub, setuptools_scm, toml, pytest }: + +buildPythonPackage rec { + pname = "pure_eval"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "alexmojaki"; + repo = pname; + rev = "v${version}"; + sha256 = "1d3gpc9mrmwdk6l87x7ll23vwv6l8l2iqvi63r86j7bj5s8m2ci8"; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + buildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ toml ]; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "Safely evaluate AST nodes without side effects"; + homepage = "http://github.com/alexmojaki/pure_eval"; + license = licenses.mit; + maintainers = with maintainers; [ gebner ]; + }; +} diff --git a/pkgs/development/python-modules/pwntools/default.nix b/pkgs/development/python-modules/pwntools/default.nix index c7aae24f1dd..623140546e1 100644 --- a/pkgs/development/python-modules/pwntools/default.nix +++ b/pkgs/development/python-modules/pwntools/default.nix @@ -1,8 +1,10 @@ { stdenv , buildPythonPackage +, debugger , fetchPypi , isPy3k , Mako +, makeWrapper , packaging , pysocks , pygments @@ -58,10 +60,15 @@ buildPythonPackage rec { doCheck = false; # no setuptools tests for the package + postFixup = '' + mkdir -p "$out/bin" + makeWrapper "${debugger}/bin/${stdenv.lib.strings.getName debugger}" "$out/bin/pwntools-gdb" + ''; + meta = with stdenv.lib; { homepage = "http://pwntools.com"; description = "CTF framework and exploit development library"; license = licenses.mit; - maintainers = with maintainers; [ bennofs kristoff3r ]; + maintainers = with maintainers; [ bennofs kristoff3r pamplemousse ]; }; } diff --git a/pkgs/development/python-modules/py-multibase/default.nix b/pkgs/development/python-modules/py-multibase/default.nix index 59876b473a9..c304e68fd8d 100644 --- a/pkgs/development/python-modules/py-multibase/default.nix +++ b/pkgs/development/python-modules/py-multibase/default.nix @@ -43,4 +43,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/py-multihash/default.nix b/pkgs/development/python-modules/py-multihash/default.nix index f81b7fb7644..5034f6df469 100644 --- a/pkgs/development/python-modules/py-multihash/default.nix +++ b/pkgs/development/python-modules/py-multihash/default.nix @@ -46,4 +46,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/py/default.nix b/pkgs/development/python-modules/py/default.nix index edc35bb134e..19366ea7146 100644 --- a/pkgs/development/python-modules/py/default.nix +++ b/pkgs/development/python-modules/py/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "py"; - version = "1.8.2"; + version = "1.9.0"; src = fetchPypi { inherit pname version; - sha256 = "f3b3a4c36512a4c4f024041ab51866f11761cc169670204b235f6b20523d4e6b"; + sha256 = "9ca6883ce56b4e8da7e79ac18787889fa5206c79dcc67fb065376cd2fe03f342"; }; # Circular dependency on pytest diff --git a/pkgs/development/python-modules/py_stringmatching/default.nix b/pkgs/development/python-modules/py_stringmatching/default.nix index f4407150204..fda497b7962 100644 --- a/pkgs/development/python-modules/py_stringmatching/default.nix +++ b/pkgs/development/python-modules/py_stringmatching/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; checkInputs = [ nose ]; - + propagatedBuildInputs = [ numpy six ]; meta = with lib; { diff --git a/pkgs/development/python-modules/pyatmo/default.nix b/pkgs/development/python-modules/pyatmo/default.nix index cb628561fda..ec959740f9e 100644 --- a/pkgs/development/python-modules/pyatmo/default.nix +++ b/pkgs/development/python-modules/pyatmo/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "3.3.1"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "9949338833a27b6c3251b52bf70b73aa99c43c56153541338cb63001afafdd1e"; + sha256 = "148713395d51a57f1f3102eacbb9286a859fc5c18c066238a961a1acf189b930"; }; propagatedBuildInputs = [ oauthlib requests requests_oauthlib ]; diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index b8a607f4d45..2356cc1a88d 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "pyatv"; - version = "0.6.1"; + version = "0.7.1"; src = fetchPypi { inherit pname version; - sha256 = "0f9wj1ggllwpjd9nh6nsrck7m4gbz29q6vqbrhbkc2kz6waqkgwc"; + sha256 = "17d4fb4fbdfe1c762e421ce2caa6beddab8ef9a6e0e5c7ab7eb54c8d8654c61c"; }; nativeBuildInputs = [ pytestrunner]; diff --git a/pkgs/development/python-modules/pybullet/default.nix b/pkgs/development/python-modules/pybullet/default.nix index 588b865a354..9d889214e34 100644 --- a/pkgs/development/python-modules/pybullet/default.nix +++ b/pkgs/development/python-modules/pybullet/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pybullet"; - version = "2.8.4"; + version = "2.8.7"; src = fetchPypi { inherit pname version; - sha256 = "39fb2ae8ef99c7096295a368e232224b68bf209059c1977d7189c28ec833d043"; + sha256 = "9d3a8bdc9b4acce086c485ba719aabee33de7a867d84a058b182b139c789ad55"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 72a527b8073..07ed842368e 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "PyChromecast"; - version = "7.1.2"; + version = "7.2.0"; src = fetchPypi { inherit pname version; - sha256 = "adcf478d7fc539e9decde59b2db7b6a4b1d679c4cf78d515d880adb1c4bc1c30"; + sha256 = "c522c5ecb554471ca8e5690c05530b1c237c301349061d3839c506984f8d3c2d"; }; disabled = !isPy3k; diff --git a/pkgs/development/python-modules/pycoin/default.nix b/pkgs/development/python-modules/pycoin/default.nix index a0b743bb8b5..da09cfdd64e 100644 --- a/pkgs/development/python-modules/pycoin/default.nix +++ b/pkgs/development/python-modules/pycoin/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycoin"; - version = "0.90.20200322"; + version = "0.90.20200809"; src = fetchPypi { inherit pname version; - sha256 = "c8af579e86c118deb64d39e0d844d53a065cdd8227ddd632112e5667370b53a3"; + sha256 = "301dd6df9d9d580701d7325c4d1c341233ba1a94cb805305ea3a43c31bdaaa4c"; }; propagatedBuildInputs = [ setuptools ]; diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index 1825c690f30..cef9e964425 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { propagatedBuildInputs = [ snowballstemmer ]; - checkInputs = [ pytest pytestpep8 mock ]; + checkInputs = [ pytest mock ]; checkPhase = '' # test_integration.py installs packages via pip - py.test --pep8 --cache-clear -vv src/tests -k "not test_integration" + py.test --cache-clear -vv src/tests -k "not test_integration" ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pyexcel-io/default.nix b/pkgs/development/python-modules/pyexcel-io/default.nix new file mode 100644 index 00000000000..8a788402b49 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel-io/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchPypi +, lml +}: + +buildPythonPackage rec { + pname = "pyexcel-io"; + version = "0.5.20"; + + src = fetchPypi { + inherit pname version; + sha256 = "CN/jlVO5ljWbFD3j2exD4ZbxE41HyrtzrwShaCG4TXk="; + }; + + propagatedBuildInputs = [ + lml + ]; + + # Tests depend on stuff that depends on this. + doCheck = false; + + pythonImportsCheck = [ "pyexcel_io" ]; + + meta = { + description = "One interface to read and write the data in various excel formats, import the data into and export the data from databases"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/pyexcel-ods/default.nix b/pkgs/development/python-modules/pyexcel-ods/default.nix new file mode 100644 index 00000000000..9e5b32ea867 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel-ods/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyexcel-io +, odfpy +, nose +, pyexcel +, pyexcel-xls +, psutil +}: + +buildPythonPackage rec { + pname = "pyexcel-ods"; + version = "0.5.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "O+Uv2KrdvYvJKG9+sUj0VT1MlyUtaVw6nse5XmZmoiM="; + }; + + propagatedBuildInputs = [ + pyexcel-io + odfpy + ]; + + checkInputs = [ + nose + pyexcel + pyexcel-xls + psutil + ]; + + checkPhase = "nosetests"; + + meta = { + description = "Plug-in to pyexcel providing the capbility to read, manipulate and write data in ods formats using odfpy"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/pyexcel-xls/default.nix b/pkgs/development/python-modules/pyexcel-xls/default.nix new file mode 100644 index 00000000000..2dd4533c2a9 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel-xls/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pyexcel-io +, xlrd +, xlwt +, nose +, pyexcel +, mock +}: + +buildPythonPackage rec { + pname = "pyexcel-xls"; + version = "0.5.9"; + + src = fetchPypi { + inherit pname version; + sha256 = "1Wyt6gpmBoRFaXbZgFJVTTu+KnivxfmpHIaR9iZghVU="; + }; + + propagatedBuildInputs = [ + pyexcel-io + xlrd + xlwt + ]; + + checkInputs = [ + nose + pyexcel + mock + ]; + + checkPhase = "nosetests"; + + meta = { + description = "A wrapper library to read, manipulate and write data in xls using xlrd and xlwt"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix new file mode 100644 index 00000000000..71219c32ae5 --- /dev/null +++ b/pkgs/development/python-modules/pyexcel/default.nix @@ -0,0 +1,45 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy27 +, lml +, pyexcel-io +, texttable +, nose +}: + +buildPythonPackage rec { + pname = "pyexcel"; + version = "0.6.4"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "pPNYnimHhW7SL6X6OLwagZoadTD7IdUSbO7vAqQPQu8="; + }; + + propagatedBuildInputs = [ + lml + pyexcel-io + texttable + ]; + + checkInputs = [ + nose + ]; + + # Tests depend on pyexcel-xls & co. causing circular dependency. + # https://github.com/pyexcel/pyexcel/blob/dev/tests/requirements.txt + doCheck = false; + + pythonImportsCheck = [ "pyexcel" ]; + + checkPhase = "nosetests"; + + meta = { + description = "Single API for reading, manipulating and writing data in csv, ods, xls, xlsx and xlsm files"; + homepage = "http://docs.pyexcel.org/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ jtojnar ]; + }; +} diff --git a/pkgs/development/python-modules/pyfakefs/default.nix b/pkgs/development/python-modules/pyfakefs/default.nix index 14c69fd799a..d38125e26b8 100644 --- a/pkgs/development/python-modules/pyfakefs/default.nix +++ b/pkgs/development/python-modules/pyfakefs/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchPypi, python, pytest, glibcLocales, isPy37 }: buildPythonPackage rec { - version = "4.0.2"; + version = "4.1.0"; pname = "pyfakefs"; src = fetchPypi { inherit pname version; - sha256 = "c415e1c737e3aa72b92af41832a7e0a2c325eb8d3a72a210750714e00fcaeace"; + sha256 = "bbbaa8b622fa50751a5839350fff3c1f8b1bbd364cd40fd0c7442e18fe5edc8e"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pygraphviz/default.nix b/pkgs/development/python-modules/pygraphviz/default.nix index 1a084f8a870..3a451f4af1e 100644 --- a/pkgs/development/python-modules/pygraphviz/default.nix +++ b/pkgs/development/python-modules/pygraphviz/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pygraphviz"; - version = "1.5"; + version = "1.6"; src = fetchPypi { inherit pname version; - sha256 = "179i3mjprhn200gcj6jq7c4mdrzckyqlh1srz78hynnw0nijka2h"; + sha256 = "411ae84a5bc313e3e1523a1cace59159f512336318a510573b47f824edef8860"; extension = "zip"; }; diff --git a/pkgs/development/python-modules/pyhomematic/default.nix b/pkgs/development/python-modules/pyhomematic/default.nix index 14bf1cfe7be..3f12888d531 100644 --- a/pkgs/development/python-modules/pyhomematic/default.nix +++ b/pkgs/development/python-modules/pyhomematic/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyhomematic"; - version = "0.1.67"; + version = "0.1.68"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "2d18e0059367e9e32d6472023322113fce431bcc72187b4a6eb7402fe5d2794b"; + sha256 = "7f8ec68238a441cfe593fa9028509fd0c3dc67400b4dd520c8c02088f177302e"; }; # PyPI tarball does not include tests/ directory diff --git a/pkgs/development/python-modules/pyipp/default.nix b/pkgs/development/python-modules/pyipp/default.nix index cf6b67c548b..98bb6360ce5 100644 --- a/pkgs/development/python-modules/pyipp/default.nix +++ b/pkgs/development/python-modules/pyipp/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "pyipp"; - version = "0.10.1"; + version = "0.11.0"; disabled = isPy27; src = fetchFromGitHub { owner = "ctalkington"; repo = "python-ipp"; rev = version; - sha256 = "0y9mkrx66f4m77jzfgdgmvlqismvimb6hm61j2va7zapm8dyabvr"; + sha256 = "0ar3mkyfa9qi3av3885bvacpwlxh420if9ymdj8i4x06ymzc213d"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pylatexenc/default.nix b/pkgs/development/python-modules/pylatexenc/default.nix index 02a0f875836..6b56a42246f 100644 --- a/pkgs/development/python-modules/pylatexenc/default.nix +++ b/pkgs/development/python-modules/pylatexenc/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "pylatexenc"; - version = "2.4"; + version = "2.7"; src = fetchFromGitHub { owner = "phfaist"; repo = "pylatexenc"; rev = "v${version}"; - sha256 = "0i4frypbv90mjir8bkp03cwkvwhgvc9p3fw6q2jz1dn7fw94v2rv"; + sha256 = "1hpcwbknfah3mky2m4asw15b9qdvv4k5ni0js764n1jpi83m1zgk"; }; pythonImportsCheck = [ "pylatexenc" ]; @@ -26,4 +26,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ drewrisinger ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/pylibftdi/default.nix b/pkgs/development/python-modules/pylibftdi/default.nix index 54058ae1982..c001594d625 100644 --- a/pkgs/development/python-modules/pylibftdi/default.nix +++ b/pkgs/development/python-modules/pylibftdi/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pylibftdi"; - version = "0.18.1"; + version = "0.19.0"; src = fetchPypi { inherit pname version; - sha256 = "17c5h4xz1grynbpffngjflk3dlw2g2zbhkwb7h5v4n9rjdv41l5x"; + sha256 = "bb0ec74df292ef884aa37bf1e98fb9df4d338718e1559eebda363317a792123e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pymatgen/default.nix b/pkgs/development/python-modules/pymatgen/default.nix index 2cd0a0a020f..635d951f56e 100644 --- a/pkgs/development/python-modules/pymatgen/default.nix +++ b/pkgs/development/python-modules/pymatgen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2020.4.29"; + version = "2020.8.13"; src = fetchPypi { inherit pname version; - sha256 = "cf9c89f2c742acf524f3a778cd269164abf582e87ab5f297cd83802fe00c309d"; + sha256 = "23e5885e15195b37ce4c16ef93f474f741cb98451fa8dd4c319ec121f4887256"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/pymc3/default.nix b/pkgs/development/python-modules/pymc3/default.nix index 0c99b501c3f..bda74c5063a 100644 --- a/pkgs/development/python-modules/pymc3/default.nix +++ b/pkgs/development/python-modules/pymc3/default.nix @@ -18,12 +18,12 @@ buildPythonPackage rec { pname = "pymc3"; - version = "3.8"; + version = "3.9.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "1bb2915e4a29877c681ead13932b0b7d276f7f496e9c3f09ba96b977c99caf00"; + sha256 = "abe046f5a5d0e5baee80b7c4bc0a4c218f61b517b62d77be4f89cf4784c27d78"; }; # No need for coverage stats in Nix builds diff --git a/pkgs/development/python-modules/pymongo/default.nix b/pkgs/development/python-modules/pymongo/default.nix index b7da796d3bb..2838362f1db 100644 --- a/pkgs/development/python-modules/pymongo/default.nix +++ b/pkgs/development/python-modules/pymongo/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pymongo"; - version = "3.10.1"; + version = "3.11.0"; src = fetchPypi { inherit pname version; - sha256 = "993257f6ca3cde55332af1f62af3e04ca89ce63c08b56a387cdd46136c72f2fa"; + sha256 = "076a7f2f7c251635cf6116ac8e45eefac77758ee5a77ab7bd2f63999e957613b"; }; # Tests call a running mongodb instance diff --git a/pkgs/development/python-modules/pymupdf/default.nix b/pkgs/development/python-modules/pymupdf/default.nix index a1fbe4b8dc7..53eee6ed186 100644 --- a/pkgs/development/python-modules/pymupdf/default.nix +++ b/pkgs/development/python-modules/pymupdf/default.nix @@ -1,11 +1,11 @@ { stdenv, buildPythonPackage, fetchPypi, mupdf, swig }: buildPythonPackage rec { pname = "PyMuPDF"; - version = "1.17.4"; + version = "1.17.5"; src = fetchPypi { inherit pname version; - sha256 = "e04421ac7e9e892ea482d0bbf8b590ae7a4f82858faa6fd24943b037122971c0"; + sha256 = "ddec02c4dd1c2e0ead4d61cd97b52e725d643602f1f7832b5016190f5c653add"; }; patchPhase = '' diff --git a/pkgs/development/python-modules/pynamodb/default.nix b/pkgs/development/python-modules/pynamodb/default.nix index 7e83976cc4d..53df38b5836 100644 --- a/pkgs/development/python-modules/pynamodb/default.nix +++ b/pkgs/development/python-modules/pynamodb/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pynamodb"; - version = "4.3.2"; + version = "4.3.3"; src = fetchPypi { inherit pname version; - sha256 = "58bd62089741ef689f845d6ca826ab50e39b9a0a8ae3bd7a84dc167c1a4ec8fa"; + sha256 = "ced47c200073dbbfafb10b26931b9c9bf3c6b898f41dffa3676f5c2e2eddc2f0"; }; propagatedBuildInputs = [ python-dateutil botocore ]; diff --git a/pkgs/development/python-modules/pyotp/default.nix b/pkgs/development/python-modules/pyotp/default.nix index c78b7fb1459..1a3d674779b 100644 --- a/pkgs/development/python-modules/pyotp/default.nix +++ b/pkgs/development/python-modules/pyotp/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyotp"; - version = "2.3.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "18d13ikra1iq0xyfqfm72zhgwxi2qi9ps6z1a6zmqp4qrn57wlzw"; + sha256 = "01eceab573181188fe038d001e42777884a7f5367203080ef5bda0e30fe82d28"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/pyphotonfile/default.nix b/pkgs/development/python-modules/pyphotonfile/default.nix index dd8d643f6bb..7a350bd3b13 100644 --- a/pkgs/development/python-modules/pyphotonfile/default.nix +++ b/pkgs/development/python-modules/pyphotonfile/default.nix @@ -11,7 +11,7 @@ buildPythonPackage { pname = "pyphotonfile"; inherit version; propagatedBuildInputs = [ pillow numpy ]; - + src = fetchFromGitHub { owner = "fookatchu"; repo = "pyphotonfile"; diff --git a/pkgs/development/python-modules/pyro-ppl/default.nix b/pkgs/development/python-modules/pyro-ppl/default.nix index 81d4c47652a..c3157c3d301 100644 --- a/pkgs/development/python-modules/pyro-ppl/default.nix +++ b/pkgs/development/python-modules/pyro-ppl/default.nix @@ -1,12 +1,12 @@ { buildPythonPackage, fetchPypi, lib, pytorch, contextlib2 , graphviz, networkx, six, opt-einsum, tqdm }: buildPythonPackage rec { - version = "1.3.1"; + version = "1.4.0"; pname = "pyro-ppl"; src = fetchPypi { inherit version pname; - sha256 = "a034d9311d4715a2e8e127e0a4dd2996cbd34c4b85ac57b02b277c176b0a62ff"; + sha256 = "e863321bee141fb8d20d621aedc5925c472e06c08988447490115f54a31487ad"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pyro5/default.nix b/pkgs/development/python-modules/pyro5/default.nix index bb3c2c895b3..5afce4a37da 100644 --- a/pkgs/development/python-modules/pyro5/default.nix +++ b/pkgs/development/python-modules/pyro5/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "Pyro5"; - version = "5.10"; + version = "5.11"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "e518e2a3375bc04c073f7c8c82509d314b00fa2f65cead9f134ebe42a922b360"; + sha256 = "867cdd291d85560373e0c468da7fd18754f2568ef60e0bc504af42f391d7a3e5"; }; propagatedBuildInputs = [ serpent ]; diff --git a/pkgs/development/python-modules/pyside2/default.nix b/pkgs/development/python-modules/pyside2/default.nix index f9d07be5796..6d8b828fb95 100644 --- a/pkgs/development/python-modules/pyside2/default.nix +++ b/pkgs/development/python-modules/pyside2/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "pyside2"; - version = "5.14.2"; + version = "5.15.0"; src = fetchurl { url = "https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/pyside-setup-opensource-src-${version}.tar.xz"; - sha256 = "1cwjpv8qmjksi7cj4naw54h2afphw44chrf1pmfjamyyj8vz6ykw"; + sha256 = "0s3bgddcsf6w297nyxv08xpc2nnr3sli980p24nf4xivvr9yxkgi"; }; patches = [ diff --git a/pkgs/development/python-modules/pysnow/default.nix b/pkgs/development/python-modules/pysnow/default.nix index ef7fcd20e78..11a670e394b 100644 --- a/pkgs/development/python-modules/pysnow/default.nix +++ b/pkgs/development/python-modules/pysnow/default.nix @@ -6,7 +6,7 @@ , brotli , ijson , nose -, requests_oauthlib +, requests_oauthlib , python_magic , pytz }: @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "pysnow"; version = "0.7.16"; - + src = fetchPypi { inherit pname version; sha256 = "5df61091470e48b5b3a6ea75637f69d3aacae20041487ea457a9a0e3093fba8c"; @@ -22,9 +22,9 @@ buildPythonPackage rec { propagatedBuildInputs = [ brotli - ijson - python_magic - pytz + ijson + python_magic + pytz requests_oauthlib ]; @@ -38,8 +38,7 @@ buildPythonPackage rec { description = "ServiceNow HTTP client library written in Python"; homepage = "https://github.com/rbw/pysnow"; license = licenses.mit; - maintainers = [ maintainers.almac ]; + maintainers = [ maintainers.almac ]; }; } - diff --git a/pkgs/development/python-modules/pyspark/default.nix b/pkgs/development/python-modules/pyspark/default.nix index 8c7e0f64c1f..22b68406082 100644 --- a/pkgs/development/python-modules/pyspark/default.nix +++ b/pkgs/development/python-modules/pyspark/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyspark"; - version = "2.4.6"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "b4b319a3ffd187a3019f654ae1c8ac38048bcec2940f8cecdef829302d166feb"; + sha256 = "8c6e5cc51d91eb8d43e81d0b7093292b5e144ac81445491d5f887d2cf4fe121f"; }; # pypandoc is broken with pandoc2, so we just lose docs. diff --git a/pkgs/development/python-modules/pytest-asyncio/default.nix b/pkgs/development/python-modules/pytest-asyncio/default.nix index c4a9b6fdd1e..8942263a578 100644 --- a/pkgs/development/python-modules/pytest-asyncio/default.nix +++ b/pkgs/development/python-modules/pytest-asyncio/default.nix @@ -1,13 +1,13 @@ { stdenv, buildPythonPackage, fetchPypi, pytest, isPy3k, isPy35, async_generator }: buildPythonPackage rec { pname = "pytest-asyncio"; - version = "0.12.0"; + version = "0.14.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1lpb1q297rly685yl23mni3mmv6vmyx3qsv5ccj1vh8bvkrx4ns7"; + sha256 = "9882c0c6b24429449f5f969a5158b528f39bde47dc32e85b9f0403965017e700"; }; buildInputs = [ pytest ] diff --git a/pkgs/development/python-modules/pytest-bdd/default.nix b/pkgs/development/python-modules/pytest-bdd/default.nix index 29225859dfd..0ad4392bee9 100644 --- a/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/pkgs/development/python-modules/pytest-bdd/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { checkPhase = '' pytest ''; - + meta = with stdenv.lib; { description = "BDD library for the py.test runner"; homepage = "https://github.com/pytest-dev/pytest-bdd"; diff --git a/pkgs/development/python-modules/pytest-cov/default.nix b/pkgs/development/python-modules/pytest-cov/default.nix index 5affa8ae35b..649e41f7d66 100644 --- a/pkgs/development/python-modules/pytest-cov/default.nix +++ b/pkgs/development/python-modules/pytest-cov/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "pytest-cov"; - version = "2.9.0"; + version = "2.10.1"; src = fetchPypi { inherit pname version; - sha256 = "b6a814b8ed6247bd81ff47f038511b57fe1ce7f4cc25b9106f1a4b106f1d9322"; + sha256 = "47bd0ce14056fdd79f93e1713f88fad7bdcc583dcd7783da86ef2f085a0bb88e"; }; buildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytest-doctestplus/default.nix b/pkgs/development/python-modules/pytest-doctestplus/default.nix index 421cca33984..c9c373a2752 100644 --- a/pkgs/development/python-modules/pytest-doctestplus/default.nix +++ b/pkgs/development/python-modules/pytest-doctestplus/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-doctestplus"; - version = "0.7.0"; + version = "0.8.0"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "ed440f43e33191f09aed7bbc4f60db3dfb8f295ab33e04c59302af7eda9e29aa"; + sha256 = "fb083925a17ce636f33997c275f61123e63372c1db11fefac1e991ed25a4ca37"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-forked/default.nix b/pkgs/development/python-modules/pytest-forked/default.nix index 3139e32a0b1..89200f519e7 100644 --- a/pkgs/development/python-modules/pytest-forked/default.nix +++ b/pkgs/development/python-modules/pytest-forked/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pytest-forked"; - version = "1.1.3"; + version = "1.3.0"; src = fetchPypi { inherit pname version; - sha256 = "1805699ed9c9e60cb7a8179b8d4fa2b8898098e82d229b0825d8095f0f261100"; + sha256 = "6aa9ac7e00ad1a539c41bec6d21011332de671e938c7637378ec9710204e37ca"; }; buildInputs = [ pytest setuptools_scm ]; diff --git a/pkgs/development/python-modules/pytest-mock/default.nix b/pkgs/development/python-modules/pytest-mock/default.nix index ff08efc12be..c21175bf338 100644 --- a/pkgs/development/python-modules/pytest-mock/default.nix +++ b/pkgs/development/python-modules/pytest-mock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "pytest-mock"; - version = "3.1.1"; + version = "3.2.0"; src = fetchPypi { inherit pname version; - sha256 = "636e792f7dd9e2c80657e174c04bf7aa92672350090736d82e97e92ce8f68737"; + sha256 = "7122d55505d5ed5a6f3df940ad174b3f606ecae5e9bc379569cdcbd4cd9d2b83"; }; propagatedBuildInputs = lib.optional (!isPy3k) mock; @@ -27,8 +27,9 @@ buildPythonPackage rec { pytest ]; + # ignore test which only works with pytest5 output structure checkPhase = '' - pytest + pytest -k 'not detailed_introspection_async' ''; meta = with lib; { diff --git a/pkgs/development/python-modules/pytest-randomly/default.nix b/pkgs/development/python-modules/pytest-randomly/default.nix new file mode 100644 index 00000000000..c4523ac728c --- /dev/null +++ b/pkgs/development/python-modules/pytest-randomly/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, factory_boy, faker, numpy +, pytest, pytest_xdist +}: + +buildPythonPackage rec { + pname = "pytest-randomly"; + version = "3.4.1"; + + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "0s9cx692cdchfrjqx7fgf9wnm3fdac211a4hjq1cx9qqnbpdpl2z"; + }; + + propagatedBuildInputs = [ numpy factory_boy faker ]; + + checkInputs = [ pytest pytest_xdist ]; + + # test warnings are fixed on an unreleased version: + # https://github.com/pytest-dev/pytest-randomly/pull/281 + checkPhase = "pytest -p no:randomly"; + + meta = with lib; { + description = "Pytest plugin to randomly order tests and control random.seed"; + homepage = "https://github.com/pytest-dev/pytest-randomly"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-services/default.nix b/pkgs/development/python-modules/pytest-services/default.nix index 909b8e80103..93b60ecbe41 100644 --- a/pkgs/development/python-modules/pytest-services/default.nix +++ b/pkgs/development/python-modules/pytest-services/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pytest-services"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0848cead86d3816b9c4e37cecfda31d21a4366f0dca2313ea29f3ca375c6295d"; + sha256 = "0037101eaa17e050542808ecb2e799e9b2b148f1867f62b2296329fdd2034cf5"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pytest-trio/default.nix b/pkgs/development/python-modules/pytest-trio/default.nix index 53bdbdf1f44..923fe14cfac 100644 --- a/pkgs/development/python-modules/pytest-trio/default.nix +++ b/pkgs/development/python-modules/pytest-trio/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, trio, async_generator, hypothesis, outcome, pytest, pytestcov }: +, trio, python, async_generator, hypothesis, outcome, pytest }: buildPythonPackage rec { pname = "pytest-trio"; @@ -22,14 +22,18 @@ buildPythonPackage rec { checkInputs = [ pytest - pytestcov hypothesis ]; + # broken with pytest 5 and 6 + doCheck = false; checkPhase = '' - pytest + rm pytest.ini + PYTHONPATH=$PWD:$PYTHONPATH pytest ''; + pythonImportsCheck = [ "pytest_trio" ]; + meta = with lib; { description = "Pytest plugin for trio"; homepage = "https://github.com/python-trio/pytest-trio"; diff --git a/pkgs/development/python-modules/pytest-xdist/2.nix b/pkgs/development/python-modules/pytest-xdist/2.nix new file mode 100644 index 00000000000..a3d80f94023 --- /dev/null +++ b/pkgs/development/python-modules/pytest-xdist/2.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchPypi, buildPythonPackage, execnet, pytest_6 +, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: + +buildPythonPackage rec { + pname = "pytest-xdist"; + version = "2.0.0"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "3217b1f40290570bf27b1f82714fc4ed44c3260ba9b2f6cde0372378fc707ad3"; + }; + + nativeBuildInputs = [ setuptools_scm pytest_6 ]; + checkInputs = [ pytest_6 filelock ]; + propagatedBuildInputs = [ execnet pytest-forked psutil six ]; + + # pytest6 doesn't allow for new lines + checkPhase = '' + # Excluded tests access file system + export HOME=$TMPDIR + pytest -n $NIX_BUILD_CORES -k "not (distribution_rsyncdirs_example or rsync)" + ''; + + meta = with stdenv.lib; { + description = "py.test xdist plugin for distributed testing and loop-on-failing modes"; + homepage = "https://github.com/pytest-dev/pytest-xdist"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix index d5fc8ce25b1..6dc4b666db5 100644 --- a/pkgs/development/python-modules/pytest-xdist/default.nix +++ b/pkgs/development/python-modules/pytest-xdist/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchPypi, buildPythonPackage, execnet, pytest -, setuptools_scm, pytest-forked, filelock, six, isPy3k }: +, setuptools_scm, pytest-forked, filelock, psutil, six, isPy3k }: buildPythonPackage rec { pname = "pytest-xdist"; - version = "1.32.0"; + version = "1.34.0"; src = fetchPypi { inherit pname version; - sha256 = "1d4166dcac69adb38eeaedb88c8fada8588348258a3492ab49ba9161f2971129"; + sha256 = "1vh4ps32lp5ignch5adbl3pgchvigdfmrl6qpmhxih54wa1qw3il"; }; nativeBuildInputs = [ setuptools_scm pytest ]; checkInputs = [ pytest filelock ]; - propagatedBuildInputs = [ execnet pytest-forked six ]; + propagatedBuildInputs = [ execnet pytest-forked psutil six ]; # Encountered a memory leak # https://github.com/pytest-dev/pytest-xdist/issues/462 diff --git a/pkgs/development/python-modules/pytest/5.nix b/pkgs/development/python-modules/pytest/5.nix new file mode 100644 index 00000000000..2b45c330cf3 --- /dev/null +++ b/pkgs/development/python-modules/pytest/5.nix @@ -0,0 +1,80 @@ +{ stdenv, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, isPyPy +, atomicwrites +, attrs +, funcsigs +, hypothesis +, mock +, more-itertools +, packaging +, pathlib2 +, pluggy +, py +, pygments +, python +, setuptools +, setuptools_scm +, six +, toml +, wcwidth +, writeText +}: + +buildPythonPackage rec { + version = "5.4.3"; + pname = "pytest"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1n67lk8iwlsmfdm8663k8l7isllg1xd3n9p1yla7885szhdk6ybr"; + }; + + checkInputs = [ hypothesis pygments ]; + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ + atomicwrites + attrs + more-itertools + packaging + pluggy + py + setuptools + six + toml + wcwidth + ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + + doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 + + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + + # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 + checkPhase = '' + runHook preCheck + $out/bin/py.test -x testing/ -k "not test_collect_pyargs_with_testpaths" --ignore=testing/test_junitxml.py + runHook postCheck + ''; + + # Remove .pytest_cache when using py.test in a Nix build + setupHook = writeText "pytest-hook" '' + pytestcachePhase() { + find $out -name .pytest_cache -type d -exec rm -rf {} + + } + preDistPhases+=" pytestcachePhase" + ''; + + pythonImportsCheck = [ + "pytest" + ]; + + meta = with stdenv.lib; { + homepage = "https://docs.pytest.org"; + description = "Framework for writing tests"; + maintainers = with maintainers; [ domenkozar lovek323 madjar lsix ]; + license = licenses.mit; + }; +} diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix index daf43961ea6..ce742d65ba2 100644 --- a/pkgs/development/python-modules/pytest/default.nix +++ b/pkgs/development/python-modules/pytest/default.nix @@ -3,6 +3,7 @@ , attrs , funcsigs , hypothesis +, iniconfig , mock , more-itertools , packaging @@ -14,33 +15,45 @@ , setuptools , setuptools_scm , six +, toml , wcwidth , writeText }: buildPythonPackage rec { - version = "5.4.3"; + version = "6.0.1"; pname = "pytest"; disabled = !isPy3k; - preCheck = '' - # don't test bash builtins - rm testing/test_argcomplete.py - ''; - src = fetchPypi { inherit pname version; - sha256 = "7979331bfcba207414f5e1263b5a0f8f521d0f457318836a7355531ed1a4c7d8"; + sha256 = "85228d75db9f45e06e57ef9bf4429267f81ac7c0d742cc9ed63d09886a9fe6f4"; }; checkInputs = [ hypothesis pygments ]; nativeBuildInputs = [ setuptools_scm ]; - propagatedBuildInputs = [ attrs py setuptools six pluggy more-itertools atomicwrites wcwidth packaging ] - ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; + propagatedBuildInputs = [ + atomicwrites + attrs + iniconfig + more-itertools + packaging + pluggy + py + setuptools + six + toml + wcwidth + ] ++ stdenv.lib.optionals (pythonOlder "3.6") [ pathlib2 ]; doCheck = !isPyPy; # https://github.com/pytest-dev/pytest/issues/3460 + preCheck = '' + # don't test bash builtins + rm testing/test_argcomplete.py + ''; + # Ignored file https://github.com/pytest-dev/pytest/pull/5605#issuecomment-522243929 checkPhase = '' runHook preCheck diff --git a/pkgs/development/python-modules/python-gitlab/default.nix b/pkgs/development/python-modules/python-gitlab/default.nix index 0c1f7c67e3d..b543b435fc6 100644 --- a/pkgs/development/python-modules/python-gitlab/default.nix +++ b/pkgs/development/python-modules/python-gitlab/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-gitlab"; - version = "2.2.0"; + version = "2.4.0"; src = fetchPypi { inherit pname version; - sha256 = "4c4ea60c8303f4214522b18038df017cae35afda7474efa0b4e19c2e73bc3ae2"; + sha256 = "e240b5c371d9e98c46c980d878c3f03cd83f3da6cda01d533db27fa3e0dd474f"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/python-markdown-math/default.nix b/pkgs/development/python-modules/python-markdown-math/default.nix index a72e20021df..ea08d7f902c 100644 --- a/pkgs/development/python-modules/python-markdown-math/default.nix +++ b/pkgs/development/python-modules/python-markdown-math/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-markdown-math"; - version = "0.6"; + version = "0.7"; src = fetchPypi { inherit pname version; - sha256 = "c68d8cb9695cb7b435484403dc18941d1bad0ff148e4166d9417046a0d5d3022"; + sha256 = "17a12175e8b2052a1c3402fca410841c551c678046293b1f7c280ccfe7b302a0"; }; checkInputs = [ markdown ]; diff --git a/pkgs/development/python-modules/python-packer/default.nix b/pkgs/development/python-modules/python-packer/default.nix index 04cbaf77247..420efb40039 100644 --- a/pkgs/development/python-modules/python-packer/default.nix +++ b/pkgs/development/python-modules/python-packer/default.nix @@ -16,10 +16,10 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ sh ]; - + # Tests requires network connections doCheck = false; - + meta = with stdenv.lib; { description = "An interface for packer.io"; homepage = "https://github.com/nir0s/python-packer"; @@ -27,4 +27,3 @@ buildPythonPackage rec { maintainers = with maintainers; [ psyanticy ]; }; } - diff --git a/pkgs/development/python-modules/python-ptrace/default.nix b/pkgs/development/python-modules/python-ptrace/default.nix index f116ec556de..5eff4707d4e 100644 --- a/pkgs/development/python-modules/python-ptrace/default.nix +++ b/pkgs/development/python-modules/python-ptrace/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "python-ptrace"; - version = "0.9.5"; + version = "0.9.7"; src = fetchPypi { inherit pname version; - sha256 = "c46287ae611e3041bbd0572221cd1f121100dfc98d1d6c9ad6dd97e35f62501a"; + sha256 = "b998e3436cec975b6907552af6e7f3ff8779097e32d2b905696e5a9feb09e070"; }; # requires distorm, which is optionally diff --git a/pkgs/development/python-modules/python-redis-lock/default.nix b/pkgs/development/python-modules/python-redis-lock/default.nix index f3e58a1a621..2ee21137141 100644 --- a/pkgs/development/python-modules/python-redis-lock/default.nix +++ b/pkgs/development/python-modules/python-redis-lock/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "python-redis-lock"; - version = "3.5.0"; + version = "3.6.0"; src = fetchPypi { inherit pname version; - sha256 = "06f28f63bf4ea3d739ff5c472e76563e24aa5c887002a85cbdb7a5b13aa05897"; + sha256 = "6c79b87f2fefcf47bbcebea56056d324e9d7971c9b98123b79590e08cbb0a8f7"; }; checkInputs = [ pytest process-tests pkgs.redis ]; diff --git a/pkgs/development/python-modules/python-rtmidi/default.nix b/pkgs/development/python-modules/python-rtmidi/default.nix index 34b2c1fd74e..a85d587c21c 100644 --- a/pkgs/development/python-modules/python-rtmidi/default.nix +++ b/pkgs/development/python-modules/python-rtmidi/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "python-rtmidi"; - version = "1.4.2"; + version = "1.4.3"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "3721ed3643f407cd96ad377cff0c2e28f2e8df0abbbe15a8a9668daae0b2b743"; + sha256 = "7f4bbcd77431917503d6ae738093c8419ed67812d50883fa9cfefce1eb21eb3a"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/development/python-modules/python-stdnum/default.nix b/pkgs/development/python-modules/python-stdnum/default.nix index 39153f4a4da..eb912b2bc59 100644 --- a/pkgs/development/python-modules/python-stdnum/default.nix +++ b/pkgs/development/python-modules/python-stdnum/default.nix @@ -1,11 +1,11 @@ { lib, fetchPypi, buildPythonPackage, nose }: buildPythonPackage rec { - version = "1.13"; + version = "1.14"; pname = "python-stdnum"; src = fetchPypi { inherit pname version; - sha256 = "0q4128rjdgavywhzlm2gz2n5ybc9b9sxs81g50dvxf5q7z9q63qj"; + sha256 = "fd3a92b8ec82a159c41dbaa3c5397934d090090c92b04e346412e0fd7e6a1b1c"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/pytools/default.nix b/pkgs/development/python-modules/pytools/default.nix index 965f7f35088..f8f9ef27ff9 100644 --- a/pkgs/development/python-modules/pytools/default.nix +++ b/pkgs/development/python-modules/pytools/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, pythonOlder , decorator , appdirs , six @@ -10,11 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2020.2"; + version = "2020.4"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "3cacefed54148aafb07502c7c907cae8d9327ea35df16e3366c883a706ed5601"; + sha256 = "37db39ff11a1b5fc8aec875ae4ddb3d6c21aa0e95bddc9c841aa98e1631ae460"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/pytorch-lightning/default.nix b/pkgs/development/python-modules/pytorch-lightning/default.nix index 152fa6a92e5..63991752a8a 100644 --- a/pkgs/development/python-modules/pytorch-lightning/default.nix +++ b/pkgs/development/python-modules/pytorch-lightning/default.nix @@ -22,7 +22,7 @@ buildPythonPackage rec { sha256 = "12zhq4pnfcwbgcx7cs99c751gp3w0ysaf5ykv2lv8f4i360w3r5a"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = [ future pytorch pyyaml diff --git a/pkgs/development/python-modules/pytorch/bin.nix b/pkgs/development/python-modules/pytorch/bin.nix new file mode 100644 index 00000000000..b1b662e95b3 --- /dev/null +++ b/pkgs/development/python-modules/pytorch/bin.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildPythonPackage +, fetchurl +, isPy37 +, isPy38 +, python +, nvidia_x11 +, addOpenGLRunpath +, future +, numpy +, patchelf +, pyyaml +, requests +}: + +let + pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion; + platform = if stdenv.isDarwin then "darwin" else "linux"; + srcs = import ./binary-hashes.nix; + unsupported = throw "Unsupported system"; +in buildPythonPackage { + pname = "pytorch"; + # Don't forget to update pytorch to the same version. + version = "1.6.0"; + + format = "wheel"; + + disabled = !(isPy37 || isPy38); + + src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported; + + nativeBuildInputs = [ + addOpenGLRunpath + patchelf + ]; + + propagatedBuildInputs = [ + future + numpy + pyyaml + requests + ]; + + postInstall = '' + # ONNX conversion + rm -rf $out/bin + ''; + + postFixup = let + rpath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc.lib nvidia_x11 ]; + in '' + find $out/${python.sitePackages}/torch/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do + echo "setting rpath for $lib..." + patchelf --set-rpath "${rpath}:$out/${python.sitePackages}/torch/lib" "$lib" + addOpenGLRunpath "$lib" + done + ''; + + pythonImportsCheck = [ "torch" ]; + + meta = with stdenv.lib; { + description = "Open source, prototype-to-production deep learning platform"; + homepage = "https://pytorch.org/"; + license = licenses.unfree; # Includes CUDA and Intel MKL. + platforms = platforms.linux; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch/binary-hashes.nix b/pkgs/development/python-modules/pytorch/binary-hashes.nix new file mode 100644 index 00000000000..481dc6825c7 --- /dev/null +++ b/pkgs/development/python-modules/pytorch/binary-hashes.nix @@ -0,0 +1,10 @@ +{ + x86_64-linux-37 = { + url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp37-cp37m-linux_x86_64.whl"; + sha256 = "0xhwv68j8gvahfzcp43bqp2x71iwv6zjhkw2f1hb82xps40mrml7"; + }; + x86_64-linux-38 = { + url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp38-cp38-linux_x86_64.whl"; + sha256 = "05m2l04wqzw5xvjam6zwvlmc3979cksl3hrdqc2aikrv4hz8fmsk"; + }; +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 0aea3b38b5a..9bdead706d7 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -4,7 +4,7 @@ openMPISupport ? false, openmpi ? null, buildDocs ? false, cudaArchList ? null, - numpy, pyyaml, cffi, click, typing, cmake, oneDNN, hypothesis, numactl, psutil, + numpy, pyyaml, cffi, click, typing, cmake, hypothesis, numactl, psutil, linkFarm, symlinkJoin, # virtual pkg that consistently instantiates blas across nixpkgs @@ -104,8 +104,10 @@ let "LD_LIBRARY_PATH=${cudaStub}\${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH "; in buildPythonPackage rec { - version = "1.6.0"; pname = "pytorch"; + # Don't forget to update pytorch-bin to the same version. + version = "1.6.0"; + disabled = !isPy3k; outputs = [ @@ -159,9 +161,9 @@ in buildPythonPackage rec { USE_MKL = blas.implementation == "mkl"; - # Unlike MKL, MKLDNN is FOSS, so we enable support for it by default. Note - # that this was renamed to dnnl and then renamed again to oneDNN upstream, but - # pytorch still calls it by the old name mkldnn. + # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for + # it by default. PyTorch currently uses its own vendored version + # of oneDNN through Intel iDeep. USE_MKLDNN = mklDnnSupport; USE_MKLDNN_CBLAS = mklDnnSupport; @@ -210,7 +212,7 @@ in buildPythonPackage rec { ninja ] ++ lib.optionals cudaSupport [ cudatoolkit_joined ]; - buildInputs = [ blas blas.provider oneDNN ] + buildInputs = [ blas blas.provider ] ++ lib.optionals cudaSupport [ cudnn magma nccl ] ++ lib.optionals stdenv.isLinux [ numactl ]; diff --git a/pkgs/development/python-modules/pyuavcan/default.nix b/pkgs/development/python-modules/pyuavcan/default.nix index 0c78b305959..ff01ea90e22 100644 --- a/pkgs/development/python-modules/pyuavcan/default.nix +++ b/pkgs/development/python-modules/pyuavcan/default.nix @@ -25,7 +25,7 @@ preBuild = '' export HOME=$TMPDIR export PYTHONASYNCIODEBUG=1 - ''; + ''; # tests fail ATM. doCheck = false; diff --git a/pkgs/development/python-modules/pyudev/default.nix b/pkgs/development/python-modules/pyudev/default.nix index c0a401a1b2a..aabf9cd5de5 100644 --- a/pkgs/development/python-modules/pyudev/default.nix +++ b/pkgs/development/python-modules/pyudev/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { postPatch = '' substituteInPlace src/pyudev/_ctypeslib/utils.py \ - --replace "find_library(name)" "'${systemd.lib}/lib/libudev.so'" + --replace "find_library(name)" "'${lib.getLib systemd}/lib/libudev.so'" ''; checkInputs = [ pytest mock hypothesis docutils ]; diff --git a/pkgs/development/python-modules/pyvcf/default.nix b/pkgs/development/python-modules/pyvcf/default.nix index 26d9d650d57..7c513617754 100644 --- a/pkgs/development/python-modules/pyvcf/default.nix +++ b/pkgs/development/python-modules/pyvcf/default.nix @@ -23,9 +23,9 @@ buildPythonPackage rec { license = licenses.bsd3; maintainers = with maintainers; [ scalavision ]; longDescription = '' - The intent of this module is to mimic the csv module in the Python stdlib, - as opposed to more flexible serialization formats like JSON or YAML. - vcf will attempt to parse the content of each record based on the data + The intent of this module is to mimic the csv module in the Python stdlib, + as opposed to more flexible serialization formats like JSON or YAML. + vcf will attempt to parse the content of each record based on the data types specified in the meta-information lines ''; }; diff --git a/pkgs/development/python-modules/pywbem/default.nix b/pkgs/development/python-modules/pywbem/default.nix index 74626c38eb1..55bd8c8d0a5 100644 --- a/pkgs/development/python-modules/pywbem/default.nix +++ b/pkgs/development/python-modules/pywbem/default.nix @@ -5,14 +5,14 @@ buildPythonPackage rec { pname = "pywbem"; - version = "0.17.4"; + version = "1.0.1"; # Support added in master https://github.com/pywbem/pywbem/commit/b2f2f1a151a30355bbc6652dca69a7b30bfe941e awaiting release disabled = isPy37; src = fetchPypi { inherit pname version; - sha256 = "5b54b65a5434bb16432415743c0d154feee0c6d7a8a2fee208719c67d6d24c97"; + sha256 = "2e738c9eb92591307f4f4d674b1e073bf12192604904e3c4028fde1aa338138c"; }; propagatedBuildInputs = [ @@ -39,7 +39,7 @@ buildPythonPackage rec { # Wants `wbemcli` in PATH rm testsuite/test_wbemcli.py - + # Disables tests that use testfixtures which is currently broken by nonbuilding zope_component rm testsuite/{test_logging,test_recorder,test_wbemconnection_mock}.* ''; diff --git a/pkgs/development/python-modules/pyxdg/default.nix b/pkgs/development/python-modules/pyxdg/default.nix index 65cb4389583..48c95121682 100644 --- a/pkgs/development/python-modules/pyxdg/default.nix +++ b/pkgs/development/python-modules/pyxdg/default.nix @@ -16,8 +16,8 @@ buildPythonPackage rec { # error: invalid command 'test' doCheck = false; - patches = [ - # see: https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/5 + patches = [ + # see: https://gitlab.freedesktop.org/xdg/pyxdg/-/merge_requests/5 (fetchpatch { url = "https://gitlab.freedesktop.org/xdg/pyxdg/-/commit/78405aaa34463db2c6f33ca28ae2293dd3bb1e91.patch"; sha256 = "17cjax546rkqv5kvwczjqjdd6vmlvcxjanz0296dlfq23j2wbx63"; diff --git a/pkgs/development/python-modules/pyzmq/default.nix b/pkgs/development/python-modules/pyzmq/default.nix index 96c100ace88..f23d86eb4b7 100644 --- a/pkgs/development/python-modules/pyzmq/default.nix +++ b/pkgs/development/python-modules/pyzmq/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "pyzmq"; - version = "19.0.1"; + version = "19.0.2"; src = fetchPypi { inherit pname version; - sha256 = "13a5638ab24d628a6ade8f794195e1a1acd573496c3b85af2f1183603b7bf5e0"; + sha256 = "296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438"; }; checkInputs = [ pytest tornado ]; diff --git a/pkgs/development/python-modules/qiskit-aer/default.nix b/pkgs/development/python-modules/qiskit-aer/default.nix index 3f0439efc7a..8e73e942be9 100644 --- a/pkgs/development/python-modules/qiskit-aer/default.nix +++ b/pkgs/development/python-modules/qiskit-aer/default.nix @@ -6,6 +6,9 @@ , cmake , cvxpy , cython +, muparserx +, ninja +, nlohmann_json , numpy , openblas , pybind11 @@ -19,7 +22,7 @@ buildPythonPackage rec { pname = "qiskit-aer"; - version = "0.5.2"; + version = "0.6.1"; disabled = pythonOlder "3.5"; @@ -27,18 +30,20 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aer"; rev = version; - fetchSubmodules = true; # fetch muparserx and other required libraries - sha256 = "0vw6b69h8pvzxhaz3k8sg9ac792gz3kklfv0izs6ra83y1dfwhjz"; + sha256 = "1fnv11diis0as8zcc57mamz0gbjd6vj7nw3arxzvwa77ja803sr4"; }; nativeBuildInputs = [ cmake + ninja scikit-build ]; buildInputs = [ openblas spdlog + nlohmann_json + muparserx ]; propagatedBuildInputs = [ @@ -48,10 +53,10 @@ buildPythonPackage rec { pybind11 ]; - postPatch = '' - # remove dependency on PyPi cmake package, which isn't in Nixpkgs - substituteInPlace setup.py --replace "'cmake!=3.17,!=3.17.0'" "" - ''; + patches = [ + # TODO: remove in favor of qiskit-aer PR #877 patch once accepted/stable + ./remove-conan-install.patch + ]; dontUseCmakeConfigure = true; @@ -60,11 +65,6 @@ buildPythonPackage rec { "-DAER_THRUST_BACKEND=OMP" ]; - # Needed to find qiskit.providers.aer modules in cython. This exists in GitHub, don't know why it isn't copied by default - postFixup = '' - touch $out/${python.sitePackages}/qiskit/__init__.pxd - ''; - # *** Testing *** pythonImportsCheck = [ @@ -77,11 +77,6 @@ buildPythonPackage rec { pytestCheckHook ]; dontUseSetuptoolsCheck = true; # Otherwise runs tests twice - disabledTests = [ - # broken with cvxpy >= 1.1.0, see https://github.com/Qiskit/qiskit-aer/issues/779. - # TODO: Remove once resolved, probably next qiskit-aer version - "test_clifford" - ]; preCheck = '' # Tests include a compiled "circuit" which is auto-built in $HOME @@ -100,11 +95,8 @@ buildPythonPackage rec { description = "High performance simulators for Qiskit"; homepage = "https://qiskit.org/aer"; downloadPage = "https://github.com/QISKit/qiskit-aer/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; - # Doesn't build on aarch64 (libmuparserx issue). - # Can fix by building muparserx from source (https://github.com/beltoforion/muparserx) - # or in future updates (e.g. Raspberry Pi enabled via https://github.com/Qiskit/qiskit-aer/pull/651 & https://github.com/Qiskit/qiskit-aer/pull/660) - platforms = platforms.x86_64; }; } diff --git a/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch b/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch new file mode 100644 index 00000000000..1c5ae87b082 --- /dev/null +++ b/pkgs/development/python-modules/qiskit-aer/remove-conan-install.patch @@ -0,0 +1,63 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index efeacfc..77bd6bd 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -121,7 +121,11 @@ endif() + # Looking for external libraries + # + +-setup_conan() ++find_package(muparserx REQUIRED) ++find_package(nlohmann_json REQUIRED) ++find_package(spdlog REQUIRED) ++# for tests only ++find_package(catch2) + + # If we do not set them with a space CMake fails afterwards if nothing is set for this vars! + set(AER_LINKER_FLAGS " ") +@@ -269,16 +273,16 @@ endif() + set(AER_LIBRARIES + ${AER_LIBRARIES} + ${BLAS_LIBRARIES} +- CONAN_PKG::nlohmann_json ++ nlohmann_json + Threads::Threads +- CONAN_PKG::spdlog ++ spdlog + ${DL_LIB} + ${THRUST_DEPENDANT_LIBS}) + + set(AER_COMPILER_DEFINITIONS ${AER_COMPILER_DEFINITIONS} ${CONAN_DEFINES}) + # Cython build is only enabled if building through scikit-build. + if(SKBUILD) # Terra Addon build +- set(AER_LIBRARIES ${AER_LIBRARIES} CONAN_PKG::muparserx) ++ set(AER_LIBRARIES ${AER_LIBRARIES} muparserx) + add_subdirectory(qiskit/providers/aer/pulse/qutip_extra_lite/cy) + add_subdirectory(qiskit/providers/aer/backends/wrappers) + add_subdirectory(src/open_pulse) +diff --git a/setup.py b/setup.py +index fd71e9f..1561cc4 100644 +--- a/setup.py ++++ b/setup.py +@@ -11,12 +11,6 @@ import inspect + + PACKAGE_NAME = os.getenv('QISKIT_AER_PACKAGE_NAME', 'qiskit-aer') + +-try: +- from conans import client +-except ImportError: +- subprocess.call([sys.executable, '-m', 'pip', 'install', 'conan']) +- from conans import client +- + try: + from skbuild import setup + except ImportError: +@@ -46,8 +40,6 @@ common_requirements = [ + + setup_requirements = common_requirements + [ + 'scikit-build', +- 'cmake!=3.17,!=3.17.0', +- 'conan>=1.22.2' + ] + + requirements = common_requirements + ['qiskit-terra>=0.12.0'] diff --git a/pkgs/development/python-modules/qiskit-aqua/default.nix b/pkgs/development/python-modules/qiskit-aqua/default.nix index fe90ee63e00..c90f9ddf2e2 100644 --- a/pkgs/development/python-modules/qiskit-aqua/default.nix +++ b/pkgs/development/python-modules/qiskit-aqua/default.nix @@ -2,6 +2,7 @@ , pythonOlder , buildPythonPackage , fetchFromGitHub +, fetchpatch # , cplex , cvxpy , dlx @@ -16,6 +17,7 @@ , qiskit-terra , quandl , scikitlearn +, yfinance # Check Inputs , ddt , pytestCheckHook @@ -24,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-aqua"; - version = "0.7.3"; + version = "0.7.5"; disabled = pythonOlder "3.5"; @@ -33,9 +35,18 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-aqua"; rev = version; - sha256 = "04zcnrc0vi6dfjahp1019h2ngdgi7l7jvfs9aw0y306nd9g6qgjc"; + sha256 = "19sdv7lnc4b1c86rd1dv7pjpi8cmrpzbv7nav0fb899ki8ldqdwq"; }; + # TODO: remove in next release + patches = [ + (fetchpatch { + name = "qiskit-aqua-fix-test-issue-1214.patch"; + url = "https://github.com/Qiskit/qiskit-aqua/commit/284a4323192ac85787b22cbe5f344996fae16f7d.patch"; + sha256 = "0zl8hqa2fq9ng793x4dhh0ny67nnbjcd8l1cdsaaab4ca1y0xcfr"; + }) + ]; + # Optional packages: pyscf (see below NOTE) & pytorch. Can install via pip/nix if needed. propagatedBuildInputs = [ # cplex @@ -51,6 +62,7 @@ buildPythonPackage rec { qiskit-ignis quandl scikitlearn + yfinance ]; # *** NOTE *** @@ -105,8 +117,9 @@ buildPythonPackage rec { # Disabled due to missing pyscf "test_validate" # test/chemistry/test_inputparser.py - "test_binary" # in SklearnSVM, seems to have trouble with eigenvectors converging - "test_pauli_expect_single" # fails for unknown reason, 3e-3 out of tolerance + # Online tests + "test_exchangedata" + "test_yahoo" # Disabling slow tests > 10 seconds "TestVQE" @@ -119,7 +132,6 @@ buildPythonPackage rec { "TestQGAN" "test_evaluate_qasm_mode" "test_measurement_error_mitigation_auto_refresh" - "test_exchangedata" "test_wikipedia" "test_shor_factoring_1__15___qasm_simulator____3__5__" "test_readme_sample" @@ -138,11 +150,13 @@ buildPythonPackage rec { "test_oh" "test_confidence_intervals_00001" "test_eoh" + "test_qasm_5" ]; meta = with lib; { description = "An extensible library of quantum computing algorithms"; homepage = "https://github.com/QISKit/qiskit-aqua"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 02cdb8397cb..eaf10fd6082 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "qiskit-ibmq-provider"; - version = "0.7.2"; + version = "0.8.0"; disabled = pythonOlder "3.6"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "11h1ca4v11pajzn1cxqhim1hfziqzj27xzakwln13g8zmiqx3csp"; + sha256 = "0rrpwr4a82j69j5ibl2g0nw8wbpg201cfz6f234k2v6pj500x9nl"; }; propagatedBuildInputs = [ @@ -85,6 +85,7 @@ buildPythonPackage rec { meta = with lib; { description = "Qiskit provider for accessing the quantum devices and simulators at IBMQ"; homepage = "https://github.com/Qiskit/qiskit-ibmq-provider"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/qiskit-ignis/default.nix b/pkgs/development/python-modules/qiskit-ignis/default.nix index bfd2bffbf47..d40afe43f9e 100644 --- a/pkgs/development/python-modules/qiskit-ignis/default.nix +++ b/pkgs/development/python-modules/qiskit-ignis/default.nix @@ -9,14 +9,15 @@ , scikitlearn , scipy # Check Inputs -, ddt , pytestCheckHook +, ddt +, pyfakefs , qiskit-aer }: buildPythonPackage rec { pname = "qiskit-ignis"; - version = "0.3.3"; + version = "0.4.0"; disabled = pythonOlder "3.6"; @@ -25,7 +26,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit-ignis"; rev = version; - sha256 = "0sy9qpw0jqirsk9y61j5kr18jrw1wa812n7y98fjj6w668rrv560"; + sha256 = "07mxhaknkp121xm6mgrpcrbj9qw6j924ra3k0s6vr8qgvfcxvh0y"; }; propagatedBuildInputs = [ @@ -41,18 +42,21 @@ buildPythonPackage rec { dontUseSetuptoolsCheck = true; preCheck = "export HOME=$TMPDIR"; checkInputs = [ - ddt pytestCheckHook + ddt + pyfakefs qiskit-aer ]; - # Test is in test/verification/test_entanglemet.py. test fails due to out-of-date calls & bad logic with this file since qiskit-ignis#328 - # see qiskit-ignis#386 for all issues. Should be able to re-enable in future. - disabledTests = [ "TestEntanglement" ]; + disabledTests = [ + "test_tensored_meas_cal_on_circuit" # Flaky test, occasionally returns result outside bounds + "test_qv_fitter" # execution hangs, ran for several minutes + ]; meta = with lib; { description = "Qiskit tools for quantum hardware verification, noise characterization, and error correction"; homepage = "https://qiskit.org/ignis"; downloadPage = "https://github.com/QISKit/qiskit-ignis/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/qiskit-terra/default.nix b/pkgs/development/python-modules/qiskit-terra/default.nix index c1c0dd92837..aad0370c3d7 100644 --- a/pkgs/development/python-modules/qiskit-terra/default.nix +++ b/pkgs/development/python-modules/qiskit-terra/default.nix @@ -8,12 +8,11 @@ , fastjsonschema , jsonschema , numpy -, marshmallow -, marshmallow-polyfield , networkx , ply , psutil , python-constraint +, python-dateutil , retworkx , scipy , sympy @@ -36,7 +35,7 @@ buildPythonPackage rec { pname = "qiskit-terra"; - version = "0.14.2"; + version = "0.15.1"; disabled = pythonOlder "3.5"; @@ -44,7 +43,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = pname; rev = version; - sha256 = "0p5wapjvy81pnks100xbb23kbs2wyys9ykyc8z4968wl487lq4g5"; + sha256 = "1p7y36gj3675dmp05nwi0m9nc7h0bwyimir3ncf9wbkx3crrh99c"; }; nativeBuildInputs = [ cython ]; @@ -54,13 +53,12 @@ buildPythonPackage rec { fastjsonschema jsonschema numpy - marshmallow - marshmallow-polyfield matplotlib networkx ply psutil python-constraint + python-dateutil retworkx scipy sympy @@ -74,10 +72,6 @@ buildPythonPackage rec { seaborn ]; - postPatch = '' - # Fix relative imports in tests - touch test/python/dagcircuit/__init__.py - ''; # *** Tests *** checkInputs = [ @@ -94,9 +88,6 @@ buildPythonPackage rec { "qiskit.transpiler.passes.routing.cython.stochastic_swap.swap_trial" ]; - disabledTests = [ - "test_random_clifford_valid" # random test, fails at least once when testing locally. - ]; pytestFlagsArray = [ "--ignore=test/randomized/test_transpiler_equivalence.py" # collection requires qiskit-aer, which would cause circular dependency ]; @@ -106,9 +97,9 @@ buildPythonPackage rec { preCheck = '' export PACKAGEDIR=$out/${python.sitePackages} echo "Moving Qiskit test files to package directory" - cp -r $TMP/source/test $PACKAGEDIR - cp -r $TMP/source/examples $PACKAGEDIR - cp -r $TMP/source/qiskit/schemas/examples $PACKAGEDIR/qiskit/schemas/ + cp -r $TMP/$sourceRoot/test $PACKAGEDIR + cp -r $TMP/$sourceRoot/examples $PACKAGEDIR + cp -r $TMP/$sourceRoot/qiskit/schemas/examples $PACKAGEDIR/qiskit/schemas/ # run pytest from Nix's $out path pushd $PACKAGEDIR @@ -127,6 +118,7 @@ buildPythonPackage rec { ''; homepage = "https://qiskit.org/terra"; downloadPage = "https://github.com/QISKit/qiskit-terra/releases"; + changelog = "https://qiskit.org/documentation/release_notes.html"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; }; diff --git a/pkgs/development/python-modules/qiskit/default.nix b/pkgs/development/python-modules/qiskit/default.nix index 81468da30fb..46fcf498597 100644 --- a/pkgs/development/python-modules/qiskit/default.nix +++ b/pkgs/development/python-modules/qiskit/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "qiskit"; # NOTE: This version denotes a specific set of subpackages. See https://qiskit.org/documentation/release_notes.html#version-history - version = "0.19.6"; + version = "0.20.0"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "Qiskit"; repo = "qiskit"; rev = version; - sha256 = "0liby6ffgrla6wr4k742qkg8m80im372p6hmr4gkz47nmc76zy1i"; + sha256 = "1r23pjnql49gczf4k4m6ir5rr95gqdxjrks60p8a93d243mxx3c9"; }; propagatedBuildInputs = [ @@ -36,14 +36,21 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; dontUseSetuptoolsCheck = true; - # following doesn't work b/c they are distributed across different nix sitePackages dirs. Tested with pytest though. - pythonImportsCheck = [ "qiskit" "qiskit.circuit" "qiskit.ignis" "qiskit.providers.aer" "qiskit.aqua" ]; - meta = { + pythonImportsCheck = [ + "qiskit" + "qiskit.aqua" + "qiskit.circuit" + "qiskit.ignis" + "qiskit.providers.aer" + ]; + + meta = with lib; { description = "Software for developing quantum computing programs"; homepage = "https://qiskit.org"; downloadPage = "https://github.com/QISKit/qiskit/releases"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ drewrisinger pandaman ]; + changelog = "https://qiskit.org/documentation/release_notes.html"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger pandaman ]; }; } diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix index ca6a19220d5..a1bf4d53018 100644 --- a/pkgs/development/python-modules/qtconsole/default.nix +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "4.7.5"; + version = "4.7.6"; src = fetchPypi { inherit pname version; - sha256 = "f5cb275d30fc8085e2d1d18bc363e5ba0ce6e559bf37d7d6727b773134298754"; + sha256 = "6c24397c19a49a5cf69582c931db4b0f6b00a78530a2bfd122936f2ebfae2fef"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix index 68ccf676f29..1a97320dc36 100644 --- a/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix +++ b/pkgs/development/python-modules/readthedocs-sphinx-ext/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "readthedocs-sphinx-ext"; - version = "1.0.4"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "33dbb135373d539233f7fbdb5e8dcfa07d41254300ee23719eb9caa8c68a40ae"; + sha256 = "1d8343982cae238da82c809dcbd82d53f9560b50e17b1dd727123f576385139d"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/regex/default.nix b/pkgs/development/python-modules/regex/default.nix index 038d6d2c90a..19cb7bd232b 100644 --- a/pkgs/development/python-modules/regex/default.nix +++ b/pkgs/development/python-modules/regex/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "regex"; - version = "2020.5.14"; + version = "2020.7.14"; src = fetchPypi { inherit pname version; - sha256 = "ce450ffbfec93821ab1fea94779a8440e10cf63819be6e176eb1973a6017aff5"; + sha256 = "3a3af27a8d23143c49a3420efe5b3f8cf1a48c6fc8bc6856b03f638abc1833bb"; }; postCheck = '' diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index a6da936999e..b723cd0b185 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "relatorio"; - version = "0.9.1"; + version = "0.9.2"; src = fetchPypi { inherit pname version; - sha256 = "0an1yiy4pxfazrbaw4sm8ybhxqn46yzsakkl9qjklafn1j69lnza"; + sha256 = "0753e78b235b1e8da275509351257a861cf2cf9fafe1b414f8c1deb858a4f94e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/reportlab/default.nix b/pkgs/development/python-modules/reportlab/default.nix index a7c96ef2e6e..cbd3f54c547 100644 --- a/pkgs/development/python-modules/reportlab/default.nix +++ b/pkgs/development/python-modules/reportlab/default.nix @@ -11,11 +11,11 @@ let ft = freetype.overrideAttrs (oldArgs: { dontDisableStatic = true; }); in buildPythonPackage rec { pname = "reportlab"; - version = "3.5.47"; + version = "3.5.48"; src = fetchPypi { inherit pname version; - sha256 = "0gw0902yjszwxk0air69in7nk4h2q36r96ga3r4bz0p0cnmagcj5"; + sha256 = "0bfe3fe6e1bd1d922f83683eae2ba1d2d29de94e25fb115eacca9530b4b02f76"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index 2cbbee3c9c4..c54657b4bf5 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -2,11 +2,11 @@ with lib; buildPythonPackage rec { pname = "requests-aws4auth"; - version = "0.9"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "0g52a1pm53aqkc9qb5q1m918c1qy6q47c1qz63p5ilynfbs3m5y9"; + sha256 = "2950f6ff686b5a452a269076d990e4821d959b61cfac319c3d3c6daaa5db55ce"; }; postPatch = optionalString isPy3k '' diff --git a/pkgs/development/python-modules/requests/default.nix b/pkgs/development/python-modules/requests/default.nix index 9b443df4be4..9ed590ba19b 100644 --- a/pkgs/development/python-modules/requests/default.nix +++ b/pkgs/development/python-modules/requests/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "requests"; - version = "2.23.0"; + version = "2.24.0"; src = fetchPypi { inherit pname version; - sha256 = "1rhpg0jb08v0gd7f19jjiwlcdnxpmqi1fhvw7r4s9avddi4kvx5k"; + sha256 = "b3559a131db72c33ee969480840fff4bb6dd111de7dd27c8ee1f820f4f00231b"; }; nativeBuildInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/responses/default.nix b/pkgs/development/python-modules/responses/default.nix index 0b24b7b62fc..78daa0e24f3 100644 --- a/pkgs/development/python-modules/responses/default.nix +++ b/pkgs/development/python-modules/responses/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "responses"; - version = "0.10.15"; + version = "0.10.16"; src = fetchPypi { inherit pname version; - sha256 = "7bb697a5fedeb41d81e8b87f152d453d5cab42dcd1691b6a7d6097e94d33f373"; + sha256 = "fa125311607ab3e57d8fcc4da20587f041b4485bdfb06dd6bdf19d8b66f870c1"; }; propagatedBuildInputs = [ cookies mock requests six ]; diff --git a/pkgs/development/python-modules/retworkx/default.nix b/pkgs/development/python-modules/retworkx/default.nix index 309f3532cfc..49e4b1c2fc3 100644 --- a/pkgs/development/python-modules/retworkx/default.nix +++ b/pkgs/development/python-modules/retworkx/default.nix @@ -1,53 +1,60 @@ { lib -, buildPythonPackage -, pythonOlder -, pythonAtLeast +, rustPlatform , python +, fetchpatch , fetchFromGitHub -, fetchPypi +, pipInstallHook +, maturin +, pip # Check inputs , pytestCheckHook +, numpy }: -let - rx-version = "0.3.4"; - wheel-hashes = { - "3.7" = { python = "cp37"; sha256 = "1hfrdj8svkfdraa299gcj18a601l4zn646fkgq7m56brpagssf9l"; }; - "3.8" = { python = "cp38"; sha256 = "0jm10ywaqr0b456pcp01pb7035nawlndfi998jv8p1a2f5xwjgiq"; }; - }; - lookup = set: key: default: if (builtins.hasAttr key set) then (builtins.getAttr key set) else default; - wheel-args = lookup - wheel-hashes - python.pythonVersion - (throw "retworkx python version & hash not included. Override attribute `wheel-args` with version & hash at https://pypi.org/project/retworkx"); +rustPlatform.buildRustPackage rec { + pname = "retworkx"; + version = "0.4.0"; - github-source = fetchFromGitHub { + src = fetchFromGitHub { owner = "Qiskit"; repo = "retworkx"; - rev = rx-version; - sha256 = "0cd3x64y49q9a3jrkiknlfkiccxkxgl624x5pqk7gm34s1lnzl8h"; + rev = version; + sha256 = "1xqp6d39apkjvd0ad9vw81cp2iqzhpagfa4p171xqm3bwfn2imdc"; }; -in -buildPythonPackage rec { - pname = "retworkx"; - version = rx-version; - format = "wheel"; - disabled = pythonOlder "3.5" || pythonAtLeast "3.9"; # compiled versions only included for 3.5 <= py <= 3.8 + cargoSha256 = "0bma0l14jv5qhcsxck7vw3ak1w3c8v84cq4hii86i4iqk523zns5"; + cargoPatches = [ + ( fetchpatch { + name = "retworkx-cargo-lock.patch"; + url = "https://github.com/Qiskit/retworkx/commit/a02fd33d357a92dbe9530696a6d85aa59fe8a5b9.patch"; + sha256 = "0gvxr1nqp9ll4skfks4p4d964pshal25kb1nbfzhpyipnzddizr5"; + } ) + ]; - src = fetchPypi { - inherit pname version format; - inherit (wheel-args) python sha256; - abi = if pythonOlder "3.8" then "${wheel-args.python}m" else wheel-args.python; - platform = "manylinux2010_x86_64"; # i686, aarch64, and ppc64 also available, restricting to x86 for simplicity - }; + propagatedBuildInputs = [ python ]; + + nativeBuildInputs = [ pipInstallHook maturin pip ]; - pythonImportsCheck = [ "retworkx" ]; + # Need to check AFTER python wheel is installed (b/c using Rust Build, not buildPythonPackage) + doCheck = false; + doInstallCheck = true; + + buildPhase = '' + runHook preBuild + maturin build --release --manylinux off --strip --interpreter ${python.interpreter} + runHook postBuild + ''; + + installPhase = '' + install -Dm644 -t dist target/wheels/*.whl + pipInstallPhase + ''; - checkInputs = [ pytestCheckHook ]; + installCheckInputs = [ pytestCheckHook numpy ]; preCheck = '' - pushd $(mktemp -d) - cp -r ${github-source}/$sourceRoot/tests . + export TESTDIR=$(mktemp -d) + cp -r $TMP/$sourceRoot/tests $TESTDIR + pushd $TESTDIR ''; postCheck = "popd"; @@ -55,8 +62,8 @@ buildPythonPackage rec { description = "A python graph library implemented in Rust."; homepage = "https://retworkx.readthedocs.io/en/latest/index.html"; downloadPage = "https://github.com/Qiskit/retworkx/releases"; + changelog = "https://github.com/Qiskit/retworkx/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ drewrisinger ]; - platforms = platforms.x86_64; }; } diff --git a/pkgs/development/python-modules/rhpl/builder.sh b/pkgs/development/python-modules/rhpl/builder.sh index dc93effe802..15e05a73f93 100644 --- a/pkgs/development/python-modules/rhpl/builder.sh +++ b/pkgs/development/python-modules/rhpl/builder.sh @@ -8,6 +8,6 @@ incl=$(echo $python/include/python2.*) sed -i -e "s@/usr/include/\$(PYTHON)@$incl@" \ -e "s@PYTHONLIBDIR = /usr/\$(LIBDIR)/\$(PYTHON)/site-packages@PYTHONLIBDIR = $(toPythonPath $out)@" Makefile.inc sed -i -e "s@/usr/bin/install@install@g" \ - -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile + -e "s@\$(DESTDIR)/usr/share/locale@$out/share/locale@" po/Makefile make PREFIX=$out make PREFIX=$out install diff --git a/pkgs/development/python-modules/ripser/default.nix b/pkgs/development/python-modules/ripser/default.nix index 6bb9eb71773..32d902a0e9c 100644 --- a/pkgs/development/python-modules/ripser/default.nix +++ b/pkgs/development/python-modules/ripser/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.4.1"; + version = "0.5.3"; src = fetchPypi { inherit pname version; - sha256 = "a4015b413c24e3074f82f31771b1eb805e054b8cf444db51ce8ca5afa42cf130"; + sha256 = "cb63a03205511cd3d2aae586cec9515dddfbec3ce269dd0560911b0a55d75632"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/rq/default.nix b/pkgs/development/python-modules/rq/default.nix index 23d8444c506..66ca024b2bb 100644 --- a/pkgs/development/python-modules/rq/default.nix +++ b/pkgs/development/python-modules/rq/default.nix @@ -1,13 +1,15 @@ -{ stdenv, fetchPypi, buildPythonPackage, isPy27, click, redis }: +{ stdenv, fetchFromGitHub, buildPythonPackage, isPy27, click, redis }: buildPythonPackage rec { pname = "rq"; - version = "1.4.3"; + version = "1.5.1"; disabled = isPy27; - src = fetchPypi { - inherit pname version; - sha256 = "60509898c9ebc40e4155fde8bf88a204ed1914cc9e1cde3d19188b1c5bd5efbd"; + src = fetchFromGitHub { + owner = "rq"; + repo = "rq"; + rev = "v${version}"; + sha256 = "0i7yyw828wdvl7ap4gb7jhm4p94502is3xxrgrdgwwp0l1rac004"; }; # test require a running redis rerver, which is something we can't do yet diff --git a/pkgs/development/python-modules/rsa/default.nix b/pkgs/development/python-modules/rsa/default.nix index 41bb4f17a1d..a5380709eda 100644 --- a/pkgs/development/python-modules/rsa/default.nix +++ b/pkgs/development/python-modules/rsa/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "rsa"; - version = "4.1.1"; + version = "4.6"; src = fetchPypi { inherit pname version; - sha256 = "1a7245638fa914ed6196b5e88fa5064cd95c7e65df800ec5d4f288e2b19fb4af"; + sha256 = "109ea5a66744dd859bf16fe904b8d8b627adafb9408753161e766a92e7d681fa"; }; checkInputs = [ unittest2 mock ]; diff --git a/pkgs/development/python-modules/rubymarshal/default.nix b/pkgs/development/python-modules/rubymarshal/default.nix index 4f042dcf90f..9668a26e094 100644 --- a/pkgs/development/python-modules/rubymarshal/default.nix +++ b/pkgs/development/python-modules/rubymarshal/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "rubymarshal"; - version = "1.2.6"; + version = "1.2.7"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0gq344jlb9wkapzpxj7jqwjlc5ccdhhspkw6rfb1d0rammq6hpf6"; + sha256 = "94aa84fa42393f773c8215fab679bd3b72bbdb9f7931643d3672184cde9981d9"; }; propagatedBuildInputs = [ hypothesis ]; diff --git a/pkgs/development/python-modules/sabyenc3/default.nix b/pkgs/development/python-modules/sabyenc3/default.nix new file mode 100644 index 00000000000..05b667fedc1 --- /dev/null +++ b/pkgs/development/python-modules/sabyenc3/default.nix @@ -0,0 +1,22 @@ +{ lib, fetchPypi, python3Packages }: + +python3Packages.buildPythonPackage rec { + pname = "sabyenc3"; + version = "4.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zfj1k4zij8ph8jwkq4d6i6axym8cil16yijxshqla5163d1031z"; + }; + + # tests are not included in pypi distribution + doCheck = false; + + meta = { + description = "yEnc Decoding for Python 3"; + homepage = "https://github.com/sabnzbd/sabyenc/"; + license = lib.licenses.lgpl3; + maintainers = [ lib.maintainers.lovek323 ]; + }; + +} diff --git a/pkgs/development/python-modules/samsungctl/default.nix b/pkgs/development/python-modules/samsungctl/default.nix new file mode 100644 index 00000000000..d29e89db846 --- /dev/null +++ b/pkgs/development/python-modules/samsungctl/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi +, websocket_client +}: + +buildPythonPackage rec { + pname = "samsungctl"; + version = "0.7.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ipz3fd65rqkxlb02sql0awc3vnslrwb2pfrsnpfnf8bfgxpbh9g"; + }; + + propagatedBuildInputs = [ + websocket_client + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "samsungctl" ]; + + meta = with lib; { + description = "Remote control Samsung televisions via a TCP/IP connection"; + homepage = "https://github.com/Ape/samsungctl"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/samsungtvws/default.nix b/pkgs/development/python-modules/samsungtvws/default.nix new file mode 100644 index 00000000000..b41935c5825 --- /dev/null +++ b/pkgs/development/python-modules/samsungtvws/default.nix @@ -0,0 +1,36 @@ +{ lib, buildPythonPackage, fetchPypi, isPy27 +, requests +, websocket_client +}: + +buildPythonPackage rec { + pname = "samsungtvws"; + version = "1.5.3"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "054rr8hiacdjfxqssnxnd3xp9hh8350zjzzjvh1199bpps4l1l6n"; + }; + + patchPhase = '' + substituteInPlace setup.py --replace "websocket-client==" "websocket-client>=" + ''; + + propagatedBuildInputs = [ + websocket_client + requests + ]; + + # no tests + doCheck = false; + + pythonImportsCheck = [ "samsungtvws" ]; + + meta = with lib; { + description = "Samsung Smart TV WS API wrapper"; + homepage = "https://github.com/xchwarze/samsung-tv-ws-api"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} diff --git a/pkgs/development/python-modules/sanic-auth/default.nix b/pkgs/development/python-modules/sanic-auth/default.nix index 498e9cb34b1..4642b69f7d2 100644 --- a/pkgs/development/python-modules/sanic-auth/default.nix +++ b/pkgs/development/python-modules/sanic-auth/default.nix @@ -3,20 +3,20 @@ buildPythonPackage rec { pname = "Sanic-Auth"; version = "0.2.0"; - + src = fetchPypi { inherit pname version; sha256 = "b7cb9e93296c035ada0aa1ebfb33f9f7b62f7774c519e374b7fe703ff73589cb"; }; - + propagatedBuildInputs = [ sanic ]; - + checkInputs = [ pytest ]; - + checkPhase = '' pytest tests ''; - + meta = with lib; { description = "Simple Authentication for Sanic"; homepage = "https://github.com/pyx/sanic-auth/"; diff --git a/pkgs/development/python-modules/sapi-python-client/default.nix b/pkgs/development/python-modules/sapi-python-client/default.nix index 155950dff2c..847acb3c9cd 100644 --- a/pkgs/development/python-modules/sapi-python-client/default.nix +++ b/pkgs/development/python-modules/sapi-python-client/default.nix @@ -1,8 +1,8 @@ -{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: +{ stdenv, git, setuptools, setuptools_scm, fetchFromGitHub, requests, boto3, buildPythonPackage, responses }: -buildPythonPackage rec { - pname = "sapi-python-client"; - version = "0.1.3"; +buildPythonPackage rec { + pname = "sapi-python-client"; + version = "0.1.3"; src = fetchFromGitHub { owner = "keboola"; @@ -17,15 +17,14 @@ buildPythonPackage rec { doCheck = false; # requires API token and an active keboola bucket - nativeBuildInputs = [ git setuptools_scm ]; + nativeBuildInputs = [ git setuptools_scm ]; - propagatedBuildInputs = [ setuptools requests boto3 responses ]; + propagatedBuildInputs = [ setuptools requests boto3 responses ]; - meta = with stdenv.lib; { - description = "Keboola Connection Storage API client"; - homepage = "https://github.com/keboola/sapi-python-client"; + meta = with stdenv.lib; { + description = "Keboola Connection Storage API client"; + homepage = "https://github.com/keboola/sapi-python-client"; maintainers = with maintainers; [ mrmebelman ]; - license = licenses.mit; - }; + license = licenses.mit; + }; } - diff --git a/pkgs/development/python-modules/schema/default.nix b/pkgs/development/python-modules/schema/default.nix index 2214bc2da52..8dd89480074 100644 --- a/pkgs/development/python-modules/schema/default.nix +++ b/pkgs/development/python-modules/schema/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "schema"; - version = "0.7.2"; + version = "0.7.3"; src = fetchPypi { inherit pname version; - sha256 = "b536f2375b49fdf56f36279addae98bd86a8afbd58b3c32ce363c464bed5fc1c"; + sha256 = "4cf529318cfd1e844ecbe02f41f7e5aa027463e7403666a52746f31f04f47a5e"; }; preConfigure = '' diff --git a/pkgs/development/python-modules/scikitlearn/default.nix b/pkgs/development/python-modules/scikitlearn/default.nix index a9bbad04ea7..cffd29f09d3 100644 --- a/pkgs/development/python-modules/scikitlearn/default.nix +++ b/pkgs/development/python-modules/scikitlearn/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "scikit-learn"; - version = "0.23.1"; + version = "0.23.2"; # UnboundLocalError: local variable 'message' referenced before assignment disabled = stdenv.isi686; # https://github.com/scikit-learn/scikit-learn/issues/5534 src = fetchPypi { inherit pname version; - sha256 = "e3fec1c8831f8f93ad85581ca29ca1bb88e2da377fb097cf8322aa89c21bc9b8"; + sha256 = "20766f515e6cd6f954554387dfae705d93c7b544ec0e6c6a5d8e006f6f7ef480"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/scour/default.nix b/pkgs/development/python-modules/scour/default.nix index 67eac729644..4f1f3929386 100644 --- a/pkgs/development/python-modules/scour/default.nix +++ b/pkgs/development/python-modules/scour/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scour"; - version = "0.37"; + version = "0.38"; src = fetchPypi { inherit pname version; - sha256 = "05k1f8i8v7sp5v39lian865vwvapq05a6vmvk7fwnxv8kivi6ccn"; + sha256 = "cf50a13dcdf8cfe1861f0ce334f413604e376a7681c5b181e15322f43c3befcd"; }; propagatedBuildInputs = [ six ]; diff --git a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix index 26e142434c5..d3bf05b0965 100644 --- a/pkgs/development/python-modules/scrapy-fake-useragent/default.nix +++ b/pkgs/development/python-modules/scrapy-fake-useragent/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "scrapy-fake-useragent"; - version = "1.2.0"; + version = "1.4.4"; src = fetchPypi { inherit pname version; - sha256 = "02mayk804vdl15wjpx7jcjkc4zgrra4izf6iv00mcxq4fd4ck03l"; + sha256 = "3b17e982e646918dc25080da0672812d07bfb7a92a58377c014c74e0182c665e"; }; propagatedBuildInputs = [ fake-useragent ]; diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 3018cabd025..8aa61748af8 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -19,18 +19,22 @@ , urllib3 , trytond , werkzeug +, executing +, pure-eval +, asttokens }: buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.14.4"; + version = "0.16.5"; src = fetchPypi { inherit pname version; - sha256 = "0e5e947d0f7a969314aa23669a94a9712be5a688ff069ff7b9fc36c66adc160c"; + sha256 = "e12eb1c2c01cd9e9cfe70608dbda4ef451f37ef0b7cbb92e5d43f87c341d6334"; }; - checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond ] + checkInputs = [ django flask tornado bottle rq falcon sqlalchemy werkzeug trytond + executing pure-eval asttokens ] ++ stdenv.lib.optionals isPy3k [ celery pyramid sanic aiohttp ]; propagatedBuildInputs = [ urllib3 certifi ]; diff --git a/pkgs/development/python-modules/smart_open/default.nix b/pkgs/development/python-modules/smart_open/default.nix index c3cac404d10..ea283f3a1ba 100644 --- a/pkgs/development/python-modules/smart_open/default.nix +++ b/pkgs/development/python-modules/smart_open/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "smart_open"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "555962abf982faff8a8aeb65e0695474e3091f604826055782beffa8400e4e4e"; + sha256 = "c8792d2e77f33b349fbaa62eb28ddc519e6b7e5d36407e9bdc00bececeaa776d"; }; # nixpkgs version of moto is >=1.2.0, remove version pin to fix build diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index 08b4f249709..ae280eb96cc 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -25,12 +25,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.2.9"; + version = "2.2.10"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c880f86514008555afa62562def1e975f23c61ff4b3fc1991932ed692ac61a6d"; + sha256 = "0beba8eb9c1dec2782d52491d058256e1f5d9e010114a80ff3b8e3905be655fd"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/solo-python/default.nix b/pkgs/development/python-modules/solo-python/default.nix index 1b1896187f9..0ce6e338e61 100644 --- a/pkgs/development/python-modules/solo-python/default.nix +++ b/pkgs/development/python-modules/solo-python/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "solo-python"; - version = "0.0.23"; + version = "0.0.26"; format = "flit"; disabled = pythonOlder "3.6"; # only python>=3.6 is supported @@ -11,7 +11,7 @@ owner = "solokeys"; repo = pname; rev = version; - sha256 = "0r9cq0sd8pqnavgwa5cqgdxzbgly2baq8fpclnnz6anb2974kg3f"; + sha256 = "05rwqrhr1as6zqhg63d6wga7l42jm2azbav5w6ih8mx5zbxf61yz"; }; # replaced pinned fido, with unrestricted fido version diff --git a/pkgs/development/python-modules/sopel/default.nix b/pkgs/development/python-modules/sopel/default.nix index 61a0414a998..0c4c3f9b7b2 100644 --- a/pkgs/development/python-modules/sopel/default.nix +++ b/pkgs/development/python-modules/sopel/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0f0aixwjh5nax0hzar4993rg9yn1x23rksz5jl5gj8g2jyblsfay"; + sha256 = "5e394d9797e221f90a95e5eb9987e8c1faf4f2488964f521e8ca1628798f0a38"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sortedcontainers/default.nix b/pkgs/development/python-modules/sortedcontainers/default.nix index c5ae45b8500..9df3d809f2c 100644 --- a/pkgs/development/python-modules/sortedcontainers/default.nix +++ b/pkgs/development/python-modules/sortedcontainers/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "sortedcontainers"; - version = "2.1.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "974e9a32f56b17c1bac2aebd9dcf197f3eb9cd30553c5852a3187ad162e1a03a"; + sha256 = "4e73a757831fc3ca4de2859c422564239a31d8213d09a2a666e375807034d2ba"; }; # pypi tarball does not come with tests diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index 2044e379937..37b9c24a22e 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.15.1"; + version = "1.16.0"; src = fetchPypi { inherit pname version; - sha256 = "0c1nbpd5wy361xga8lw36xwc9yyz7rylsjr0z7aw7bn3s35bnkbx"; + sha256 = "94d056e48e7e6fe2e6fe4161471e774ac03221a6225fd83d551d3184220c1edf"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix index c0efaec4be3..0dc7297be69 100644 --- a/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinxcontrib-spelling"; - version = "5.1.2"; + version = "5.2.2"; src = fetchPypi { inherit pname version; - sha256 = "7f220647f1d9270bd90f0a42146b75a03c51a60184ced6584a9e5ef8f385b5a1"; + sha256 = "c8250ff02e6033c3aeabc41e91dc185168fecefb0c5722aaa3e2055a829e1e4c"; }; propagatedBuildInputs = [ sphinx pyenchant pbr ]; diff --git a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix index 1ca4db40263..45027ba15c4 100644 --- a/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-websupport/default.nix @@ -1,19 +1,20 @@ { lib , buildPythonPackage , fetchPypi +, sphinxcontrib-serializinghtml , six }: buildPythonPackage rec { pname = "sphinxcontrib-websupport"; - version = "1.2.3"; + version = "1.2.4"; src = fetchPypi { inherit pname version; - sha256 = "ee1d43e6e0332558a66fcb4005b9ba7313ad9764d0df0e6703ae869a028e451f"; + sha256 = "4edf0223a0685a7c485ae5a156b6f529ba1ee481a1417817935b20bde1956232"; }; - propagatedBuildInputs = [ six ]; + propagatedBuildInputs = [ six sphinxcontrib-serializinghtml ]; doCheck = false; diff --git a/pkgs/development/python-modules/splinter/default.nix b/pkgs/development/python-modules/splinter/default.nix index 1ff38f0a6df..fde5733a864 100644 --- a/pkgs/development/python-modules/splinter/default.nix +++ b/pkgs/development/python-modules/splinter/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "splinter"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; - sha256 = "9e92535f273622507ac157612c3bb0e9cee7b5ccd2aa097d47b408e34c2ca356"; + sha256 = "459e39e7a9f7572db6f1cdb5fdc5ccfc6404f021dccb969ee6287be2386a40db"; }; propagatedBuildInputs = [ selenium ]; diff --git a/pkgs/development/python-modules/spotipy/default.nix b/pkgs/development/python-modules/spotipy/default.nix index fb1c8474695..47b12a3565d 100644 --- a/pkgs/development/python-modules/spotipy/default.nix +++ b/pkgs/development/python-modules/spotipy/default.nix @@ -1,15 +1,23 @@ -{ stdenv, buildPythonPackage, fetchPypi, requests }: +{ stdenv, buildPythonPackage, fetchPypi, requests, six, mock }: buildPythonPackage rec { pname = "spotipy"; - version = "2.12.0"; + version = "2.13.0"; src = fetchPypi { inherit pname version; - sha256 = "f3a08edd516ffaf0731d40fdb7943445fe7b1b412700d042cbd168a726685222"; + sha256 = "d1a85b8831ed60d2290ab9bbba289c548fb9680889757252c02dab2f2327d865"; }; - propagatedBuildInputs = [ requests ]; + propagatedBuildInputs = [ requests six ]; + checkInputs = [ mock ]; + + preConfigure = '' + substituteInPlace setup.py \ + --replace "mock==2.0.0" "mock" + ''; + + pythonImportsCheck = [ "spotipy" ]; meta = with stdenv.lib; { homepage = "https://spotipy.readthedocs.org/"; diff --git a/pkgs/development/python-modules/spyder-kernels/0.x.nix b/pkgs/development/python-modules/spyder-kernels/0.x.nix index c4a61520333..63ed0604fe5 100644 --- a/pkgs/development/python-modules/spyder-kernels/0.x.nix +++ b/pkgs/development/python-modules/spyder-kernels/0.x.nix @@ -1,4 +1,4 @@ -{ +{ lib , buildPythonPackage , fetchFromGitHub @@ -6,7 +6,7 @@ , ipykernel , wurlitzer , jupyter_client - , pyzmq + , pyzmq , numpy , pandas , scipy diff --git a/pkgs/development/python-modules/spyder/3.nix b/pkgs/development/python-modules/spyder/3.nix index e5c5683f5dc..cac20ad6fce 100644 --- a/pkgs/development/python-modules/spyder/3.nix +++ b/pkgs/development/python-modules/spyder/3.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc + jedi pycodestyle psutil pyflakes rope pylint keyring numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle spyder-kernels_0_5 pygments qtpy pyzmq chardet pyqtwebengine ]; diff --git a/pkgs/development/python-modules/sqlalchemy-citext/default.nix b/pkgs/development/python-modules/sqlalchemy-citext/default.nix index 300941e2617..5011ef7efb9 100644 --- a/pkgs/development/python-modules/sqlalchemy-citext/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-citext/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlalchemy-citext"; - version = "1.6.3"; + version = "1.7.0"; src = fetchPypi { inherit pname version; - sha256 = "1d66e7d49826fec28a9ce69053fdf82d3a5ff397968c5bf38a0d83dcb4bf2303"; + sha256 = "69ba00f5505f92a1455a94eefc6d3fcf72dda3691ab5398a0b4d0d8d85bd6aab"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/sqlitedict/default.nix b/pkgs/development/python-modules/sqlitedict/default.nix index 5037aa2c368..1c28d6a0976 100644 --- a/pkgs/development/python-modules/sqlitedict/default.nix +++ b/pkgs/development/python-modules/sqlitedict/default.nix @@ -3,20 +3,20 @@ buildPythonPackage rec { pname = "sqlitedict"; version = "1.6.0"; - + src = fetchFromGitHub { owner = "RaRe-Technologies"; repo = "sqlitedict"; rev = version; sha256 = "1yq94lgpny9qcfbsl39npjvrsjfggi3lj2kpzcsxcfdfgxag6m2m"; }; - + checkInputs = [ pytest ]; - + checkPhase = '' pytest tests ''; - + meta = with lib; { description = "Persistent, thread-safe dict"; homepage = "https://github.com/RaRe-Technologies/sqlitedict"; diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix index 8ccfaca1793..f2decd2c0dd 100644 --- a/pkgs/development/python-modules/sqlmap/default.nix +++ b/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.4.7"; + version = "1.4.8"; src = fetchPypi { inherit pname version; - sha256 = "0096vrdnax467vl0xl4m0z9pqddl9dhvk6gyryx6gvaslrvn2j26"; + sha256 = "af789cc2d9b7cab2f71087967867b3587db9636b38bef1ffb39165a0675a6d87"; }; postPatch = '' diff --git a/pkgs/development/python-modules/stevedore/default.nix b/pkgs/development/python-modules/stevedore/default.nix index 51edec4dc89..2c09017d05b 100644 --- a/pkgs/development/python-modules/stevedore/default.nix +++ b/pkgs/development/python-modules/stevedore/default.nix @@ -1,20 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pbr, setuptools, six }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +, importlib-metadata +, pbr +, setuptools +, six +}: buildPythonPackage rec { pname = "stevedore"; - version = "2.0.1"; + version = "3.2.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "609912b87df5ad338ff8e44d13eaad4f4170a65b79ae9cb0aa5632598994a1b7"; + sha256 = "1r8m8g7f13wdmfw5m7k0vj7bcx3psfg5yg2i8jlb08nrpsjily9q"; }; - doCheck = false; + propagatedBuildInputs = [ pbr setuptools six ] + ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ]; - propagatedBuildInputs = [ pbr setuptools six ]; + doCheck = false; + pythonImportsCheck = [ "stevedore" ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Manage dynamic plugins for Python applications"; homepage = "https://pypi.python.org/pypi/stevedore"; license = licenses.asl20; diff --git a/pkgs/development/python-modules/streamz/default.nix b/pkgs/development/python-modules/streamz/default.nix index 88feccc86c0..420ee7b2472 100644 --- a/pkgs/development/python-modules/streamz/default.nix +++ b/pkgs/development/python-modules/streamz/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0r83z3233pfwjw31bkmdldjqlx533f27iimayadfgcn5jr3xwykq"; + sha256 = "787ade4796c5b2e79af2aac678841ba3748a65a3adce150697dcdd31c4f80365"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/strictyaml/default.nix b/pkgs/development/python-modules/strictyaml/default.nix index e2d8e12fd45..44345a9aa50 100644 --- a/pkgs/development/python-modules/strictyaml/default.nix +++ b/pkgs/development/python-modules/strictyaml/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1jj20fwcpvqzp7rnzk3mc3xm94wz3gy3zi3787nj7c3syzadn1vb"; + sha256 = "6b07dbd4f77ab023ed4167c43ffc1b9f9354fb6075cc6ff3b91fefcbb80342ca"; }; propagatedBuildInputs = [ ruamel_yaml python-dateutil ]; diff --git a/pkgs/development/python-modules/stripe/default.nix b/pkgs/development/python-modules/stripe/default.nix index ea48474045a..c2f170fc697 100644 --- a/pkgs/development/python-modules/stripe/default.nix +++ b/pkgs/development/python-modules/stripe/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "stripe"; - version = "2.49.0"; + version = "2.50.0"; # Tests require network connectivity and there's no easy way to disable # them. ~ C. @@ -10,7 +10,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "10dgll0x709n91p8m9qmifsdhx2sc2920xxhqzd335l4z20iwcw9"; + sha256 = "0c3c02c9b65644502a701d4ff939964799bd1a581fb3f8bf75a3f8675527ef48"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/suseapi/default.nix b/pkgs/development/python-modules/suseapi/default.nix index 0e9f4f43656..1c36f45090b 100644 --- a/pkgs/development/python-modules/suseapi/default.nix +++ b/pkgs/development/python-modules/suseapi/default.nix @@ -36,4 +36,4 @@ buildPythonPackage rec { description = "Python module to work with various SUSE services"; license = lib.licenses.gpl3Plus; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/sybil/default.nix b/pkgs/development/python-modules/sybil/default.nix index 630a6600199..a6f604dea03 100644 --- a/pkgs/development/python-modules/sybil/default.nix +++ b/pkgs/development/python-modules/sybil/default.nix @@ -7,11 +7,11 @@ buildPythonApplication rec { pname = "sybil"; - version = "1.3.1"; + version = "1.4.0"; src = fetchPypi { inherit pname version; - sha256 = "54dfac7b3c043dbf484b832512ad2103089f347b5b12307c63ffb4c287742382"; + sha256 = "fc46117619f2f704d1d1b02634fa3285f40479a3008172763b9998fe964f4d11"; }; checkInputs = [ pytest nose ]; diff --git a/pkgs/development/python-modules/sympy/default.nix b/pkgs/development/python-modules/sympy/default.nix index 4e8f9ca857b..52e2bb5af12 100644 --- a/pkgs/development/python-modules/sympy/default.nix +++ b/pkgs/development/python-modules/sympy/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sympy"; - version = "1.6.1"; # Upgrades may break sage. Please test or ping @timokau. + version = "1.6.2"; # Upgrades may break sage. Please test or ping @timokau. src = fetchPypi { inherit pname version; - sha256 = "7386dba4f7e162e90766b5ea7cab5938c2fe3c620b310518c8ff504b283cb15b"; + sha256 = "1cfadcc80506e4b793f5b088558ca1fcbeaec24cd6fc86f1fdccaa3ee1d48708"; }; checkInputs = [ glibcLocales ]; diff --git a/pkgs/development/python-modules/tasklib/default.nix b/pkgs/development/python-modules/tasklib/default.nix index a49ba37e91a..1f204aecf14 100644 --- a/pkgs/development/python-modules/tasklib/default.nix +++ b/pkgs/development/python-modules/tasklib/default.nix @@ -8,11 +8,11 @@ wsl_stub = writeShellScriptBin "wsl" "true"; in buildPythonPackage rec { pname = "tasklib"; - version = "2.1.1"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "e2cfe5073b9d30c564e6c547fdb0f45eb66da5d4d138c20fb87d549315892f2c"; + sha256 = "da66e84614b09443aa67c4dc2922213417329c39511dc5b384d8a5671e29115e"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tblib/default.nix b/pkgs/development/python-modules/tblib/default.nix index 86d1cdc8873..86992e6e16a 100644 --- a/pkgs/development/python-modules/tblib/default.nix +++ b/pkgs/development/python-modules/tblib/default.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0b48bx1h720rmmd9nmw50y5cq9vhdppnl0bn9yfl2yza0rrxg6q5"; + sha256 = "059bd77306ea7b419d4f76016aef6d7027cc8a0785579b5aad198803435f882c"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch b/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch deleted file mode 100644 index f807a6d2515..00000000000 --- a/pkgs/development/python-modules/tempora/0001-pytest-remove-flake8-black-coverage.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9dfd2a8fac4a643fd007390762ccc8564588b4bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> -Date: Thu, 25 Jun 2020 10:16:52 +0100 -Subject: [PATCH] pytest: remove flake8/black/coverage -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Thalheim <joerg@thalheim.io> ---- - pytest.ini | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/pytest.ini b/pytest.ini -index bd6998d..a464529 100644 ---- a/pytest.ini -+++ b/pytest.ini -@@ -1,6 +1,6 @@ - [pytest] - norecursedirs=dist build .tox .eggs --addopts=--doctest-modules --flake8 --black --cov -+addopts=--doctest-modules - doctest_optionflags=ALLOW_UNICODE ELLIPSIS - filterwarnings= - # suppress known warning --- -2.27.0 - diff --git a/pkgs/development/python-modules/tempora/default.nix b/pkgs/development/python-modules/tempora/default.nix index d4139ce7621..238b250136c 100644 --- a/pkgs/development/python-modules/tempora/default.nix +++ b/pkgs/development/python-modules/tempora/default.nix @@ -1,28 +1,27 @@ { lib, buildPythonPackage, fetchPypi , setuptools_scm, pytest, pytest-freezegun, freezegun, backports_unittest-mock -, six, pytz, jaraco_functools, pythonOlder }: +, six, pytz, jaraco_functools, pythonOlder +, pytest-flake8, pytestcov, pytest-black, pytest-mypy +}: buildPythonPackage rec { pname = "tempora"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e370d822cf48f5356aab0734ea45807250f5120e291c76712a1d766b49ae34f8"; + sha256 = "599a3a910b377f2b544c7b221582ecf4cb049b017c994b37f2b1a9ed1099716e"; }; disabled = pythonOlder "3.2"; nativeBuildInputs = [ setuptools_scm ]; - patches = [ - ./0001-pytest-remove-flake8-black-coverage.patch - ]; - propagatedBuildInputs = [ six pytz jaraco_functools ]; checkInputs = [ pytest-freezegun pytest freezegun backports_unittest-mock + pytest-flake8 pytestcov pytest-black pytest-mypy ]; checkPhase = '' diff --git a/pkgs/development/python-modules/tensorflow/1/default.nix b/pkgs/development/python-modules/tensorflow/1/default.nix index 4dc5c57070d..5f65004b3d6 100644 --- a/pkgs/development/python-modules/tensorflow/1/default.nix +++ b/pkgs/development/python-modules/tensorflow/1/default.nix @@ -23,9 +23,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] -, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] -, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, sse42Support ? stdenv.hostPlatform.sse4_2Support +, avx2Support ? stdenv.hostPlatform.avx2Support +, fmaSupport ? stdenv.hostPlatform.fmaSupport # Darwin deps , Foundation, Security }: diff --git a/pkgs/development/python-modules/tensorflow/2/default.nix b/pkgs/development/python-modules/tensorflow/2/default.nix index 4dd378d1410..eedd6e6d0df 100644 --- a/pkgs/development/python-modules/tensorflow/2/default.nix +++ b/pkgs/development/python-modules/tensorflow/2/default.nix @@ -23,9 +23,9 @@ , xlaSupport ? cudaSupport # Default from ./configure script , cudaCapabilities ? [ "3.5" "5.2" ] -, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"] -, avx2Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] -, fmaSupport ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [ "haswell" "broadwell" "skylake" "skylake-avx512"] +, sse42Support ? stdenv.hostPlatform.sse4_2Support +, avx2Support ? stdenv.hostPlatform.avx2Support +, fmaSupport ? stdenv.hostPlatform.fmaSupport # Darwin deps , Foundation, Security }: diff --git a/pkgs/development/python-modules/test-tube/default.nix b/pkgs/development/python-modules/test-tube/default.nix new file mode 100644 index 00000000000..f0c26292c84 --- /dev/null +++ b/pkgs/development/python-modules/test-tube/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, pytestCheckHook +, future +, imageio +, numpy +, pandas +, pytorch +, tensorflow-tensorboard +}: + +buildPythonPackage rec { + pname = "test-tube"; + version = "0.7.5"; + + disabled = isPy27; + + src = fetchFromGitHub { + owner = "williamFalcon"; + repo = pname; + rev = version; + sha256 = "0zpvlp1ybp2dhgap8jsalpfdyg8ycjhlfi3xrdf5dqffqvh2yhp2"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + propagatedBuildInputs = [ + future + imageio + numpy + pandas + pytorch + tensorflow-tensorboard + ]; + + meta = with lib; { + homepage = "https://github.com/williamFalcon/test-tube"; + description = "Framework-agnostic library to track and parallelize hyperparameter search in machine learning experiments"; + license = licenses.mit; + maintainers = [ maintainers.tbenst ]; + }; +} diff --git a/pkgs/development/python-modules/tifffile/default.nix b/pkgs/development/python-modules/tifffile/default.nix index 6317f12e8a8..d1be6f80be9 100644 --- a/pkgs/development/python-modules/tifffile/default.nix +++ b/pkgs/development/python-modules/tifffile/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "tifffile"; - version = "2020.6.3"; + version = "2020.8.13"; src = fetchPypi { inherit pname version; - sha256 = "e79403a8b98b0df7ade8d43469151b959fd56239001471fac62beabca6f56377"; + sha256 = "60043e50adab5a1b9f13c3fb1a23992b9af00e1ada13d7ffe48c1ad7e0062cb8"; }; patches = lib.optional isPy27 ./python2-regex-compat.patch; diff --git a/pkgs/development/python-modules/timezonefinder/default.nix b/pkgs/development/python-modules/timezonefinder/default.nix index 895ebd130ea..e62a87e67b0 100644 --- a/pkgs/development/python-modules/timezonefinder/default.nix +++ b/pkgs/development/python-modules/timezonefinder/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "timezonefinder"; - version = "4.4.0"; + version = "4.4.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ccb7ee58f5da4b05eae2154eb615eb791487d3cfeaa2a690877737a898580a9e"; + sha256 = "c84e0f4b501419349e67972d25c535d9b5fd6c100c319747049b67812a4c6b97"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/tinydb/default.nix b/pkgs/development/python-modules/tinydb/default.nix index f4de29b5e6c..96b6242c85e 100644 --- a/pkgs/development/python-modules/tinydb/default.nix +++ b/pkgs/development/python-modules/tinydb/default.nix @@ -33,7 +33,7 @@ buildPythonPackage rec { meta = with lib; { description = "A lightweight document oriented database written in pure Python with no external dependencies"; homepage = "https://github.com/msiemens/tinydb"; - license = licenses.asl20; + license = licenses.asl20; maintainers = with maintainers; [ marcus7070 ]; }; } diff --git a/pkgs/development/python-modules/titlecase/default.nix b/pkgs/development/python-modules/titlecase/default.nix index aed342c119f..c1de2454e4b 100644 --- a/pkgs/development/python-modules/titlecase/default.nix +++ b/pkgs/development/python-modules/titlecase/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "titlecase"; - version = "0.12.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0486i99wf8ssa7sgn81fn6fv6i4rhhq6n751bc740b3hzfbpmpl4"; + sha256 = "16e279edf085293bc9c44a68ce959c7d6cd5c653e6b5669a3a3640015cb63eb6"; }; checkInputs = [ nose ]; diff --git a/pkgs/development/python-modules/tldextract/default.nix b/pkgs/development/python-modules/tldextract/default.nix index e771470b400..b7df857533a 100644 --- a/pkgs/development/python-modules/tldextract/default.nix +++ b/pkgs/development/python-modules/tldextract/default.nix @@ -1,19 +1,20 @@ -{ lib, fetchPypi, buildPythonPackage +{ lib, fetchPypi, buildPythonPackage, setuptools_scm , requests, requests-file, idna, pytest , responses }: buildPythonPackage rec { pname = "tldextract"; - version = "2.2.2"; + version = "2.2.3"; src = fetchPypi { inherit pname version; - sha256 = "9aa21a1f7827df4209e242ec4fc2293af5940ec730cde46ea80f66ed97bfc808"; + sha256 = "ab0e38977a129c72729476d5f8c85a8e1f8e49e9202e1db8dca76e95da7be9a8"; }; propagatedBuildInputs = [ requests requests-file idna ]; checkInputs = [ pytest responses ]; + nativeBuildInputs = [ setuptools_scm ]; meta = { homepage = "https://github.com/john-kurkowski/tldextract"; diff --git a/pkgs/development/python-modules/todoist/default.nix b/pkgs/development/python-modules/todoist/default.nix index f420cbaee97..bfff6282025 100644 --- a/pkgs/development/python-modules/todoist/default.nix +++ b/pkgs/development/python-modules/todoist/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "todoist-python"; - version = "8.1.1"; + version = "8.1.2"; src = fetchPypi { inherit pname version; - sha256 = "0khipf8v0gqvspq7m67aqv0ql3rdqyqr8qfhbm1szc1z6mygj8ns"; + sha256 = "750b2d2300e8590cd56414ab7bbbc8dfcaf8c27102b342398955812176499498"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/tomlkit/default.nix b/pkgs/development/python-modules/tomlkit/default.nix index 2e3a50bfd94..27f952386f1 100644 --- a/pkgs/development/python-modules/tomlkit/default.nix +++ b/pkgs/development/python-modules/tomlkit/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "tomlkit"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "74f976908030ff164c0aa1edabe3bf83ea004b3daa5b0940b9c86a060c004e9a"; + sha256 = "ac57f29693fab3e309ea789252fcce3061e19110085aa31af5446ca749325618"; }; propagatedBuildInputs = diff --git a/pkgs/development/python-modules/tox/default.nix b/pkgs/development/python-modules/tox/default.nix index cac97d92b2a..40883928f56 100644 --- a/pkgs/development/python-modules/tox/default.nix +++ b/pkgs/development/python-modules/tox/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "tox"; - version = "3.15.2"; + version = "3.19.0"; buildInputs = [ setuptools_scm ]; propagatedBuildInputs = [ packaging pluggy py six virtualenv toml filelock ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "c696d36cd7c6a28ada2da780400e44851b20ee19ef08cfe73344a1dcebbbe9f3"; + sha256 = "17e61a93afe5c49281fb969ab71f7a3f22d7586d1c56f9a74219910f356fe7d3"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/tqdm/default.nix b/pkgs/development/python-modules/tqdm/default.nix index d3f83cec481..c83f6159fde 100644 --- a/pkgs/development/python-modules/tqdm/default.nix +++ b/pkgs/development/python-modules/tqdm/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "tqdm"; - version = "4.48.0"; + version = "4.48.2"; src = fetchPypi { inherit pname version; - sha256 = "6baa75a88582b1db6d34ce4690da5501d2a1cb65c34664840a456b2c9f794d29"; + sha256 = "564d632ea2b9cb52979f7956e093e831c28d441c11751682f84c86fc46e4fd21"; }; checkInputs = [ nose coverage glibcLocales flake8 ]; diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index eb7c1c2aa48..aa6db6a7353 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "transformers"; - version = "3.0.2"; + version = "3.1.0"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; rev = "v${version}"; - sha256 = "0rdlikh2qilwd0s9f3zif51p1q7sp3amxaccqic8p5qm6dqpfpz6"; + sha256 = "0wg36qrcljmpsyhjaxpqw3s1r6276yg8cq0bjrf52l4zlc5k4xzk"; }; propagatedBuildInputs = [ @@ -44,16 +44,23 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "tokenizers == 0.8.1.rc1" "tokenizers>=0.8" + --replace "tokenizers == 0.8.1.rc2" "tokenizers>=0.8" ''; preCheck = '' export HOME="$TMPDIR" cd tests + + # This test requires the nlp module, which we haven't + # packaged yet. However, nlp is optional for transformers + # itself + rm test_trainer.py ''; # Disable tests that require network access. disabledTests = [ + "PegasusTokenizationTest" + "T5TokenizationTest" "test_all_tokenizers" "test_batch_encoding_is_fast" "test_batch_encoding_pickle" @@ -63,6 +70,7 @@ buildPythonPackage rec { "test_hf_api" "test_outputs_can_be_shorter" "test_outputs_not_longer_than_maxlen" + "test_padding_accepts_tensors" "test_pretokenized_tokenizers" "test_tokenizer_equivalence_en_de" "test_tokenizer_from_model_type" @@ -74,6 +82,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { homepage = "https://github.com/huggingface/transformers"; description = "State-of-the-art Natural Language Processing for TensorFlow 2.0 and PyTorch"; + changelog = "https://github.com/huggingface/transformers/releases/tag/v${version}"; license = licenses.asl20; platforms = platforms.unix; maintainers = with maintainers; [ danieldk pashashocky ]; diff --git a/pkgs/development/python-modules/translationstring/default.nix b/pkgs/development/python-modules/translationstring/default.nix index 0933b90ede9..013615de800 100644 --- a/pkgs/development/python-modules/translationstring/default.nix +++ b/pkgs/development/python-modules/translationstring/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "translationstring"; - version = "1.3"; + version = "1.4"; src = fetchPypi { inherit pname version; - sha256 = "4ee44cfa58c52ade8910ea0ebc3d2d84bdcad9fa0422405b1801ec9b9a65b72d"; + sha256 = "bf947538d76e69ba12ab17283b10355a9ecfbc078e6123443f43f2107f6376f3"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/trezor/default.nix b/pkgs/development/python-modules/trezor/default.nix index 3d1bb053cd4..0e0c6da021f 100644 --- a/pkgs/development/python-modules/trezor/default.nix +++ b/pkgs/development/python-modules/trezor/default.nix @@ -1,34 +1,56 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k, python, pytest -, typing-extensions -, protobuf -, hidapi -, ecdsa -, mnemonic -, requests -, pyblake2 +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, installShellFiles +, attrs , click , construct +, ecdsa +, hidapi , libusb1 +, mnemonic +, pillow +, protobuf +, pyblake2 +, requests , rlp , shamir-mnemonic +, typing-extensions , trezor-udev-rules -, installShellFiles +, pytest }: buildPythonPackage rec { pname = "trezor"; - version = "0.12.1"; + version = "0.12.2"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "1w19m9lws55k9sjhras47hpfpqwq1jm5vy135nj65yhkblygqg19"; + sha256 = "0r0j0y0ii62ppawc8qqjyaq0fkmmb0zk1xb3f9navxp556w2dljv"; }; nativeBuildInputs = [ installShellFiles ]; - propagatedBuildInputs = [ typing-extensions protobuf hidapi ecdsa mnemonic requests pyblake2 click construct libusb1 rlp shamir-mnemonic trezor-udev-rules ]; + propagatedBuildInputs = [ + attrs + click + construct + ecdsa + hidapi + libusb1 + mnemonic + pillow + protobuf + pyblake2 + requests + rlp + shamir-mnemonic + typing-extensions + trezor-udev-rules + ]; checkInputs = [ pytest @@ -52,7 +74,7 @@ buildPythonPackage rec { ''; meta = with lib; { - description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet"; + description = "Python library for communicating with Trezor Hardware Wallet"; homepage = "https://github.com/trezor/trezor-firmware/tree/master/python"; license = licenses.gpl3; maintainers = with maintainers; [ np prusnak mmahut _1000101 ]; diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index 7d749ea4a9b..f9a2dfa6af3 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.7.14"; + version = "3.8.4"; src = fetchPypi { inherit pname version; - sha256 = "bd3d88fc179d6dfd6d47f63dec4bb8da204c070e78cb2b483f86b33886bf627b"; + sha256 = "50d2e74f2047a50d097a394fb11b12443f764dfc7145140d5029f7019dea6d4d"; }; propagatedBuildInputs = [ numpy ]; diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix index 9a63850e53e..658dea91049 100644 --- a/pkgs/development/python-modules/trio/default.nix +++ b/pkgs/development/python-modules/trio/default.nix @@ -5,7 +5,7 @@ , idna , outcome , contextvars -, pytest +, pytestCheckHook , pyopenssl , trustme , sniffio @@ -18,23 +18,23 @@ buildPythonPackage rec { pname = "trio"; - version = "0.15.1"; + version = "0.16.0"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "3010864ab8d8b2ae44d3bc97b0e8924d8f5170bf32f07c7638a930a129687f33"; + sha256 = "df067dd0560c321af39d412cd81fc3a7d13f55af9150527daab980683e9fcf3c"; }; - checkInputs = [ astor pytest pyopenssl trustme jedi pylint yapf ]; + checkInputs = [ astor pytestCheckHook pyopenssl trustme jedi pylint yapf ]; # It appears that the build sandbox doesn't include /etc/services, and these tests try to use it. - checkPhase = '' - HOME=$TMPDIR py.test -k 'not getnameinfo \ - and not SocketType_resolve \ - and not getprotobyname \ - and not waitpid \ - and not static_tool_sees_all_symbols' - ''; + disabledTests = [ + "getnameinfo" + "SocketType_resolve" + "getprotobyname" + "waitpid" + "static_tool_sees_all_symbols" + ]; propagatedBuildInputs = [ attrs diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index 21e1ac13ca6..834942ee00e 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -24,10 +24,10 @@ with stdenv.lib; buildPythonApplication rec { pname = "trytond"; - version = "5.6.4"; + version = "5.6.5"; src = fetchPypi { inherit pname version; - sha256 = "d89da52a9a0a9bcbbc316fc72eea8810bac64307d22c90ab2d70a4b0cd9b1a9c"; + sha256 = "a373d73b141d71f8e30d728dd8380955bc0f33daaa097201fa9a952e3663e6d8"; }; # Tells the tests which database to use diff --git a/pkgs/development/python-modules/tvnamer/default.nix b/pkgs/development/python-modules/tvnamer/default.nix index dc525901775..1b4e32de68e 100644 --- a/pkgs/development/python-modules/tvnamer/default.nix +++ b/pkgs/development/python-modules/tvnamer/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0szg3k9zcnba7a8fw1fz3hr72lwlysfbm7hkabkaik69vra77bh0"; + sha256 = "00ae7354dec9cca8e652139eba9cf6945371321cdf05ee903a6a59f6d31cef6b"; }; checkInputs = [ pytest ]; diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index 13fafe788fd..1c5535ec079 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "tweepy"; - version = "3.8.0"; + version = "3.9.0"; src = fetchPypi { inherit pname version; - sha256 = "0sri92mzhkifn16klkk2mhc2vcrvdmfp2wvkpfss518sln5q5gca"; + sha256 = "bfd19a5c11f35f7f199c795f99d9cbf8a52eb33f0ecfb6c91ee10b601180f604"; }; doCheck = false; diff --git a/pkgs/development/python-modules/u-msgpack-python/default.nix b/pkgs/development/python-modules/u-msgpack-python/default.nix index a41351916b7..ef4fe47b7a2 100644 --- a/pkgs/development/python-modules/u-msgpack-python/default.nix +++ b/pkgs/development/python-modules/u-msgpack-python/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "u-msgpack-python"; - version = "2.6.0"; + version = "2.7.0"; src = fetchPypi { inherit pname version; - sha256 = "754edb07eaee39a9686a99823892e3a1be4e0948d9cc5c717946750c27643c9c"; + sha256 = "996e4c4454771f0ff0fd2a7566b1a159d305d3611cd755addf444e3533e2bc54"; }; LC_ALL="en_US.UTF-8"; diff --git a/pkgs/development/python-modules/uamqp/default.nix b/pkgs/development/python-modules/uamqp/default.nix index 71a38c88d29..1e7132525a2 100644 --- a/pkgs/development/python-modules/uamqp/default.nix +++ b/pkgs/development/python-modules/uamqp/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "uamqp"; - version = "1.2.9"; + version = "1.2.10"; src = fetchPypi { inherit pname version; - sha256 = "1gqccakzivga3lb9sh4aniamqpnlbbwxfbkhrb6833k1zha01w8j"; + sha256 = "398dd818e9a6c14f00c434e7ad3fcbe1d0344f2f4c23bca8c5026280ae032f4f"; }; buildInputs = [ diff --git a/pkgs/development/python-modules/ufonormalizer/default.nix b/pkgs/development/python-modules/ufonormalizer/default.nix new file mode 100644 index 00000000000..1fbed4ad1aa --- /dev/null +++ b/pkgs/development/python-modules/ufonormalizer/default.nix @@ -0,0 +1,19 @@ +{ lib, buildPythonPackage, fetchPypi }: + +buildPythonPackage rec { + pname = "ufonormalizer"; + version = "0.4.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "1rn64a0i151qk6h5f9pijcmja195i2d6f8jbi5h4xkgkinm9wwzj"; + extension = "zip"; + }; + + meta = with lib; { + description = "Script to normalize the XML and other data inside of a UFO"; + homepage = "https://github.com/unified-font-object/ufoNormalizer"; + license = licenses.bsd3; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/ufoprocessor/default.nix b/pkgs/development/python-modules/ufoprocessor/default.nix new file mode 100644 index 00000000000..db5b1400fe4 --- /dev/null +++ b/pkgs/development/python-modules/ufoprocessor/default.nix @@ -0,0 +1,35 @@ +{ lib, buildPythonPackage, fetchPypi +, defcon, fonttools, lxml, fs +, mutatormath, fontmath, fontparts +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "ufoProcessor"; + version = "1.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "0ns11aamgavgsfj8qf5kq7dvzmgl0mhr1cbych2f075ipfdvva5s"; + extension = "zip"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + propagatedBuildInputs = [ + defcon + lxml + fonttools + fs + fontmath + fontparts + mutatormath + ]; + + meta = with lib; { + description = "Read, write and generate UFOs with designspace data"; + homepage = "https://github.com/LettError/ufoProcessor"; + license = licenses.mit; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/ujson/2.nix b/pkgs/development/python-modules/ujson/2.nix new file mode 100644 index 00000000000..e1d1185f6f5 --- /dev/null +++ b/pkgs/development/python-modules/ujson/2.nix @@ -0,0 +1,28 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, setuptools_scm +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "ujson"; + version = "2.0.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "18z9gb9ggy1r464b9q1gqs078mqgrkj6dys5a47529rqk3yfybdx"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with stdenv.lib; { + homepage = "https://pypi.python.org/pypi/ujson"; + description = "Ultra fast JSON encoder and decoder for Python"; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/ujson/default.nix b/pkgs/development/python-modules/ujson/default.nix index 295d6febf33..9df71ee49c3 100644 --- a/pkgs/development/python-modules/ujson/default.nix +++ b/pkgs/development/python-modules/ujson/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "ujson"; - version = "3.0.0"; + version = "3.1.0"; disabled = isPyPy || (!isPy3k); src = fetchPypi { inherit pname version; - sha256 = "e0199849d61cc6418f94d52a314c6a27524d65e82174d2a043fb718f73d1520d"; + sha256 = "00bda1de275ed6fe81817902189c75dfd156b4fa29b44dc1f4620775d2f50cf7"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/pkgs/development/python-modules/unicodedata2/default.nix b/pkgs/development/python-modules/unicodedata2/default.nix new file mode 100644 index 00000000000..09b75e0c777 --- /dev/null +++ b/pkgs/development/python-modules/unicodedata2/default.nix @@ -0,0 +1,23 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pytest }: + +buildPythonPackage rec { + pname = "unicodedata2"; + version = "13.0.0-2"; + + src = fetchFromGitHub { + owner = "mikekap"; + repo = pname; + rev = version; + sha256 = "0p9brbiwyg98q52y0gfyps52xv57fwqfpq0mn18p1xc1imip3h2b"; + }; + + checkInputs = [ pytest ]; + checkPhase = "pytest tests"; + + meta = with lib; { + description = "Backport and updates for the unicodedata module"; + homepage = "http://github.com/mikekap/unicodedata2"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/unittest-xml-reporting/default.nix b/pkgs/development/python-modules/unittest-xml-reporting/default.nix index 113f5535f60..372cfd7ce0e 100644 --- a/pkgs/development/python-modules/unittest-xml-reporting/default.nix +++ b/pkgs/development/python-modules/unittest-xml-reporting/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "unittest-xml-reporting"; - version = "3.0.2"; + version = "3.0.3"; disabled = isPy27; propagatedBuildInputs = [six]; @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "e09b8ae70cce9904cdd331f53bf929150962869a5324ab7ff3dd6c8b87e01f7d"; + sha256 = "89ad3376cc63dc0f7227c1e39d03d5f6a20807fef989c57d8c623446b5f79575"; }; meta = with lib; { homepage = "https://github.com/xmlrunner/unittest-xml-reporting/tree/master/"; diff --git a/pkgs/development/python-modules/untangle/default.nix b/pkgs/development/python-modules/untangle/default.nix index 9b8e915a8ba..820c96c38c9 100644 --- a/pkgs/development/python-modules/untangle/default.nix +++ b/pkgs/development/python-modules/untangle/default.nix @@ -3,7 +3,7 @@ buildPythonPackage rec { pname = "untangle"; version = "1.1.1"; - + src = fetchFromGitHub { owner = "stchris"; repo = "untangle"; @@ -11,11 +11,11 @@ buildPythonPackage rec { rev = "61b57cd771a40df7d1621e9ec3c68d9acd733d31"; sha256 = "0ffvlfyyl82xi4akz1lls32lrnlrn44ik41v8x8xh9ghy0n0ick7"; }; - + checkPhase = '' ${python.interpreter} -m unittest discover -s tests ''; - + meta = with lib; { description = "Convert XML documents into Python objects"; homepage = "https://github.com/stchris/untangle"; diff --git a/pkgs/development/python-modules/update_checker/default.nix b/pkgs/development/python-modules/update_checker/default.nix index e319422ce7b..fd3d0b02b63 100644 --- a/pkgs/development/python-modules/update_checker/default.nix +++ b/pkgs/development/python-modules/update_checker/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "update_checker"; - version = "0.17"; + version = "0.18.0"; src = fetchPypi { inherit pname version; - sha256 = "0qhfn5fjjab50gbnj2053wdfppzkydqgapfz35ymrm1vysvqvvrd"; + sha256 = "6a2d45bb4ac585884a6b03f9eade9161cedd9e8111545141e9aa9058932acb13"; }; propagatedBuildInputs = [ requests ]; diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix index 3d472a604d6..81b6f276289 100644 --- a/pkgs/development/python-modules/uproot/default.nix +++ b/pkgs/development/python-modules/uproot/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "uproot"; - version = "3.11.7"; + version = "3.12.0"; src = fetchPypi { inherit pname version; - sha256 = "3fbf9dfe5ce996ffda3a49d16eba804b95fb05bc041fc4e7bc05317a03bf6cba"; + sha256 = "1603140896b9d3495cedeee2b872e97759085777c1299317072ad3f415211abc"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 6a6cc44d66d..36fe4b51495 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -1,8 +1,9 @@ -{ stdenv, buildPythonPackage, fetchPypi, glibcLocales }: +{ stdenv, buildPythonPackage, fetchPypi, isPy3k, isPy27, glibcLocales }: buildPythonPackage rec { pname = "urwid"; version = "2.1.1"; + disabled = isPy27; src = fetchPypi { inherit pname version; @@ -13,6 +14,11 @@ buildPythonPackage rec { LC_ALL = "en_US.UTF-8"; checkInputs = [ glibcLocales ]; + # tests which assert on strings don't decode results correctly + doCheck = isPy3k; + + pythonImportsCheck = [ "urwid" ]; + meta = with stdenv.lib; { description = "A full-featured console (xterm et al.) user interface library"; homepage = "http://excess.org/urwid"; diff --git a/pkgs/development/python-modules/userpath/default.nix b/pkgs/development/python-modules/userpath/default.nix new file mode 100644 index 00000000000..8366a56158d --- /dev/null +++ b/pkgs/development/python-modules/userpath/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildPythonPackage +, fetchPypi +, click +, distro +}: + +buildPythonPackage rec { + pname = "userpath"; + version = "1.4.1"; + + src = fetchPypi { + inherit pname version; + sha256="0mfjmvx286z1dmnrc7bm65x8gj8qrmkcyagl0vf5ywfq0bm48591"; + }; + + propagatedBuildInputs = [ click distro ]; + + # test suite is difficult to emulate in sandbox due to shell manipulation + doCheck = false; + + pythonImportsCheck = [ "click" "userpath" ]; + + meta = with lib; { + description = "Cross-platform tool for adding locations to the user PATH"; + homepage = "https://github.com/ofek/userpath"; + license = [ licenses.asl20 licenses.mit ]; + maintainers = with maintainers; [ yevhenshymotiuk ]; + }; +} diff --git a/pkgs/development/python-modules/validators/default.nix b/pkgs/development/python-modules/validators/default.nix index dbed55725bc..c6297fd13fe 100644 --- a/pkgs/development/python-modules/validators/default.nix +++ b/pkgs/development/python-modules/validators/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "validators"; - version = "0.15.0"; + version = "0.17.1"; src = fetchPypi { inherit pname version; - sha256 = "31e8bb01b48b48940a021b8a9576b840f98fa06b91762ef921d02cb96d38727a"; + sha256 = "401cb441dd61bb1a03b10c8a3a884642409e22a2a19e03bbfc4891e0ddbc7268"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/varint/default.nix b/pkgs/development/python-modules/varint/default.nix index 5f32dff4aa5..143a452344e 100644 --- a/pkgs/development/python-modules/varint/default.nix +++ b/pkgs/development/python-modules/varint/default.nix @@ -22,4 +22,4 @@ buildPythonPackage rec { license = licenses.mit; maintainers = with maintainers; [ rakesh4g ]; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/vcrpy/default.nix b/pkgs/development/python-modules/vcrpy/default.nix index 0dd88ba1979..633c4f266cd 100644 --- a/pkgs/development/python-modules/vcrpy/default.nix +++ b/pkgs/development/python-modules/vcrpy/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "vcrpy"; - version = "4.0.2"; + version = "4.1.0"; src = fetchPypi { inherit pname version; - sha256 = "9740c5b1b63626ec55cefb415259a2c77ce00751e97b0f7f214037baaf13c7bf"; + sha256 = "4138e79eb35981ad391406cbb7227bce7eba8bad788dcf1a89c2e4a8b740debe"; }; checkInputs = [ diff --git a/pkgs/development/python-modules/vertica-python/default.nix b/pkgs/development/python-modules/vertica-python/default.nix index 8beb39b26d9..7247e079467 100644 --- a/pkgs/development/python-modules/vertica-python/default.nix +++ b/pkgs/development/python-modules/vertica-python/default.nix @@ -2,22 +2,22 @@ buildPythonPackage rec { pname = "vertica-python"; - version = "0.10.4"; - + version = "0.11.0"; + src = fetchPypi { inherit pname version; - sha256 = "570525d0371806993874bd2ee0f47cc5d68994abb5aa382e964e53e0b81160b2"; + sha256 = "cceb39d081b8d1628956205642e740a9fabcfd2c6ecd982c51134fba8215d0bd"; }; - + propagatedBuildInputs = [ future dateutil six ]; - + checkInputs = [ pytest mock parameterized ]; - + # Integration tests require an accessible Vertica db checkPhase = '' pytest --ignore vertica_python/tests/integration_tests ''; - + meta = with lib; { description = "Native Python client for Vertica database"; homepage = "https://github.com/vertica/vertica-python"; diff --git a/pkgs/development/python-modules/virtualenv/default.nix b/pkgs/development/python-modules/virtualenv/default.nix index 8be6bb146f5..7e308d86158 100644 --- a/pkgs/development/python-modules/virtualenv/default.nix +++ b/pkgs/development/python-modules/virtualenv/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "virtualenv"; - version = "20.0.28"; + version = "20.0.30"; src = fetchPypi { inherit pname version; - sha256 = "688a61d7976d82b92f7906c367e83bb4b3f0af96f8f75bfcd3da95608fe8ac6c"; + sha256 = "7b54fd606a1b85f83de49ad8d80dbec08e983a2d2f96685045b262ebc7481ee5"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/vulture/default.nix b/pkgs/development/python-modules/vulture/default.nix index 06f3265d424..22b5af442d6 100644 --- a/pkgs/development/python-modules/vulture/default.nix +++ b/pkgs/development/python-modules/vulture/default.nix @@ -1,12 +1,13 @@ -{ stdenv, buildPythonPackage, fetchPypi, coverage, pytest, pytestcov }: +{ stdenv, buildPythonPackage, fetchPypi, isPy27, coverage, pytest, pytestcov }: buildPythonPackage rec { pname = "vulture"; - version = "1.6"; + version = "2.0"; + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1sbwbwkpk3s7iwnwsdrvj1ydw9lgbn3xqhji7f8y5y6vvr77i53v"; + sha256 = "ab0dce458ab746212cc02ac10cf31912c43bbfdcccb49025745b00850beab086"; }; checkInputs = [ coverage pytest pytestcov ]; diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index a545a9510b8..ec9cbb3d560 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -1,30 +1,25 @@ { stdenv , buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook }: buildPythonPackage rec { pname = "wasabi"; - version = "0.7.1"; + version = "0.8.0"; src = fetchPypi { inherit pname version; - sha256 = "ee3809f4ce00e1e7f424b1572c753cff0dcaca2ca684e67e31f985033a9f070b"; + sha256 = "75fec6db6193c8615d7f398ae4aa2c4ad294e6e3e81c6a6dbbbd3864ee2223c3"; }; - checkInputs = [ - pytest - ]; - - checkPhase = '' - pytest wasabi/tests - ''; + checkInputs = [ pytestCheckHook ]; meta = with stdenv.lib; { description = "A lightweight console printing and formatting toolkit"; homepage = "https://github.com/ines/wasabi"; + changelog = "https://github.com/ines/wasabi/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ danieldk ]; - }; + }; } diff --git a/pkgs/development/python-modules/web/default.nix b/pkgs/development/python-modules/web/default.nix index 6749ed2b838..bf21d7ed5c3 100644 --- a/pkgs/development/python-modules/web/default.nix +++ b/pkgs/development/python-modules/web/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.51"; + version = "0.61"; pname = "web.py"; disabled = isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b50343941360984d37270186453bb897d13630028a739394fedf38f9cde2fd07"; + sha256 = "c7a9081aeb086cd3e703c7553a47ee75188d1d325f25eec7654d9bb00b5eccbb"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/west/default.nix b/pkgs/development/python-modules/west/default.nix index 3d4427f492d..686ba1196b1 100644 --- a/pkgs/development/python-modules/west/default.nix +++ b/pkgs/development/python-modules/west/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - version = "0.7.2"; + version = "0.7.3"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "11dbzlcg48fymddqjrrs60pr7y33qjjv0y5zrfjc56gkc190gmz6"; + sha256 = "86a36049ae3c8b1ce12d3183911b3082b38b2998e858285309581e37dc22d8fa"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/whitenoise/default.nix b/pkgs/development/python-modules/whitenoise/default.nix index cf24f7fb1d3..dbc069f434e 100644 --- a/pkgs/development/python-modules/whitenoise/default.nix +++ b/pkgs/development/python-modules/whitenoise/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "whitenoise"; - version = "5.1.0"; + version = "5.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "60154b976a13901414a25b0273a841145f77eb34a141f9ae032a0ace3e4d5b27"; + sha256 = "05ce0be39ad85740a78750c86a93485c40f08ad8c62a6006de0233765996e5c7"; }; # No tests diff --git a/pkgs/development/python-modules/xcffib/default.nix b/pkgs/development/python-modules/xcffib/default.nix index 1bb421194f9..8f949f20e92 100644 --- a/pkgs/development/python-modules/xcffib/default.nix +++ b/pkgs/development/python-modules/xcffib/default.nix @@ -3,16 +3,17 @@ , fetchPypi , xorg , cffi +, nose , six }: buildPythonPackage rec { - version = "0.9.0"; + version = "0.10.1"; pname = "xcffib"; src = fetchPypi { inherit pname version; - sha256 = "1r03yvxwbimh8ngfrbd436f9r535vvj6m1b3zfgz9kl76c8yn5ic"; + sha256 = "cab1630a51076b11819c97e6da461ddd4cb21bdf65c071d1c57a846c9b129c12"; }; patchPhase = '' @@ -22,6 +23,10 @@ buildPythonPackage rec { propagatedBuildInputs = [ cffi six ]; + checkInputs = [ nose ]; + + pythonImportsCheck = [ "xcffib" ]; + meta = with stdenv.lib; { description = "A drop in replacement for xpyb, an XCB python binding"; homepage = "https://github.com/tych0/xcffib"; diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 7dc6cf2896f..d5795ddf969 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "2.45.3"; + version = "2.47.0"; src = fetchPypi { inherit pname version; - sha256 = "e083195efc07f84fb22da9e74d5d9f857d3c82a3947995b0d4f3ff9b11a1a7c5"; + sha256 = "7f621ed0e5a30c2b67c0e50778627b7a35e1ccfea9db19ea89b4c72a8faf42c0"; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/xpybutil/default.nix b/pkgs/development/python-modules/xpybutil/default.nix index 60c96582ea6..07cfc96e7fd 100644 --- a/pkgs/development/python-modules/xpybutil/default.nix +++ b/pkgs/development/python-modules/xpybutil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, xcffib, pillow }: +{ lib, buildPythonPackage, fetchFromGitHub, xcffib, pillow, nose }: buildPythonPackage rec { pname = "xpybutil"; @@ -15,6 +15,8 @@ buildPythonPackage rec { # pillow is a dependency in image.py which is not listed in setup.py propagatedBuildInputs = [ xcffib pillow ]; + checkInputs = [ nose ]; + meta = with lib; { homepage = "https://github.com/BurntSushi/xpybutil"; description = "An incomplete xcb-util port plus some extras"; diff --git a/pkgs/development/python-modules/xxhash/default.nix b/pkgs/development/python-modules/xxhash/default.nix index ee385e483b2..52b3f8b1b5b 100644 --- a/pkgs/development/python-modules/xxhash/default.nix +++ b/pkgs/development/python-modules/xxhash/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.4.4"; + version = "2.0.0"; pname = "xxhash"; src = fetchPypi { inherit pname version; - sha256 = "0impn5fbs9h8qjnbvn7j2v25lh20z8gbcx5xi9dhhzcp2z9gjvbx"; + sha256 = "58ca818554c1476fa1456f6cd4b87002e2294f09baf0f81e5a2a4968e62c423c"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/yarl/default.nix b/pkgs/development/python-modules/yarl/default.nix index bfb09f9c1c5..3ab7fb49c43 100644 --- a/pkgs/development/python-modules/yarl/default.nix +++ b/pkgs/development/python-modules/yarl/default.nix @@ -1,23 +1,29 @@ { stdenv +, lib , fetchPypi , buildPythonPackage +, pythonOlder , multidict , pytestrunner , pytest +, typing-extensions , idna }: buildPythonPackage rec { pname = "yarl"; - version = "1.4.2"; + version = "1.5.1"; src = fetchPypi { inherit pname version; - sha256 = "58cd9c469eced558cd81aa3f484b2924e8897049e06889e8ff2510435b7ef74b"; + sha256 = "c22c75b5f394f3d47105045ea551e08a3e804dc7e01b37800ca35b58f856c3d6"; }; checkInputs = [ pytest pytestrunner ]; - propagatedBuildInputs = [ multidict idna ]; + propagatedBuildInputs = [ multidict idna ] + ++ lib.optionals (pythonOlder "3.8") [ + typing-extensions + ]; meta = with stdenv.lib; { description = "Yet another URL library"; diff --git a/pkgs/development/python-modules/yattag/default.nix b/pkgs/development/python-modules/yattag/default.nix index f9b597e9f78..211a4b60c81 100644 --- a/pkgs/development/python-modules/yattag/default.nix +++ b/pkgs/development/python-modules/yattag/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "yattag"; - version = "1.13.2"; + version = "1.14.0"; src = fetchPypi { inherit pname version; - sha256 = "41c1182f81e69bc53d8763c5bb9d27f54ae05ce581ee4e41c7931cc2f2479262"; + sha256 = "5731a31cb7452c0c6930dd1a284e0170b39eee959851a2aceb8d6af4134a5fa8"; }; meta = with lib; { diff --git a/pkgs/development/python-modules/ydiff/default.nix b/pkgs/development/python-modules/ydiff/default.nix index ea30e62546f..822bb40783e 100644 --- a/pkgs/development/python-modules/ydiff/default.nix +++ b/pkgs/development/python-modules/ydiff/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "ydiff"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; }; # test suite requires a multitude of other version control tooling diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix new file mode 100644 index 00000000000..55068d3d5e6 --- /dev/null +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchPypi +, multitasking +, numpy +, pandas +, requests +}: + +buildPythonPackage rec { + pname = "yfinance"; + version = "0.1.54"; + + # GitHub source releases aren't tagged + src = fetchPypi { + inherit pname version; + sha256 = "cee223cbd31e14955869f7978bcf83776d644345c7dea31ba5d41c309bfb0d3d"; + }; + + propagatedBuildInputs = [ + multitasking + numpy + pandas + requests + ]; + + doCheck = false; # Tests require internet access + pythonImportsCheck = [ "yfinance" ]; + + meta = with lib; { + description = "Yahoo! Finance market data downloader (+faster Pandas Datareader)"; + homepage = "https://aroussi.com/post/python-yahoo-finance"; + license = licenses.asl20; + maintainers = with maintainers; [ drewrisinger ]; + }; +} diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 1e51db1ab52..aa64ad4bd5e 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.27.1"; + version = "0.28.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "51a8bc581036cabcf82523c81b72f6a11b2c7913eb7eb418b6dad60cd40f9ef2"; + sha256 = "881da2ed3d7c8e0ab59fb1cc8b02b53134351941c4d8d3f3553a96700f257a03"; }; propagatedBuildInputs = [ ifaddr ] diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix index abb7354db03..1e1a55d689d 100644 --- a/pkgs/development/python-modules/zha-quirks/default.nix +++ b/pkgs/development/python-modules/zha-quirks/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zha-quirks"; - version = "0.0.42"; + version = "0.0.43"; nativeBuildInputs = [ pytest ]; buildInputs = [ aiohttp zigpy ]; src = fetchPypi { inherit pname version; - sha256 = "7b9c6217054b9c49bfe249fa38d993490e901ab29f198022d569e3505e6c7f20"; + sha256 = "16f62dddce73bb27408b13a0d6526a250b588ca020405b2369e72d5dc9fa7607"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zigpy-cc/default.nix b/pkgs/development/python-modules/zigpy-cc/default.nix index 7223800caa9..76887e39920 100644 --- a/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/pkgs/development/python-modules/zigpy-cc/default.nix @@ -4,14 +4,14 @@ buildPythonPackage rec { pname = "zigpy-cc"; - version = "0.4.4"; + version = "0.5.1"; propagatedBuildInputs = [ pyserial pyserial-asyncio zigpy ]; checkInputs = [ asynctest pytest pytest-asyncio ]; src = fetchPypi { inherit pname version; - sha256 = "117a9xak4y5nksfk9rgvzd6l7hscvzspl1wf3gydyq2lc7b3ggnl"; + sha256 = "06759615b28c45beaa5f03e594769a373d41674b96aeafefccd5c4e1c67e25ca"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/zipp/1.nix b/pkgs/development/python-modules/zipp/1.nix index d7447a26159..0de729928d0 100644 --- a/pkgs/development/python-modules/zipp/1.nix +++ b/pkgs/development/python-modules/zipp/1.nix @@ -35,4 +35,4 @@ buildPythonPackage rec { homepage = "https://github.com/jaraco/zipp"; license = licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/zope_exceptions/default.nix b/pkgs/development/python-modules/zope_exceptions/default.nix index 04e68f038e9..ae7797b8736 100644 --- a/pkgs/development/python-modules/zope_exceptions/default.nix +++ b/pkgs/development/python-modules/zope_exceptions/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "zope.exceptions"; - version = "4.3"; + version = "4.4"; src = fetchPypi { inherit pname version; - sha256 = "5fa59c3c1044bb9448aeec8328db0bfceaae2a2174e88528d3fe04adf8d47211"; + sha256 = "0d72886b1bb8af4c346a117a540f28ab122577f5e3a105a261be72cd15776fda"; }; propagatedBuildInputs = [ zope_interface ]; diff --git a/pkgs/development/python-modules/zope_testrunner/default.nix b/pkgs/development/python-modules/zope_testrunner/default.nix index 9b7145a5851..90fa0b8143c 100644 --- a/pkgs/development/python-modules/zope_testrunner/default.nix +++ b/pkgs/development/python-modules/zope_testrunner/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "zope.testrunner"; - version = "5.1"; + version = "5.2"; src = fetchPypi { inherit pname version; - sha256 = "354a65f6c6fe6c0584e2fcf06d7318e90dc7f7de1b7008d8913733e299317870"; + sha256 = "873d6017abadc213992a0c38c786ed020341b6e0fe78d14bc2a684cf5a70de4b"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ]; diff --git a/pkgs/development/python-modules/zopfli/default.nix b/pkgs/development/python-modules/zopfli/default.nix new file mode 100644 index 00000000000..58b7d43f3d2 --- /dev/null +++ b/pkgs/development/python-modules/zopfli/default.nix @@ -0,0 +1,21 @@ +{ lib, buildPythonPackage, fetchPypi, pytest }: + +buildPythonPackage rec { + pname = "zopfli"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0smaxh7iihjr9mwxw1ifc9vnlh3ra8l060dd1gbvp1963k0r68pd"; + extension = "zip"; + }; + + checkInputs = [ pytest ]; + + meta = with lib; { + description = "cPython bindings for zopfli"; + homepage = "https://github.com/obp/py-zopfli"; + license = licenses.asl20; + maintainers = [ maintainers.sternenseemann ]; + }; +} diff --git a/pkgs/development/python-modules/zstandard/default.nix b/pkgs/development/python-modules/zstandard/default.nix index a0c7ccd438d..58b3c5af825 100755 --- a/pkgs/development/python-modules/zstandard/default.nix +++ b/pkgs/development/python-modules/zstandard/default.nix @@ -8,16 +8,16 @@ buildPythonPackage rec { pname = "zstandard"; version = "0.14.0"; - + src = fetchPypi { inherit pname version; sha256 = "0lkn7n3bfp7zip6hkqwkqwc8pxmhhs4rr699k77h51rfln6kjllh"; }; - + propagatedBuildInputs = [ cffi ]; - + checkInputs = [ hypothesis ]; - + meta = with lib; { description = "zstandard bindings for Python"; homepage = "https://github.com/indygreg/python-zstandard"; diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix index ed91df066c3..44a6d7329ba 100644 --- a/pkgs/development/tools/alloy/default.nix +++ b/pkgs/development/tools/alloy/default.nix @@ -44,7 +44,7 @@ let generic = { major, version, src }: homepage = "http://alloytools.org/"; downloadPage = "http://alloytools.org/download.html"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ notbandali ]; }; }; diff --git a/pkgs/development/tools/ameba/default.nix b/pkgs/development/tools/ameba/default.nix index 0ac36c4c200..9b7cf3f1de8 100644 --- a/pkgs/development/tools/ameba/default.nix +++ b/pkgs/development/tools/ameba/default.nix @@ -2,13 +2,13 @@ crystal.buildCrystalPackage rec { pname = "ameba"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "crystal-ameba"; repo = "ameba"; rev = "v${version}"; - sha256 = "0myy11g62pa1yh9szj03v2lhc5s9xwzr76v4x6hznidpq1b67jn8"; + sha256 = "0wyfx9nwda0s3arpdalz5zgh83v6wfz1a3l2k5v0jglpczq3m04m"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 60a7499c72d..a9ea826e2f6 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.131.0"; + version = "0.132.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "refs/tags/v${version}"; - sha256 = "13a7gfsnfyssyi3b48s0d9k34rim493rarxd2rdyxyr4ir7jnb1p"; + sha256 = "1080kf2zxhbgz1zhm54w3hqbbvwpfllapcq4pgwahfyvf6zb86d7"; }; installPhase = '' diff --git a/pkgs/development/tools/analysis/radare2/cutter.nix b/pkgs/development/tools/analysis/radare2/cutter.nix index ff6d7765ead..5fde4e1f433 100644 --- a/pkgs/development/tools/analysis/radare2/cutter.nix +++ b/pkgs/development/tools/analysis/radare2/cutter.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "radare2-cutter"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "1xvdap7hpkjz6rg0ngnql1p18p93b8w9gv130g818nwcjsh9i2y5"; + sha256 = "0kscl0yf5qxacqnz3pp47r94yiwnc4rwirnr2x580z10fwhsivki"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index b4e66f507d1..b6834ea8232 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tflint"; - version = "0.19.0"; + version = "0.19.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "14pgsx136ibaf1mqkwn8ibnn4g6q5xx0r7xbijj521v12m145i8g"; + sha256 = "1nj36xxl8zg7wdc36lakzdyr9hk82qwkwrvrw19bqach697y57nf"; }; vendorSha256 = "0bzd58ry5k100mjgvl1mxz7aysm75s4vkilcykrqy1s5sc0h3ng5"; diff --git a/pkgs/development/tools/bazel-kazel/default.nix b/pkgs/development/tools/bazel-kazel/default.nix index 62c5e6c9ef9..4ae2a3e68f9 100644 --- a/pkgs/development/tools/bazel-kazel/default.nix +++ b/pkgs/development/tools/bazel-kazel/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "bazel-kazel"; - version = "0.0.11"; + version = "0.0.12"; src = fetchFromGitHub { owner = "kubernetes"; repo = "repo-infra"; rev = "v${version}"; - sha256 = "0fcm7gjsv70qxnwbgy2sgx7clyhlfnkvdxsjgcrkaf5xds8hpys7"; + sha256 = "1mnyp116q54xy7flml4cdcsbczhyyqnpyn2pnqrzy49aahbhpn5z"; }; vendorSha256 = "1pzkjh4n9ai8yqi98bkdhicjdr2l8j3fckl5n90c2gdcwqyxvgkf"; diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix index 0b296f023ad..559a4c191b6 100644 --- a/pkgs/development/tools/build-managers/cmake/default.nix +++ b/pkgs/development/tools/build-managers/cmake/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig +{ stdenv, lib, fetchurl, pkgconfig, fetchpatch , bzip2, curl, expat, libarchive, xz, zlib, libuv, rhash , buildPackages # darwin attributes @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { + lib.optionalString useNcurses "-cursesUI" + lib.optionalString withQt5 "-qt5UI" + lib.optionalString useQt4 "-qt4UI"; - version = "3.18.0"; + version = "3.18.2"; src = fetchurl { url = "${meta.homepage}files/v${lib.versions.majorMinor version}/cmake-${version}.tar.gz"; # compare with https://cmake.org/files/v${lib.versions.majorMinor version}/cmake-${version}-SHA-256.txt - sha256 = "0aby67jn3i0rqhj6cvpm0f7idw3dl7jayaqxa9hkk9w2jk5zzd43"; + sha256 = "0zhxsnxm5d8wdarz2gs3r41r1dfrnh35ki75fa684gaxfzy40kjx"; }; patches = [ @@ -110,8 +110,17 @@ stdenv.mkDerivation rec { doCheck = false; # fails meta = with lib; { - homepage = "http://www.cmake.org/"; + homepage = "https://cmake.org/"; + changelog = "https://cmake.org/cmake/help/v${lib.versions.majorMinor version}/" + + "release/${lib.versions.majorMinor version}.html"; description = "Cross-Platform Makefile Generator"; + longDescription = '' + CMake is an open-source, cross-platform family of tools designed to + build, test and package software. CMake is used to control the software + compilation process using simple platform and compiler independent + configuration files, and generate native makefiles and workspaces that + can be used in the compiler environment of your choice. + ''; platforms = if useQt4 then qt4.meta.platforms else platforms.all; maintainers = with maintainers; [ ttuegel lnl7 ]; license = licenses.bsd3; diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh index 73f24a9a205..6ae560c5645 100755 --- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh +++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh @@ -77,7 +77,7 @@ cmakeConfigurePhase() { fi # The argument sometimes contains garbage or variable interpolation. # When that is the case, let’s fall back to the derivation name. - if [[ -z "$shareDocName" ]] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_-+]'; then + if [[ -z "$shareDocName" ]] || echo "$shareDocName" | grep -q '[^a-zA-Z0-9_+-]'; then if [[ -n "${pname-}" ]]; then shareDocName="$pname" else diff --git a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch index bd81efd5208..e5ac95d0b9d 100644 --- a/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch +++ b/pkgs/development/tools/build-managers/meson/allow-dirs-outside-of-prefix.patch @@ -1,6 +1,6 @@ --- a/mesonbuild/coredata.py +++ b/mesonbuild/coredata.py -@@ -483,7 +483,6 @@ class CoreData: +@@ -491,7 +491,6 @@ class CoreData: return value if option.endswith('dir') and value.is_absolute() and \ option not in builtin_dir_noprefix_options: @@ -8,7 +8,7 @@ # commonpath will always return a path in the native format, so we # must use pathlib.PurePath to do the same conversion before # comparing. -@@ -495,7 +494,7 @@ class CoreData: +@@ -503,7 +502,7 @@ class CoreData: try: value = value.relative_to(prefix) except ValueError: diff --git a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch b/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch index 0a52fe60e9d..f1e3c76e8b5 100644 --- a/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch +++ b/pkgs/development/tools/build-managers/meson/clear-old-rpath.patch @@ -1,8 +1,8 @@ diff --git a/mesonbuild/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py -index 77ac03d66..d12f77592 100644 +index 4176b9a03..faaabf616 100644 --- a/mesonbuild/scripts/depfixer.py +++ b/mesonbuild/scripts/depfixer.py -@@ -337,6 +337,15 @@ class Elf(DataSizes): +@@ -336,6 +336,15 @@ class Elf(DataSizes): if not new_rpath: self.remove_rpath_entry(entrynum) else: diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index a1c94fa1fce..aa11ba7638b 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -9,11 +9,11 @@ python3.pkgs.buildPythonApplication rec { pname = "meson"; - version = "0.55.0"; + version = "0.55.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "Chriv+KuFKxHWTU3+TKQ+3npt3XFW0xTwoK8PKN0WzU="; + sha256 = "O1dB+ITgSSi9+hlHRn/wavpsmOYjwlzvda33HKOc4IA="; }; patches = [ @@ -67,10 +67,6 @@ python3.pkgs.buildPythonApplication rec { # workaround until https://github.com/mesonbuild/meson/pull/6512 lands. depsHostHostPropagated = [ pkgsHostHost.stdenv.cc ]; - pythonPath = [ - python3.pkgs.setuptools # for pkg_resources - ]; - # 0.45 update enabled tests but they are failing doCheck = false; # checkInputs = [ ninja pkgconfig ]; diff --git a/pkgs/development/tools/build-managers/meson/fix-rpath.patch b/pkgs/development/tools/build-managers/meson/fix-rpath.patch index c98506fcd9b..d34b6c4c434 100644 --- a/pkgs/development/tools/build-managers/meson/fix-rpath.patch +++ b/pkgs/development/tools/build-managers/meson/fix-rpath.patch @@ -1,6 +1,6 @@ --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py -@@ -453,6 +453,21 @@ class Backend: +@@ -456,6 +456,21 @@ class Backend: args.extend(self.environment.coredata.get_external_link_args(target.for_machine, lang)) except Exception: pass @@ -19,6 +19,6 @@ + dirs.add(flag) + next_is_path = False + - for arg in args: - if arg.startswith('-Wl,-rpath='): - for dir in arg.replace('-Wl,-rpath=','').split(':'): + # Match rpath formats: + # -Wl,-rpath= + # -Wl,-rpath, diff --git a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch b/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch index e59795486aa..0c924bacf73 100644 --- a/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch +++ b/pkgs/development/tools/build-managers/meson/gir-fallback-path.patch @@ -1,8 +1,8 @@ --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py -@@ -801,6 +801,13 @@ class GnomeModule(ExtensionModule): - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_source_dir(), self.interpreter.subproject_dir, state.subproject)] - scan_command += ['--sources-top-dirs', os.path.join(state.environment.get_build_dir(), self.interpreter.subproject_dir, state.subproject)] +@@ -807,6 +807,13 @@ class GnomeModule(ExtensionModule): + if fatal_warnings: + scan_command.append('--warn-error') + if len(set([girtarget.get_custom_install_dir()[0] for girtarget in girtargets])) > 1: + raise MesonException('generate_gir tries to build multiple libraries with different install_dir at once: {}'.format(','.join([str(girtarget) for girtarget in girtargets]))) diff --git a/pkgs/development/tools/build-managers/meson/more-env-vars.patch b/pkgs/development/tools/build-managers/meson/more-env-vars.patch index 6326f5ec3cf..ada58fff6d4 100644 --- a/pkgs/development/tools/build-managers/meson/more-env-vars.patch +++ b/pkgs/development/tools/build-managers/meson/more-env-vars.patch @@ -1,8 +1,8 @@ diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py -index 17058df6b..7a68b7f15 100644 +index 219b62ec8..e3ceaddbd 100644 --- a/mesonbuild/envconfig.py +++ b/mesonbuild/envconfig.py -@@ -120,7 +120,7 @@ def get_env_var_pair(for_machine: MachineChoice, +@@ -94,7 +94,7 @@ def get_env_var_pair(for_machine: MachineChoice, # compiling we fall back on the unprefixed host version. This # allows native builds to never need to worry about the 'BUILD_*' # ones. diff --git a/pkgs/development/tools/build-managers/ninja/default.nix b/pkgs/development/tools/build-managers/ninja/default.nix index efe9a495494..bc5ad7744d6 100644 --- a/pkgs/development/tools/build-managers/ninja/default.nix +++ b/pkgs/development/tools/build-managers/ninja/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "ninja"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "ninja-build"; repo = "ninja"; rev = "v${version}"; - sha256 = "1fbzl7mrcrwp527sgkc1npfl3k6bbpydpiq98xcf1a1hkrx0z5x4"; + sha256 = "1bmv7zfqwp48ga6vnqvy0gzkclv40xgq19q4ihl58r6cn4swccn3"; }; nativeBuildInputs = [ python3 re2c ] ++ optionals buildDocs [ asciidoc docbook_xml_dtd_45 docbook_xsl libxslt.bin ]; diff --git a/pkgs/development/tools/cloudfoundry-cli/default.nix b/pkgs/development/tools/cloudfoundry-cli/default.nix index 9d0c1ab92ff..642c42108aa 100644 --- a/pkgs/development/tools/cloudfoundry-cli/default.nix +++ b/pkgs/development/tools/cloudfoundry-cli/default.nix @@ -1,8 +1,8 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, installShellFiles }: buildGoPackage rec { pname = "cloudfoundry-cli"; - version = "6.51.0"; + version = "7.0.1"; goPackagePath = "code.cloudfoundry.org/cli"; @@ -12,7 +12,14 @@ buildGoPackage rec { owner = "cloudfoundry"; repo = "cli"; rev = "v${version}"; - sha256 = "189cqng7y12knqm4n1bfajbc2lx027rwb44wddmj5iya27i7fv8f"; + sha256 = "0jh4x7xlijp1naak5qyc256zkzlrczl6g4iz94s8wx2zj7np0q5l"; + }; + + # upstream have helpfully moved the bash completion script to a separate + # repo which receives no releases or even tags + bashCompletionScript = fetchurl { + url = "https://raw.githubusercontent.com/cloudfoundry/cli-ci/6087781a0e195465a35c79c8e968ae708c6f6351/ci/installers/completion/cf7"; + sha256 = "1vhg9jcgaxcvvb4pqnhkf27b3qivs4d3w232j0gbh9393m3qxrvy"; }; nativeBuildInputs = [ installShellFiles ]; @@ -35,7 +42,7 @@ buildGoPackage rec { installPhase = '' install -Dm555 out/cf "$out/bin/cf" - installShellCompletion --bash "$src/ci/installers/completion/cf" + installShellCompletion --bash $bashCompletionScript ''; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/cmake-format/default.nix b/pkgs/development/tools/cmake-format/default.nix index b0e97de5500..0d9edebe19b 100644 --- a/pkgs/development/tools/cmake-format/default.nix +++ b/pkgs/development/tools/cmake-format/default.nix @@ -10,12 +10,15 @@ buildPythonApplication rec { pname = "cmake-format"; - version = "0.6.11"; + version = "0.6.13"; + # The source distribution does not build because of missing files. + format = "wheel"; src = fetchPypi { - inherit version; - pname = "cmake_format"; - sha256 = "1wvmv8242xjkxgr266dkn4vrn5wm94fwn333pn7sxm5warhhwgda"; + inherit version format; + python = "py3"; + pname = "cmakelang"; + sha256 = "0kmggnfbv6bba75l3zfzqwk0swi90brjka307m2kcz2w35kr8jvn"; }; propagatedBuildInputs = [ autopep8 flake8 jinja2 pylint pyyaml ]; diff --git a/pkgs/development/tools/continuous-integration/fly/default.nix b/pkgs/development/tools/continuous-integration/fly/default.nix index 55a4434658f..34d30e08c50 100644 --- a/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/pkgs/development/tools/continuous-integration/fly/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "fly"; - version = "6.4.1"; + version = "6.5.0"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${version}"; - sha256 = "16si1qm835yyvk2f0kwn9wnk8vpy5q4whgws1s2p6jr7dswg43h8"; + sha256 = "0x8q1l56h24mmq01j3hib2qg0g44z82mxhmmljy8yv5s2iir0sfh"; }; - vendorSha256 = "0nv9q3j9cja8c6d7ac8fzb8zf82zz1z77f8cxvn3vxjki7fhlavm"; + vendorSha256 = "1fxbxkg7disndlmb065abnfn7sn79qclkcbizmrq49f064w1ijr4"; doCheck = false; diff --git a/pkgs/development/tools/continuous-integration/laminar/default.nix b/pkgs/development/tools/continuous-integration/laminar/default.nix new file mode 100644 index 00000000000..5a326e94a54 --- /dev/null +++ b/pkgs/development/tools/continuous-integration/laminar/default.nix @@ -0,0 +1,80 @@ +{ stdenv +, lib +, fetchurl +, cmake +, capnproto +, sqlite +, boost +, zlib +, rapidjson +, pandoc +, enableSystemd ? false +, customConfig ? null +}: +let + js.vue = fetchurl { + url = "https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js"; + sha256 = "01zklp5cyik65dfn64m8h2y2dxzgbyzgmbf99y7fwgnf0155r7pq"; + }; + js.vue-router = fetchurl { + url = + "https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js"; + sha256 = "07gx7znb30rk1z7w6ca7dlfjp44q12bbq6jghwfm27mf6psa80as"; + }; + js.ansi_up = fetchurl { + url = "https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js"; + sha256 = "1993dywxqi2ylnxybwk7m0s0bg2bq7kfllpyr0s8ck6chd0p8i6r"; + }; + js.Chart = fetchurl { + url = "https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js"; + sha256 = "1jh4h12qchsba03dx03mrvs4r8g9qfjn56xm56jqzgqf7r209xq9"; + }; + css.bootstrap = fetchurl { + url = + "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css"; + sha256 = "11vx860prsx7wsy8b0yrrk04ih8kvrxkk8l16snsc4n286bdkyri"; + }; +in stdenv.mkDerivation rec { + name = "laminar"; + version = "0.8"; + src = fetchurl { + url = "https://github.com/ohwgiles/laminar/archive/${version}.tar.gz"; + sha256 = "05g73j3vpib47kr7mackcazf7s6bc3xwz4h6k7sp7yb5ng7gj20g"; + }; + patches = [ ./patches/no-network.patch ]; + nativeBuildInputs = [ cmake pandoc ]; + buildInputs = [ capnproto sqlite boost zlib rapidjson ]; + preBuild = '' + mkdir -p js css + cp ${js.vue} js/vue.min.js + cp ${js.vue-router} js/vue-router.min.js + cp ${js.ansi_up} js/ansi_up.js + cp ${js.Chart} js/Chart.min.js + cp ${css.bootstrap} css/bootstrap.min.css + ''; + postInstall = '' + mv $out/usr/share $out + mkdir $out/bin + mv $out/usr/{bin,sbin}/* $out/bin + rmdir $out/usr/{bin,sbin} + rmdir $out/usr + + mkdir -p $out/share/doc/laminar + pandoc -s ../UserManual.md -o $out/share/doc/laminar/UserManual.html + '' + lib.optionalString (customConfig != null) '' + cp ${customConfig} /etc/etc/laminar.conf + '' + (if enableSystemd then '' + sed -i "s,/etc/,$out/etc/," $out/lib/systemd/system/laminar.service + sed -i "s,/usr/sbin/,$out/bin/," $out/lib/systemd/system/laminar.service + '' else '' + rm -r $out/lib # it contains only systemd unit file + ''); + + meta = with stdenv.lib; { + description = "Lightweight and modular continuous integration service"; + homepage = "https://laminar.ohwg.net"; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ kaction ]; + }; +} diff --git a/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch b/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch new file mode 100644 index 00000000000..80e74de95aa --- /dev/null +++ b/pkgs/development/tools/continuous-integration/laminar/patches/no-network.patch @@ -0,0 +1,26 @@ +Build system that downloads stuff from network is bad. Build system that +does so unconditionally is twice as bad. + +Required files are downloaded as separate fixed-output derivations and +put into correct location before build phase starts. + +--- laminar-0.8/CMakeLists.txt ++++ laminar-0.8-new/CMakeLists.txt +@@ -69,17 +69,6 @@ + COMMAND sh -c '( echo -n "\\#define INDEX_HTML_UNCOMPRESSED_SIZE " && wc -c < "${CMAKE_SOURCE_DIR}/src/resources/index.html" ) > index_html_size.h' + DEPENDS src/resources/index.html) + +-# Download 3rd-party frontend JS libs... +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue/2.3.4/vue.min.js +- js/vue.min.js EXPECTED_MD5 ae2fca1cfa0e31377819b1b0ffef704c) +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/vue-router/2.7.0/vue-router.min.js +- js/vue-router.min.js EXPECTED_MD5 5d3e35710dbe02de78c39e3e439b8d4e) +-file(DOWNLOAD https://raw.githubusercontent.com/drudru/ansi_up/v1.3.0/ansi_up.js +- js/ansi_up.js EXPECTED_MD5 158566dc1ff8f2804de972f7e841e2f6) +-file(DOWNLOAD https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.min.js +- js/Chart.min.js EXPECTED_MD5 f6c8efa65711e0cbbc99ba72997ecd0e) +-file(DOWNLOAD https://maxcdn.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css +- css/bootstrap.min.css EXPECTED_MD5 5d5357cb3704e1f43a1f5bfed2aebf42) + # ...and compile them + generate_compressed_bins(${CMAKE_BINARY_DIR} js/vue-router.min.js js/vue.min.js + js/ansi_up.js js/Chart.min.js css/bootstrap.min.css) diff --git a/pkgs/development/tools/coursier/default.nix b/pkgs/development/tools/coursier/default.nix index b54a831e955..f30acee3667 100644 --- a/pkgs/development/tools/coursier/default.nix +++ b/pkgs/development/tools/coursier/default.nix @@ -8,11 +8,11 @@ let in stdenv.mkDerivation rec { pname = "coursier"; - version = "2.0.0-RC6-18"; + version = "2.0.0-RC6-25"; src = fetchurl { url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "0vym99fyn0g8l5y2zvhf73ww17wywrh503wg5aw4nilj8w1ncvn2"; + sha256 = "0hkkfm18v2hvkf344ln9ka8gi3jdl6bvqpafc6h06f06vmp8prch"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index d2e2638a703..4858b84abfa 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dbmate"; - version = "1.9.1"; + version = "1.10.0"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "0s7ymw1r1k1s8kwyg6nxpgak6kh9z3649a0axdfpjnm62v283shd"; + sha256 = "09zb7r8f6m1w9ax9ayaxjzwmqcgx5f6x4lclfi1wdn6f6qaans4w"; }; - vendorSha256 = "00vp925vf9clk5bkw5fvj34id4v548rlssizh52z9psvdizj8q5p"; + vendorSha256 = "012kgdvw7hj3m40v3nnpg916n02nxv19zid07h8g4qwprzg49iq2"; doCheck = false; diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index a8e5f179916..772b654df93 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { - name = "doxygen-1.8.18"; + name = "doxygen-1.8.19"; src = fetchurl { urls = [ "mirror://sourceforge/doxygen/${name}.src.tar.gz" # faster, with https, etc. "http://doxygen.nl/files/${name}.src.tar.gz" ]; - sha256 = "0mh6s1ri1fs5yb27m0avnjsbcxpchgb9aaprq4bd3lj6vjg3s5qq"; + sha256 = "1lvqfw2yzba588c5ggl8yhw7aw4xkk44mrghsd9yqlajc48x25dc"; }; nativeBuildInputs = [ diff --git a/pkgs/development/tools/dot-http/default.nix b/pkgs/development/tools/dot-http/default.nix new file mode 100644 index 00000000000..1c81a4145d2 --- /dev/null +++ b/pkgs/development/tools/dot-http/default.nix @@ -0,0 +1,28 @@ +{ stdenv, rustPlatform, fetchFromGitHub, pkg-config, openssl, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "dot-http"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bayne"; + repo = pname; + rev = "v${version}"; + sha256 = "1s2q4kdldhb5gd14g2h6vzrbjgbbbs9zp2dgmna0rhk1h4qv0mml"; + }; + + cargoSha256 = "0an3hskq1k2j4gdn8wvhfb9pqsc34ibs5bv7sjznkp5jma6fdr9w"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "Text-based scriptable HTTP client"; + homepage = "https://github.com/bayne/dot-http"; + license = licenses.asl20; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/pkgs/development/tools/dt-schema/default.nix b/pkgs/development/tools/dt-schema/default.nix new file mode 100644 index 00000000000..5cba13b6689 --- /dev/null +++ b/pkgs/development/tools/dt-schema/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, git +, ruamel_yaml +, jsonschema +, rfc3987 +, setuptools +, setuptools_scm +}: + +buildPythonPackage rec { + pname = "dtschema"; + version = "2020.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zdm0zbn1dfk02yqghfvd0nb26hmzivb6mln6bvxjfdcv6n7pdqf"; + }; + + nativeBuildInputs = [ setuptools_scm git ]; + propagatedBuildInputs = [ + setuptools + ruamel_yaml + jsonschema + rfc3987 + ]; + + meta = with lib; { + description = "Tooling for devicetree validation using YAML and jsonschema"; + homepage = "https://github.com/devicetree-org/dt-schema/"; + # all files have SPDX tags + license = with licenses; [ bsd2 gpl2 ]; + maintainers = with maintainers; [ sorki ]; + }; +} + diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix new file mode 100644 index 00000000000..d3907718e9d --- /dev/null +++ b/pkgs/development/tools/ginkgo/default.nix @@ -0,0 +1,22 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "ginkgo"; + version = "1.14.0"; + + src = fetchFromGitHub { + owner = "onsi"; + repo = "ginkgo"; + rev = "v${version}"; + sha256 = "0nwvz0pqk2jqscq88fhppad4flrr8avkxfgbci4xklbar4g8i32v"; + }; + vendorSha256 = "072amyw1ir18v9vk268j2y7dhw3lfwvxzvzsdqhnp50rxsa911bx"; + doCheck = false; + + meta = with stdenv.lib; { + description = "BDD Testing Framework for Go"; + homepage = "https://github.com/onsi/ginkgo"; + license = licenses.mit; + maintainers = with maintainers; [ saschagrunert ]; + }; +} diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index 85aab26e415..4ce65518a85 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -1,4 +1,4 @@ -{ stdenv, go, buildGoModule, fetchgit }: +{ stdenv, buildGoModule, fetchgit }: buildGoModule rec { pname = "gopls"; diff --git a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix index 98f1b0c494c..9674ca1272d 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/hls-ghcide.nix @@ -18,8 +18,8 @@ mkDerivation { version = "0.2.0"; src = fetchgit { url = "https://github.com/wz1000/ghcide"; - sha256 = "1zq7ngaak8il91a309rl51dghzasnk4m2sm3av6d93cyqyra1hfc"; - rev = "078e3d3c0d319f83841ccbcdc60ff5f0e243f6be"; + sha256 = "112bsk2660750n94gnsgrvd30rk0ccxb8dbhka606a11pcqv5cgx"; + rev = "3f6cd4553279ec47d1599b502720791a4f4613cd"; fetchSubmodules = true; }; isLibrary = true; diff --git a/pkgs/development/tools/haskell/haskell-language-server/update.sh b/pkgs/development/tools/haskell/haskell-language-server/update.sh index 498859843c4..002ccab4011 100755 --- a/pkgs/development/tools/haskell/haskell-language-server/update.sh +++ b/pkgs/development/tools/haskell/haskell-language-server/update.sh @@ -26,7 +26,7 @@ ghcide_old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$ghcide_derivati # This is the revision of ghcide used by hls on GitHub. ghcide_new_version=$(curl --silent "https://api.github.com/repos/haskell/haskell-language-server/contents/ghcide" | jq '.sha' --raw-output) -echo "Updating haskell-language-server from old version $ghcide_old_version to new version $ghcide_new_version." +echo "Updating haskell-language-server's ghcide from old version $ghcide_old_version to new version $ghcide_new_version." echo "Running cabal2nix and outputting to ${ghcide_derivation_file}..." cabal2nix --revision "$ghcide_new_version" "https://github.com/wz1000/ghcide" > "$ghcide_derivation_file" diff --git a/pkgs/development/tools/icestorm/default.nix b/pkgs/development/tools/icestorm/default.nix index 091a4638433..15ca059a880 100644 --- a/pkgs/development/tools/icestorm/default.nix +++ b/pkgs/development/tools/icestorm/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "icestorm"; - version = "2020.07.08"; + version = "2020.08.19"; passthru = rec { pythonPkg = if usePyPy then pypy3 else python3; @@ -19,10 +19,10 @@ stdenv.mkDerivation rec { }; src = fetchFromGitHub { - owner = "cliffordwolf"; + owner = "YosysHQ"; repo = "icestorm"; - rev = "d12308775684cf43ab923227235b4ad43060015e"; - sha256 = "18ykv6np8sp7rb7c1cm3ha3qnj280gpkyn476faahb15jh0nbjmw"; + rev = "da52117ccd5b4147f64dc7345357ec5439cd7543"; + sha256 = "072bl3vmvb06ry0ci3b1sfjpm3iigb874khzja4azcai969ybp4k"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/tools/java/visualvm/default.nix b/pkgs/development/tools/java/visualvm/default.nix index ab90cbea83d..6cf97277bb5 100644 --- a/pkgs/development/tools/java/visualvm/default.nix +++ b/pkgs/development/tools/java/visualvm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchzip, lib, makeWrapper, makeDesktopItem, jdk, gawk }: stdenv.mkDerivation rec { - version = "2.0.3"; + version = "2.0.4"; pname = "visualvm"; src = fetchzip { url = "https://github.com/visualvm/visualvm.src/releases/download/${version}/visualvm_${builtins.replaceStrings ["."] [""] version}.zip"; - sha256 = "1pwgsasja30xbm1ma0kp4nami2nwyy6aizam8nfl6jd7jkz4d7mk"; + sha256 = "1ic6gjsw90j7pr1yyplmk1zc319ld49i6d4zlgs7mlz1m4bn5jv3"; }; desktopItem = makeDesktopItem { diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index c1c915cb8e4..3864337badf 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.10"; + version = "0.2.13"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "v${version}"; - sha256 = "0xmrb8wbxkb52l2c7fxxy5wa9lsl591fl65zicv0nrbil36q4wfd"; + sha256 = "112vmq9wg31alw9lw1jmsdvkd7kz1d9ak4p9dli7vgr9rhdf0hnb"; }; - vendorSha256 = "0qf26g0a2j1mbzlc7xjackww22w9bl1x0iw3q1x6kq7fp8xiwhdn"; + vendorSha256 = "0bcrw3hf92m7n58lrlm0vj1wiwwy82q2rl1a725q3d6xwvi5kh9h"; doCheck = false; diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 7702df423bb..a4806634432 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -17,20 +17,19 @@ }: let - basename = "gdb-${version}"; - version = "9.2"; + basename = "gdb"; + targetPrefix = stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + "${stdenv.targetPlatform.config}-"; in assert pythonSupport -> python3 != null; stdenv.mkDerivation rec { - name = - stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) - (stdenv.targetPlatform.config + "-") - + basename; + pname = targetPrefix + basename; + version = "9.2"; src = fetchurl { - url = "mirror://gnu/gdb/${basename}.tar.xz"; + url = "mirror://gnu/gdb/${basename}-${version}.tar.xz"; sha256 = "0mf5fn8v937qwnal4ykn3ji1y2sxk0fa1yfqi679hxmpg6pdf31n"; }; diff --git a/pkgs/development/tools/misc/itm-tools/cargo-lock.patch b/pkgs/development/tools/misc/itm-tools/cargo-lock.patch new file mode 100644 index 00000000000..1559510cd9f --- /dev/null +++ b/pkgs/development/tools/misc/itm-tools/cargo-lock.patch @@ -0,0 +1,321 @@ +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..d9d39e5 +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,315 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "addr2line" ++version = "0.12.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "602d785912f476e480434627e8732e6766b760c045bbf897d9dfaa9f4fbd399c" ++dependencies = [ ++ "gimli", ++] ++ ++[[package]] ++name = "adler32" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "567b077b825e468cc974f0020d4082ee6e03132512f207ef1a02fd5d00d1f32d" ++ ++[[package]] ++name = "ansi_term" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "backtrace" ++version = "0.3.49" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05100821de9e028f12ae3d189176b41ee198341eb8f369956407fea2f5cc666c" ++dependencies = [ ++ "addr2line", ++ "cfg-if", ++ "libc", ++ "miniz_oxide", ++ "object", ++ "rustc-demangle", ++] ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "byteorder" ++version = "1.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "clap" ++version = "2.33.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129" ++dependencies = [ ++ "ansi_term", ++ "atty", ++ "bitflags", ++ "strsim", ++ "textwrap", ++ "unicode-width", ++ "vec_map", ++] ++ ++[[package]] ++name = "either" ++version = "1.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" ++ ++[[package]] ++name = "exitfailure" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2ff5bd832af37f366c6c194d813a11cd90ac484f124f079294f28e357ae40515" ++dependencies = [ ++ "failure", ++] ++ ++[[package]] ++name = "failure" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" ++dependencies = [ ++ "backtrace", ++ "failure_derive", ++] ++ ++[[package]] ++name = "failure_derive" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "synstructure", ++] ++ ++[[package]] ++name = "gimli" ++version = "0.21.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bcc8e0c9bce37868955864dbecd2b1ab2bdf967e6f28066d65aaac620444b65c" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "itm" ++version = "0.4.0" ++source = "git+https://github.com/rust-embedded/itm#5dd476d03de0738062a876fd3845900ab04833a4" ++dependencies = [ ++ "byteorder", ++ "either", ++ "thiserror", ++] ++ ++[[package]] ++name = "itm-tools" ++version = "0.1.0" ++dependencies = [ ++ "clap", ++ "exitfailure", ++ "failure", ++ "itm", ++ "rustc-demangle", ++ "xmas-elf", ++] ++ ++[[package]] ++name = "libc" ++version = "0.2.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" ++ ++[[package]] ++name = "miniz_oxide" ++version = "0.3.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" ++dependencies = [ ++ "adler32", ++] ++ ++[[package]] ++name = "object" ++version = "0.20.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1ab52be62400ca80aa00285d25253d7f7c437b7375c4de678f5405d3afe82ca5" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rustc-demangle" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" ++ ++[[package]] ++name = "strsim" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" ++ ++[[package]] ++name = "syn" ++version = "1.0.33" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "synstructure" ++version = "0.12.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b834f2d66f734cb897113e34aaff2f1ab4719ca946f9a7358dba8f8064148701" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "thiserror" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" ++dependencies = [ ++ "thiserror-impl", ++] ++ ++[[package]] ++name = "thiserror-impl" ++version = "1.0.20" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "vec_map" ++version = "0.8.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" ++ ++[[package]] ++name = "xmas-elf" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "22678df5df766e8d1e5d609da69f0c3132d794edf6ab5e75e7abcd2270d4cf58" ++dependencies = [ ++ "zero", ++] ++ ++[[package]] ++name = "zero" ++version = "0.1.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5f1bc8a6b2005884962297587045002d8cfb8dcec9db332f4ca216ddc5de82c5" diff --git a/pkgs/development/tools/misc/itm-tools/default.nix b/pkgs/development/tools/misc/itm-tools/default.nix new file mode 100644 index 00000000000..6fb25695111 --- /dev/null +++ b/pkgs/development/tools/misc/itm-tools/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, rustPlatform, pkg-config }: + +rustPlatform.buildRustPackage rec { + pname = "itm-tools"; + version = "unstable-2019-11-15"; + + src = fetchFromGitHub { + owner = "japaric"; + repo = pname; + rev = "e94155e44019d893ac8e6dab51cc282d344ab700"; + sha256 = "19xkjym0i7y52cfhvis49c59nzvgw4906cd8bkz8ka38mbgfqgiy"; + }; + + cargoPatches = [ ./cargo-lock.patch ]; + + cargoSha256 = "0rl2ph5igwjl7rwpwcf6afnxly5av7cd6va6wn82lxm606giyq75"; + + nativeBuildInputs = [ pkg-config ]; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Tools for analyzing ITM traces"; + homepage = "https://github.com/japaric/itm-tools"; + license = with licenses; [ asl20 mit ]; + maintainers = with maintainers; [ hh sb0 ]; + }; +} \ No newline at end of file diff --git a/pkgs/development/tools/misc/kimg/default.nix b/pkgs/development/tools/misc/kimg/default.nix new file mode 100644 index 00000000000..b6f490e1d9d --- /dev/null +++ b/pkgs/development/tools/misc/kimg/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, imagemagick }: + +stdenv.mkDerivation rec { + pname = "kimg"; + version = "0.3.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kimg"; + rev = version; + sha256 = "00gj420m0jvhgm8kkslw8r69nl7r73bxrh6gqs2mx16ymcpkanpk"; + }; + + nativeBuildInputs = [ cmake asciidoc pkg-config ]; + + buildInputs = [ imagemagick ]; + + hardeningDisable = [ "format" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "Converts image formats supported by ImageMagick to the KnightOS image format"; + license = licenses.mit; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/tools/misc/kpack/default.nix b/pkgs/development/tools/misc/kpack/default.nix new file mode 100644 index 00000000000..96af43e6160 --- /dev/null +++ b/pkgs/development/tools/misc/kpack/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, cmake, asciidoc, libxslt, docbook_xsl }: + +stdenv.mkDerivation rec { + pname = "kpack"; + + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "KnightOS"; + repo = "kpack"; + rev = version; + sha256 = "0kakfbzdvq5ldv1gdzl473j73c9nfdyx4xzfkriglkrqmksqc329"; + }; + + nativeBuildInputs = [ cmake ]; + + buildInputs = [ asciidoc libxslt.bin docbook_xsl ]; + + hardeningDisable = [ "fortify" ]; + + meta = with stdenv.lib; { + homepage = "https://knightos.org/"; + description = "A tool to create or extract KnightOS packages"; + license = licenses.lgpl2Only; + maintainers = with maintainers; [ siraben ]; + }; +} diff --git a/pkgs/development/tools/misc/nix-build-uncached/default.nix b/pkgs/development/tools/misc/nix-build-uncached/default.nix index 9bff7acc81d..eca2dc96662 100644 --- a/pkgs/development/tools/misc/nix-build-uncached/default.nix +++ b/pkgs/development/tools/misc/nix-build-uncached/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub, nix, makeWrapper }: +{ lib, buildGoModule, fetchFromGitHub, makeWrapper }: buildGoModule rec { pname = "nix-build-uncached"; @@ -17,11 +17,6 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - postInstall = '' - wrapProgram $out/bin/nix-build-uncached \ - --prefix PATH ":" ${lib.makeBinPath [ nix ]} - ''; - meta = with lib; { description = "A CI friendly wrapper around nix-build"; license = licenses.mit; diff --git a/pkgs/development/tools/misc/objconv/default.nix b/pkgs/development/tools/misc/objconv/default.nix index 9fdaca52ca8..52cc1b2d5c5 100644 --- a/pkgs/development/tools/misc/objconv/default.nix +++ b/pkgs/development/tools/misc/objconv/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "objconv"; - version = "2.51"; + version = "2.52"; src = fetchurl { # Versioned archive of objconv sources maintained by orivej. url = "https://archive.org/download/objconv/${pname}-${version}.zip"; - sha256 = "0wp6ld9vk11f4nnkn56627zmlv9k5vafi99qa3yyn1pgcd61zcfs"; + sha256 = "0r117r7yvqvvdgwgwxpkyzi6p5nm0xb6p67wvkmvggm9fdyl3z8v"; }; nativeBuildInputs = [ unzip ]; diff --git a/pkgs/development/tools/misc/swig/4.nix b/pkgs/development/tools/misc/swig/4.nix index a35a9a35281..4096b7353fa 100644 --- a/pkgs/development/tools/misc/swig/4.nix +++ b/pkgs/development/tools/misc/swig/4.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "swig"; - version = "4.0.1"; + version = "4.0.2"; src = fetchFromGitHub { owner = "swig"; repo = "swig"; rev = "rel-${version}"; - sha256 = "1i1gl5gd6b5i1hiazq7m4nvlq86zd0fhk052xhwlnb596pjhgyhf"; + sha256 = "12vlps766xvwck8q0i280s8yx21qm2dxl34710ybpmz3c1cfdjsc"; }; PCRE_CONFIG = "${pcre.dev}/bin/pcre-config"; diff --git a/pkgs/development/tools/misc/terraform-ls/default.nix b/pkgs/development/tools/misc/terraform-ls/default.nix index fe928bd3933..714416f9685 100644 --- a/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "terraform-ls"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "0bb6bpdjp9yzbxvc6mz22lawn41ay0frdpgbd7zrm8nkvspc0rl7"; + sha256 = "0yhpxb9dkwi6rlabr0sd5rk15q0bin6yhww171jrzlnfl036l0sl"; }; goPackagePath = "github.com/hashicorp/terraform-ls"; diff --git a/pkgs/development/tools/misc/terraformer/default.nix b/pkgs/development/tools/misc/terraformer/default.nix new file mode 100644 index 00000000000..6ff0dd77aae --- /dev/null +++ b/pkgs/development/tools/misc/terraformer/default.nix @@ -0,0 +1,24 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraformer"; + version = "0.8.8"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = pname; + rev = version; + sha256 = "1lzf30vpa0blbkz4ngnhrn3hpbqflqd4sni4bly9yqh4fnc44nvi"; + }; + + vendorSha256 = "087448wkaw6jxv9d26hck4w3vdh06vcgywna6ydkqvxr0hp011b6"; + + subPackages = [ "." ]; + + meta = with lib; { + description = "CLI tool to generate terraform files from existing infrastructure (reverse Terraform). Infrastructure to Code"; + homepage = "https://github.com/GoogleCloudPlatform/terraformer"; + license = licenses.asl20; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/development/tools/node-webkit/nw12.nix b/pkgs/development/tools/node-webkit/nw12.nix index 307e123bf77..ffd2a78f509 100644 --- a/pkgs/development/tools/node-webkit/nw12.nix +++ b/pkgs/development/tools/node-webkit/nw12.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper +{ stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk2, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap , libnotify}: @@ -39,7 +39,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nwjc - ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}:$out/share/nwjs" $out/share/nwjs/nw patchelf --set-rpath "${nwEnv}/lib:${nwEnv}/lib64:$out/share/nwjs" $out/share/nwjs/nwjc diff --git a/pkgs/development/tools/nwjs/default.nix b/pkgs/development/tools/nwjs/default.nix index ab16d951151..4eedc003272 100644 --- a/pkgs/development/tools/nwjs/default.nix +++ b/pkgs/development/tools/nwjs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildEnv, makeWrapper +{ stdenv, lib, fetchurl, buildEnv, makeWrapper , xorg, alsaLib, dbus, glib, gtk3, atk, pango, freetype, fontconfig , gdk-pixbuf, cairo, nss, nspr, gconf, expat, systemd, libcap @@ -61,7 +61,7 @@ in stdenv.mkDerivation rec { patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/nwjs/nw - ln -s ${systemd.lib}/lib/libudev.so $out/share/nwjs/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so $out/share/nwjs/libudev.so.0 libpath="$out/share/nwjs/lib/" for f in "$libpath"/*.so; do diff --git a/pkgs/development/tools/ocaml/dune/2.nix b/pkgs/development/tools/ocaml/dune/2.nix index d785302ebb5..eac705294f3 100644 --- a/pkgs/development/tools/ocaml/dune/2.nix +++ b/pkgs/development/tools/ocaml/dune/2.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, ocaml, findlib }: -if stdenv.lib.versionOlder ocaml.version "4.07" +if stdenv.lib.versionOlder ocaml.version "4.08" then throw "dune is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { pname = "dune"; - version = "2.6.2"; + version = "2.7.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "1sc8ax198z42vhc3l6i04kknm9g44whifjivs19qgi3sybrw2vjg"; + sha256 = "058wiyncczbmlfxj3cnwn5n68wkmbaf4mgjm2bkp2hffpn2wl5xl"; }; buildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 4b11dd13983..ed1a4361120 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "merlin"; - version = "3.3.6"; + version = "3.3.8"; minimumOCamlVersion = "4.02.1"; src = fetchurl { url = "https://github.com/ocaml/merlin/releases/download/v${version}/merlin-v${version}.tbz"; - sha256 = "1360cm0jkn2v2y5p3yzdyw9661a1vpddcibkbfblmk95qafx4civ"; + sha256 = "0j27piq9hqhr2jp89ni73kchw33pcx7gnjkh8rd6qa8hc12xd794"; }; buildInputs = [ yojson ]; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index b9404016b4e..9c888e284fc 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -1,15 +1,15 @@ -{ lib, fetchurl, buildDunePackage, ocp-build, ocp-indent, cmdliner, re }: +{ lib, fetchzip, buildDunePackage, cppo, ocp-indent, cmdliner, re }: buildDunePackage rec { pname = "ocp-index"; - version = "1.2"; + version = "1.2.1"; - src = fetchurl { - url = "https://github.com/OCamlPro/ocp-index/releases/download/${version}/ocp-index-${version}.tbz"; - sha256 = "1lchw02sakjjppmzr0rzlarwbg1lc2bl7pwcfpsiycnaz46x6gmr"; + src = fetchzip { + url = "https://github.com/OCamlPro/ocp-index/archive/${version}.tar.gz"; + sha256 = "08r7mxdnxmhff37fw4hmrpjgckgi5kaiiiirwp4rmdl594z0h9c8"; }; - buildInputs = [ ocp-build cmdliner re ]; + buildInputs = [ cppo cmdliner re ]; propagatedBuildInputs = [ ocp-indent ]; diff --git a/pkgs/development/tools/open-policy-agent/default.nix b/pkgs/development/tools/open-policy-agent/default.nix index c91727d6f11..d31a7e3ab60 100644 --- a/pkgs/development/tools/open-policy-agent/default.nix +++ b/pkgs/development/tools/open-policy-agent/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "open-policy-agent"; - version = "0.22.0"; + version = "0.23.2"; goPackagePath = "github.com/open-policy-agent/opa"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "1kndiiqf6b4j8zhv0ypjr9dfjgck25qiqa2bb0pmpm3j9460zzjs"; + sha256 = "18hpanfrzg6xnq1g0yws6g0lw4y191pnrqphccv13j6kqk3k10ps"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 2cfe95152a3..909e821a6d1 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { pname = "packer"; - version = "1.6.1"; + version = "1.6.2"; goPackagePath = "github.com/hashicorp/packer"; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "packer"; rev = "v${version}"; - sha256 = "0jm8950rk0cdf84z0yxm8ic3pm353cgmxr1akn6kq1bwg2w0vsrq"; + sha256 = "0kr9whv3s0f8866yjmwg311j3kcj29bp5xwpnv43ama4m1mq3bm7"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/tools/parsing/bison/default.nix b/pkgs/development/tools/parsing/bison/default.nix index 357c8ea17cf..ca422f931da 100644 --- a/pkgs/development/tools/parsing/bison/default.nix +++ b/pkgs/development/tools/parsing/bison/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "bison"; - version = "3.6.4"; + version = "3.7.1"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz"; - sha256 = "1s8kmfhg7a58vm65fc977ckp8zspy8diayrcjhs3cgrqnmjdx0w1"; + sha256 = "04vx6sah3bnr3a5n9knw306sb3y41pjfl7k9ihbsimghkj1m5n8x"; }; nativeBuildInputs = [ m4 perl ] ++ stdenv.lib.optional stdenv.isSunOS help2man; diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix index 51af3acdacd..b91acdca688 100644 --- a/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -55,13 +55,16 @@ in rustPlatform.buildRustPackage { # needed for the tests rm -rf test/fixtures/grammars ln -s ${grammars} test/fixtures/grammars + + # These functions do not appear in the source code + sed -i /_ts_query_context/d lib/binding_web/exports.json + sed -i /___assert_fail/d lib/binding_web/exports.json ''; # Compile web assembly with emscripten. The --debug flag prevents us from # minifying the JavaScript; passing it allows us to side-step more Node # JS dependencies for installation. preBuild = '' - HOME=/tmp bash ./script/build-wasm --debug ''; diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 1474ba56a14..3a6ea879e58 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -18,11 +18,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2020.6.2"; + version = "2020.8.13"; src = fetchPypi { inherit pname version; - sha256 = "12s7c3f3k5v1szdhklsxwisf9v3dk4mb9fh7762afpgs8mrrmm3x"; + sha256 = "eff0e10eadb330f612edfa5051d3d8e775e9e0e918c3c50361da703bd0daa035"; }; LC_ALL = "en_US.UTF-8"; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix index 5fb646fae88..cca876ca1e6 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/default.nix @@ -24,7 +24,7 @@ in lib.makeScope pkgs.newScope (self: { # Poetry2nix version - version = "1.11.0"; + version = "1.12.0"; /* Returns an attrset { python, poetryPackages, pyProject, poetryLock } for the given pyproject/lockfile. @@ -114,7 +114,7 @@ lib.makeScope pkgs.newScope (self: { __toPluginAble = toPluginAble self; - inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook; + inherit (hooks) pipBuildHook removePathDependenciesHook poetry2nixFixupHook wheelUnpackHook; } ) # Null out any filtered packages, we don't want python.pkgs from nixpkgs @@ -159,13 +159,28 @@ lib.makeScope pkgs.newScope (self: { } ); + inherit (py) pyProject; + + # Add executables from tool.poetry.scripts + scripts = pyProject.tool.poetry.scripts or { }; + hasScripts = scripts != { }; + scriptsPackage = import ./shell-scripts.nix { + inherit scripts lib; + inherit (py) python; + }; + + hasEditable = editablePackageSources != { }; editablePackage = import ./editable.nix { inherit pkgs lib poetryLib editablePackageSources; inherit (py) pyProject python; }; in - py.python.withPackages (_: py.poetryPackages ++ lib.optional (editablePackageSources != { }) editablePackage); + py.python.withPackages ( + _: py.poetryPackages + ++ lib.optional hasEditable editablePackage + ++ lib.optional hasScripts scriptsPackage + ); /* Creates a Python application from pyproject.toml and poetry.lock diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix index 001a3d09c6b..e248a5e2235 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/default.nix @@ -49,4 +49,16 @@ in } ./fixup-hook.sh ) { }; + # When the "wheel" package itself is a wheel the nixpkgs hook (which pulls in "wheel") leads to infinite recursion + # It doesn't _really_ depend on wheel though, it just copies the wheel. + wheelUnpackHook = callPackage + ({}: + makeSetupHook + { + name = "wheel-unpack-hook.sh"; + deps = [ ]; + } ./wheel-unpack-hook.sh + ) { }; + + } diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh new file mode 100644 index 00000000000..fca808a933b --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/hooks/wheel-unpack-hook.sh @@ -0,0 +1,18 @@ +# Setup hook to use in case a wheel is fetched +echo "Sourcing wheel setup hook" + +wheelUnpackPhase(){ + echo "Executing wheelUnpackPhase" + runHook preUnpack + + mkdir -p dist + cp "$src" "dist/$(stripHash "$src")" + +# runHook postUnpack # Calls find...? + echo "Finished executing wheelUnpackPhase" +} + +if [ -z "${dontUseWheelUnpack-}" ] && [ -z "${unpackPhase-}" ]; then + echo "Using wheelUnpackPhase" + unpackPhase=wheelUnpackPhase +fi diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix index 6b784fd8fc5..2791d7dfcb4 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/mk-poetry-dep.nix @@ -47,10 +47,16 @@ pythonPackages.callPackage isGit = isSource && source.type == "git"; isLocal = isSource && source.type == "directory"; localDepPath = toPath source.url; - pyProject = poetryLib.readTOML (localDepPath + "/pyproject.toml"); - buildSystemPkgs = poetryLib.getBuildSystemPkgs { - inherit pythonPackages pyProject; - }; + + buildSystemPkgs = + let + pyProjectPath = localDepPath + "/pyproject.toml"; + pyProject = poetryLib.readTOML pyProjectPath; + in + if builtins.pathExists pyProjectPath then poetryLib.getBuildSystemPkgs { + inherit pythonPackages pyProject; + } else [ ]; + fileInfo = let isBdist = f: lib.strings.hasSuffix "whl" f.file; diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix index 202261ecdb9..d722ec71b9a 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/overrides.nix @@ -12,6 +12,40 @@ self: super: } ); + ansible = super.ansible.overridePythonAttrs ( + old: { + + prePatch = pkgs.python.pkgs.ansible.prePatch or ""; + + postInstall = pkgs.python.pkgs.ansible.postInstall or ""; + + # Inputs copied from nixpkgs as ansible doesn't specify it's dependencies + # in a correct manner. + propagatedBuildInputs = old.propagatedBuildInputs ++ [ + self.pycrypto + self.paramiko + self.jinja2 + self.pyyaml + self.httplib2 + self.six + self.netaddr + self.dnspython + self.jmespath + self.dopy + self.ncclient + ]; + } + ); + + ansible-lint = super.ansible-lint.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + preBuild = '' + export HOME=$(mktemp -d) + ''; + } + ); + astroid = super.astroid.overridePythonAttrs ( old: rec { buildInputs = old.buildInputs ++ [ self.pytest-runner ]; @@ -135,6 +169,15 @@ self: super: } ); + h3 = super.h3.overridePythonAttrs ( + old: { + preBuild = (old.preBuild or "") + '' + substituteInPlace h3/h3.py \ + --replace "'{}/{}'.format(_dirname, libh3_path)" '"${pkgs.h3}/lib/libh3${pkgs.stdenv.hostPlatform.extensions.sharedLibrary}"' + ''; + } + ); + h5py = super.h5py.overridePythonAttrs ( old: if old.format != "wheel" then rec { @@ -324,6 +367,13 @@ self: super: pkgs.pkgconfig ]; + postPatch = '' + cat > setup.cfg <<EOF + [libs] + system_freetype = True + EOF + ''; + propagatedBuildInputs = old.propagatedBuildInputs ++ [ pkgs.libpng pkgs.freetype @@ -357,6 +407,23 @@ self: super: } ); + molecule = + if lib.versionOlder super.molecule.version "3.0.0" then (super.molecule.overridePythonAttrs ( + old: { + patches = (old.patches or [ ]) ++ [ + # Fix build with more recent setuptools versions + (pkgs.fetchpatch { + url = "https://github.com/ansible-community/molecule/commit/c9fee498646a702c77b5aecf6497cff324acd056.patch"; + sha256 = "1g1n45izdz0a3c9akgxx14zhdw6c3dkb48j8pq64n82fa6ndl1b7"; + excludes = [ "pyproject.toml" ]; + }) + ]; + buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + } + )) else super.molecule.overridePythonAttrs (old: { + buildInputs = old.buildInputs ++ [ self.setuptools-scm-git-archive ]; + }); + netcdf4 = super.netcdf4.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -451,12 +518,16 @@ self: super: psycopg2 = super.psycopg2.overridePythonAttrs ( old: { + buildInputs = old.buildInputs + ++ lib.optional stdenv.isDarwin pkgs.openssl; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; } ); psycopg2-binary = super.psycopg2-binary.overridePythonAttrs ( old: { + buildInputs = old.buildInputs + ++ lib.optional stdenv.isDarwin pkgs.openssl; nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.postgresql ]; } ); @@ -753,6 +824,12 @@ self: super: } ); + ffmpeg-python = super.ffmpeg-python.overridePythonAttrs ( + old: { + buildInputs = old.buildInputs ++ [ self.pytest-runner ]; + } + ); + python-prctl = super.python-prctl.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ [ @@ -882,6 +959,9 @@ self: super: } ); + # nix uses a dash, poetry uses an underscore + typing_extensions = super.typing_extensions or self.typing-extensions; + urwidtrees = super.urwidtrees.overridePythonAttrs ( old: { propagatedBuildInputs = old.propagatedBuildInputs ++ [ @@ -898,6 +978,16 @@ self: super: } ); + vispy = super.vispy.overrideAttrs ( + old: { + inherit (pkgs.python3.pkgs.vispy) patches; + nativeBuildInputs = old.nativeBuildInputs ++ [ + self.cython + self.setuptools-scm-git-archive + ]; + } + ); + uvloop = super.uvloop.overridePythonAttrs ( old: { buildInputs = old.buildInputs ++ lib.optionals stdenv.isDarwin [ @@ -907,17 +997,34 @@ self: super: } ); + # Stop infinite recursion by using bootstrapped pkg from nixpkgs - wheel = ( - pkgs.python3.pkgs.override { + bootstrapped-pip = super.bootstrapped-pip.override { + wheel = (pkgs.python3.pkgs.override { python = self.python; - } - ).wheel.overridePythonAttrs ( - old: - if old.format == "other" then old else { - inherit (super.wheel) pname name version src; - } - ); + }).wheel; + }; + wheel = + let + isWheel = super.wheel.src.isWheel or false; + # If "wheel" is a pre-built binary wheel + wheelPackage = super.buildPythonPackage { + inherit (super.wheel) pname name version src; + inherit (pkgs.python3.pkgs.wheel) meta; + format = "wheel"; + }; + # If "wheel" is built from source + sourcePackage = ( + pkgs.python3.pkgs.override { + python = self.python; + } + ).wheel.overridePythonAttrs ( + old: { + inherit (super.wheel) pname name version src; + } + ); + in + if isWheel then wheelPackage else sourcePackage; zipp = ( diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix index 7135cace287..ffa78c5dc01 100644 --- a/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix +++ b/pkgs/development/tools/poetry2nix/poetry2nix/pep425.nix @@ -62,7 +62,7 @@ let selectWheel = files: let filesWithoutSources = (builtins.filter (x: hasSuffix ".whl" x.file) files); - isPyAbiCompatible = pyabi: x: x == "none" || lib.hasPrefix pyabi x || ( + isPyAbiCompatible = pyabi: x: x == "none" || lib.hasPrefix pyabi x || lib.hasPrefix x pyabi || ( # The CPython stable ABI is abi3 as in the shared library suffix. python.passthru.implementation == "cpython" && builtins.elemAt (lib.splitString "." python.version) 0 == "3" && diff --git a/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix b/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix new file mode 100644 index 00000000000..cbaa4439afe --- /dev/null +++ b/pkgs/development/tools/poetry2nix/poetry2nix/shell-scripts.nix @@ -0,0 +1,41 @@ +{ lib +, scripts +, python +}: +let + mkScript = bin: entrypoint: + let + elem = builtins.elemAt (builtins.split ":" entrypoint); + module = elem 0; + fn = elem 2; + in + '' + cat << EOF >> $out/bin/${bin} + #!${python.interpreter} + import sys + import re + + # Insert "" to add CWD to import path + sys.path.insert(0, "") + + from ${module} import ${fn} + + if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', "", sys.argv[0]) + sys.exit(${fn}()) + EOF + chmod +x $out/bin/${bin} + ''; +in +python.pkgs.buildPythonPackage { + name = "poetry2nix-env-scripts"; + dontUnpack = true; + dontUseSetuptoolsBuild = true; + dontConfigure = true; + dontUseSetuptoolsCheck = true; + + installPhase = '' + mkdir -p $out/bin + ${lib.concatStringsSep "\n" (lib.mapAttrsToList mkScript scripts)} + ''; +} diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 620bce7a0ff..ce731309882 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib , desktop-file-utils , fetchurl , fetchpatch @@ -50,7 +51,7 @@ stdenv.mkDerivation rec { wrapGAppsHook gnome3.adwaita-icon-theme ]; - buildInputs = [ glib gtk3 pango polkit systemd.dev systemd.lib libdazzle ]; + buildInputs = [ glib gtk3 pango polkit systemd.dev (lib.getLib systemd) libdazzle ]; mesonFlags = [ "-Dsystemdunitdir=lib/systemd/system" diff --git a/pkgs/development/tools/rust/cargo-cache/default.nix b/pkgs/development/tools/rust/cargo-cache/default.nix new file mode 100644 index 00000000000..0f3571045d6 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-cache/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, rustPlatform, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-cache"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "matthiaskrgr"; + repo = pname; + rev = version; + sha256 = "02d593w1x8160p4m3jwm1dyvv383cy7njijlcaw49jczxv5isqbi"; + }; + + cargoSha256 = "150ifd7gq6csrasqw91z4nsaj6w7kf69j0w6wydr3z7bdahmlgqw"; + + buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; + + checkFlagsArray = [ "offline_tests" ]; + + meta = with stdenv.lib; { + description = "Manage cargo cache (\${CARGO_HOME}, ~/.cargo/), print sizes of dirs and remove dirs selectively"; + homepage = "https://github.com/matthiaskrgr/cargo-cache"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ filalex77 ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-embed/default.nix b/pkgs/development/tools/rust/cargo-embed/default.nix new file mode 100644 index 00000000000..dafcd1ded2f --- /dev/null +++ b/pkgs/development/tools/rust/cargo-embed/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib +, rustPlatform, fetchFromGitHub +, libusb1, pkg-config, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-embed"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "probe-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "0klkgl7c42vhqxj6svw26lcr7rccq89bl17jn3p751x6281zvr35"; + }; + + cargoSha256 = "0w21q2fpr077m8jr24ld3qjimwk1m4fy9dh14fq9nv5xd4f5s8n8"; + + nativeBuildInputs = [ pkg-config rustfmt ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "A cargo extension for working with microcontrollers."; + homepage = "http://probe.rs/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fooker ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-flash/default.nix b/pkgs/development/tools/rust/cargo-flash/default.nix new file mode 100644 index 00000000000..d4844de21a0 --- /dev/null +++ b/pkgs/development/tools/rust/cargo-flash/default.nix @@ -0,0 +1,27 @@ +{ stdenv, lib +, rustPlatform, fetchFromGitHub +, libusb1, pkg-config, rustfmt }: + +rustPlatform.buildRustPackage rec { + pname = "cargo-flash"; + version = "0.8.0"; + + src = fetchFromGitHub { + owner = "probe-rs"; + repo = pname; + rev = "v${version}"; + sha256 = "1bcpv1r4pdpp22w7za7kdy7jl487x3nlwxiz6sqq3iq6wq3j9zj0"; + }; + + cargoSha256 = "1pf117fgw9x9diksqv58cw7i0kzmp25yj73y5ll69sk46b6z4j90"; + + nativeBuildInputs = [ pkg-config rustfmt ]; + buildInputs = [ libusb1 ]; + + meta = with lib; { + description = "A cargo extension for working with microcontrollers."; + homepage = "http://probe.rs/"; + license = with licenses; [ asl20 /* or */ mit ]; + maintainers = with maintainers; [ fooker ]; + }; +} diff --git a/pkgs/development/tools/rust/cargo-fuzz/default.nix b/pkgs/development/tools/rust/cargo-fuzz/default.nix index ecdd2409abd..14c849ac0af 100644 --- a/pkgs/development/tools/rust/cargo-fuzz/default.nix +++ b/pkgs/development/tools/rust/cargo-fuzz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchurl, runCommand, rustPlatform }: +{ stdenv, fetchFromGitHub, rustPlatform }: rustPlatform.buildRustPackage rec { pname = "cargo-fuzz"; @@ -13,6 +13,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0zxhak79f50m8nw95ny733mk4x2f7kyk6q9v4f7jr2rkcldhgrpr"; + doCheck = false; + meta = with stdenv.lib; { description = "Command line helpers for fuzzing"; homepage = "https://github.com/rust-fuzz/cargo-fuzz"; diff --git a/pkgs/development/tools/rust/cargo-make/Cargo.lock b/pkgs/development/tools/rust/cargo-make/Cargo.lock deleted file mode 100644 index 3be32ff068e..00000000000 --- a/pkgs/development/tools/rust/cargo-make/Cargo.lock +++ /dev/null @@ -1,1283 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "adler" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e" - -[[package]] -name = "aho-corasick" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66" -dependencies = [ - "memchr 0.1.11", -] - -[[package]] -name = "aho-corasick" -version = "0.7.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043164d8ba5c4c3035fec9bbee8647c0261d788f3474306f93bb65901cae0e86" -dependencies = [ - "memchr 2.3.3", -] - -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8" - -[[package]] -name = "attohttpc" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe174d1b67f7b2bafed829c09db039301eb5841f66e43be2cf60b326e7f8e2cc" -dependencies = [ - "flate2", - "http", - "log", - "native-tls", - "openssl", - "url", -] - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "base64" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b41b7ea54a0c9d92199de89e20e58d49f02f8e699814ef3fdf266f6f748d15c7" - -[[package]] -name = "base64" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff" - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "blake2b_simd" -version = "0.5.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8fb2d74254a3a0b5cac33ac9f8ed0e44aa50378d9dbb2e5d83bd21ed1dc2c8a" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - -[[package]] -name = "bytes" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" - -[[package]] -name = "cargo-make" -version = "0.32.2" -dependencies = [ - "ci_info", - "clap", - "colored", - "dirs", - "duckscript", - "duckscriptsdk", - "envmnt", - "fern", - "fsio", - "git_info", - "glob", - "home", - "indexmap", - "log", - "run_script", - "rust_info", - "rusty-hook", - "semver", - "serde", - "serde_derive", - "serde_json", - "shell2batch", - "toml", -] - -[[package]] -name = "cc" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66120af515773fb005778dc07c261bd201ec8ce50bd6e7144c927753fe013381" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "chrono" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9213f7cd7c27e95c2b57c49f0e69b1ea65b27138da84a170133fd21b07659c00" -dependencies = [ - "num", - "time", -] - -[[package]] -name = "ci_info" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24f638c70e8c5753795cc9a8c07c44da91554a09e4cf11a7326e8161b0a3c45e" -dependencies = [ - "envmnt", -] - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "colored" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3616f750b84d8f0de8a58bda93e08e2a81ad3f523089b05f1dffecab48c6cbd" -dependencies = [ - "atty", - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - -[[package]] -name = "core-foundation" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "core-foundation-sys" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" - -[[package]] -name = "crc32fast" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-utils" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" -dependencies = [ - "autocfg", - "cfg-if", - "lazy_static 1.4.0", -] - -[[package]] -name = "dirs" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff" -dependencies = [ - "dirs-sys", -] - -[[package]] -name = "dirs-sys" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" -dependencies = [ - "libc", - "redox_users", - "winapi 0.3.9", -] - -[[package]] -name = "duckscript" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f4c3da85470786f086bd14c0b299092715a99f8d8bb0ac2b787cbaab71e6ba6" -dependencies = [ - "fsio", -] - -[[package]] -name = "duckscriptsdk" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15dee0b26565d497303de383d0e20dbb5f6e95cdcba902aee109dc55fe62b8af" -dependencies = [ - "attohttpc", - "base64 0.12.3", - "cfg-if", - "duckscript", - "fs_extra", - "fsio", - "ftp", - "glob", - "home", - "java-properties", - "meval", - "num_cpus", - "rand", - "serde_json", - "uname", - "walkdir", - "which", - "whoami", -] - -[[package]] -name = "encoding" -version = "0.2.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" -dependencies = [ - "encoding-index-japanese", - "encoding-index-korean", - "encoding-index-simpchinese", - "encoding-index-singlebyte", - "encoding-index-tradchinese", -] - -[[package]] -name = "encoding-index-japanese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-korean" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dc33fb8e6bcba213fe2f14275f0963fd16f0a02c878e3095ecfdf5bee529d81" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-simpchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d87a7194909b9118fc707194baa434a4e3b0fb6a5a757c73c3adb07aa25031f7" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-singlebyte" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3351d5acffb224af9ca265f435b859c7c01537c0849754d3db3fdf2bfe2ae84a" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding-index-tradchinese" -version = "1.20141219.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd0e20d5688ce3cab59eb3ef3a2083a5c77bf496cb798dc6fcdb75f323890c18" -dependencies = [ - "encoding_index_tests", -] - -[[package]] -name = "encoding_index_tests" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a246d82be1c9d791c5dfde9a2bd045fc3cbba3fa2b11ad558f27d01712f00569" - -[[package]] -name = "envmnt" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d328fc287c61314c4a61af7cfdcbd7e678e39778488c7cb13ec133ce0f4059" -dependencies = [ - "fsio", - "indexmap", -] - -[[package]] -name = "fern" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c9a4820f0ccc8a7afd67c39a0f1a0f4b07ca1725164271a64939d7aeb9af065" -dependencies = [ - "log", -] - -[[package]] -name = "flate2" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94" -dependencies = [ - "cfg-if", - "crc32fast", - "libc", - "miniz_oxide", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - -[[package]] -name = "fs_extra" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2a4a2034423744d2cc7ca2068453168dcdb82c438419e639a26bd87839c674" - -[[package]] -name = "fsio" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd087255f739f4f1aeea69f11b72f8080e9c2e7645cd06955dad4a178a49e3" -dependencies = [ - "rand", - "users", -] - -[[package]] -name = "ftp" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542951aad0071952c27409e3bd7cb62d1a3ad419c4e7314106bf994e0083ad5d" -dependencies = [ - "chrono", - "lazy_static 0.1.16", - "regex 0.1.80", -] - -[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "getrandom" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "git_info" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "641b847f0375f4b2c595438eefc17a9c0fbf47b400cbdd1ad9332bf1e16b779d" - -[[package]] -name = "glob" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" - -[[package]] -name = "hashbrown" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" -dependencies = [ - "autocfg", -] - -[[package]] -name = "hermit-abi" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" -dependencies = [ - "libc", -] - -[[package]] -name = "home" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "http" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28d569972648b2c512421b5f2a405ad6ac9666547189d0c5477a3f200f3e02f9" -dependencies = [ - "bytes", - "fnv", - "itoa", -] - -[[package]] -name = "idna" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02e2673c30ee86b5b96a9cb52ad15718aa1f966f5ab9ad54a8b95d5ca33120a9" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "indexmap" -version = "1.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b45e59b16c76b11bf9738fd5d38879d3bd28ad292d7b313608becb17ae2df9" -dependencies = [ - "autocfg", - "hashbrown", - "serde", -] - -[[package]] -name = "itoa" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" - -[[package]] -name = "java-properties" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caf4418ade5bde22a283a7f2fb537ea397ec102718f259f2630714e7a5b389fa" -dependencies = [ - "encoding", - "regex 1.3.9", -] - -[[package]] -name = "kernel32-sys" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -dependencies = [ - "winapi 0.2.8", - "winapi-build", -] - -[[package]] -name = "lazy_static" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf186d1a8aa5f5bee5fd662bc9c1b949e0259e1bcc379d1f006847b0080c7417" - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.76" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "755456fae044e6fa1ebbbd1b3e902ae19e73097ed4ed87bb79934a867c007bc3" - -[[package]] -name = "log" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "matches" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - -[[package]] -name = "memchr" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - -[[package]] -name = "meval" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79496a5651c8d57cd033c5add8ca7ee4e3d5f7587a4777484640d9cb60392d9" -dependencies = [ - "fnv", - "nom", -] - -[[package]] -name = "miniz_oxide" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be0f75932c1f6cfae3c04000e40114adf955636e19040f9c0a2c380702aa1c7f" -dependencies = [ - "adler", -] - -[[package]] -name = "native-tls" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" -dependencies = [ - "lazy_static 1.4.0", - "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", -] - -[[package]] -name = "nias" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab250442c86f1850815b5d268639dff018c0627022bc1940eb2d642ca1ce12f0" - -[[package]] -name = "nom" -version = "1.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5b8c256fd9471521bcb84c3cdba98921497f1a331cbc15b8030fc63b82050ce" - -[[package]] -name = "num" -version = "0.1.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -dependencies = [ - "num-integer", - "num-iter", - "num-traits", -] - -[[package]] -name = "num-integer" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.41" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "openssl" -version = "0.10.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d575eff3665419f9b83678ff2815858ad9d11567e082f5ac1814baba4e2bcb4" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "lazy_static 1.4.0", - "libc", - "openssl-sys", -] - -[[package]] -name = "openssl-probe" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de" - -[[package]] -name = "openssl-sys" -version = "0.9.58" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a842db4709b604f0fe5d1170ae3565899be2ad3d9cbc72dedc789ac0511f78de" -dependencies = [ - "autocfg", - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "percent-encoding" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" - -[[package]] -name = "pkg-config" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" - -[[package]] -name = "ppv-lite86" -version = "0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c36fa947111f5c62a733b652544dd0016a43ce89619538a8ef92724a6f501a20" - -[[package]] -name = "proc-macro2" -version = "1.0.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha", - "rand_core", - "rand_hc", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core", -] - -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - -[[package]] -name = "redox_users" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b23093265f8d200fa7b4c2c76297f47e681c655f6f1285a8780d6a022f7431" -dependencies = [ - "getrandom", - "redox_syscall", - "rust-argon2", -] - -[[package]] -name = "regex" -version = "0.1.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f" -dependencies = [ - "aho-corasick 0.5.3", - "memchr 0.1.11", - "regex-syntax 0.3.9", - "thread_local 0.2.7", - "utf8-ranges", -] - -[[package]] -name = "regex" -version = "1.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" -dependencies = [ - "aho-corasick 0.7.13", - "memchr 2.3.3", - "regex-syntax 0.6.18", - "thread_local 1.0.1", -] - -[[package]] -name = "regex-syntax" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957" - -[[package]] -name = "regex-syntax" -version = "0.6.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "run_script" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e8fc35067815a04a35fe2144361e1257b0f1041f0d413664f38e44d1a73cb4" -dependencies = [ - "fsio", -] - -[[package]] -name = "rust-argon2" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bc8af4bda8e1ff4932523b94d3dd20ee30a87232323eda55903ffd71d2fb017" -dependencies = [ - "base64 0.11.0", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - -[[package]] -name = "rust_info" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b506bd796703b88d74a3edb529acde6c71d81bb078c392eecd60a745cb1d2f" - -[[package]] -name = "rusty-hook" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96cee9be61be7e1cbadd851e58ed7449c29c620f00b23df937cb9cbc04ac21a3" -dependencies = [ - "ci_info", - "getopts", - "nias", - "toml", -] - -[[package]] -name = "ryu" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "schannel" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" -dependencies = [ - "lazy_static 1.4.0", - "winapi 0.3.9", -] - -[[package]] -name = "security-framework" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" -dependencies = [ - "bitflags", - "core-foundation", - "core-foundation-sys", - "libc", - "security-framework-sys", -] - -[[package]] -name = "security-framework-sys" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "semver" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "394cec28fa623e00903caf7ba4fa6fb9a0e260280bb8cdbbba029611108a0190" -dependencies = [ - "semver-parser", -] - -[[package]] -name = "semver-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "serde" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e54c9a88f2da7238af84b5101443f0c0d0a3bbdc455e34a5c9497b1903ed55d5" - -[[package]] -name = "serde_derive" -version = "1.0.115" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "609feed1d0a73cc36a0182a840a9b37b4a82f0b1150369f0536a9e3f2a31dc48" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "serde_json" -version = "1.0.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "shell2batch" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185a52ee351c1001753c9e3b2eb48c525ff7f51803a4f2cef4365b5c3b743f65" -dependencies = [ - "regex 1.3.9", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "syn" -version = "1.0.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tempfile" -version = "3.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -dependencies = [ - "cfg-if", - "libc", - "rand", - "redox_syscall", - "remove_dir_all", - "winapi 0.3.9", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "thiserror" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "thread-id" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03" -dependencies = [ - "kernel32-sys", - "libc", -] - -[[package]] -name = "thread_local" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5" -dependencies = [ - "thread-id", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -dependencies = [ - "lazy_static 1.4.0", -] - -[[package]] -name = "time" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" -dependencies = [ - "libc", - "winapi 0.3.9", -] - -[[package]] -name = "tinyvec" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" - -[[package]] -name = "toml" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a" -dependencies = [ - "serde", -] - -[[package]] -name = "uname" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b72f89f0ca32e4db1c04e2a72f5345d59796d4866a1ee0609084569f73683dc8" -dependencies = [ - "libc", -] - -[[package]] -name = "unicode-bidi" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -dependencies = [ - "matches", -] - -[[package]] -name = "unicode-normalization" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "unicode-xid" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" - -[[package]] -name = "url" -version = "2.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" -dependencies = [ - "idna", - "matches", - "percent-encoding", -] - -[[package]] -name = "users" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa4227e95324a443c9fcb06e03d4d85e91aabe9a5a02aa818688b6918b6af486" -dependencies = [ - "libc", - "log", -] - -[[package]] -name = "utf8-ranges" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f" - -[[package]] -name = "vcpkg" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6454029bf181f092ad1b853286f23e2c507d8e8194d01d92da4a55c274a5508c" - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "walkdir" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" -dependencies = [ - "same-file", - "winapi 0.3.9", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "which" -version = "4.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87c14ef7e1b8b8ecfc75d5eca37949410046e66f15d185c01d70824f1f8111ef" -dependencies = [ - "libc", - "thiserror", -] - -[[package]] -name = "whoami" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7884773ab69074615cb8f8425d0e53f11710786158704fca70f53e71b0e05504" - -[[package]] -name = "winapi" -version = "0.2.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi 0.3.9", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index f02ee5e5107..a1e9f7971f4 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -1,32 +1,22 @@ -{ stdenv, fetchurl, runCommand, fetchFromGitHub, rustPlatform, Security, openssl, pkg-config +{ stdenv, fetchurl, runCommand, fetchCrate, rustPlatform, Security, openssl, pkg-config , SystemConfiguration }: rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.2"; + version = "0.32.4"; - src = - let - source = fetchFromGitHub { - owner = "sagiegurari"; - repo = pname; - rev = version; - sha256 = "0l0pislc7pgx1m68kirvadraq88c86mm1k46wbz3a47ph2d4g912"; - }; - in - runCommand "source" {} '' - cp -R ${source} $out - chmod +w $out - cp ${./Cargo.lock} $out/Cargo.lock - ''; + src = fetchCrate { + inherit pname version; + sha256 = "04x363wz82f0sr4128f1nk1wxnnszxsmaxjs92mbvmpbvry82ivq"; + }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "16ygkh8sbb37nfc41shxg9nh2mbszyschbqrrr1gr7xzf1z36ipp"; + cargoSha256 = "1fgcxgm800sr0y6ab7c42l335b6c00cx0f2r5rgayi645a47a1zf"; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/pkgs/development/tools/rust/cbindgen/default.nix b/pkgs/development/tools/rust/cbindgen/default.nix index 655d726e66e..62b9a616644 100644 --- a/pkgs/development/tools/rust/cbindgen/default.nix +++ b/pkgs/development/tools/rust/cbindgen/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rust-cbindgen"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "eqrion"; repo = "cbindgen"; rev = "v${version}"; - sha256 = "0pw55334i10k75qkig8bgcnlsy613zw2p5j4xyz8v71s4vh1a58j"; + sha256 = "06bis9kk3r0gishzmsq5wk3vv8r78ggk4m800562q2yhnhc37lfd"; }; - cargoSha256 = "0088ijnjhqfvdb1wxy9jc7hq8c0yxgj5brlg68n9vws1mz9rilpy"; + cargoSha256 = "0x8lxlik4n8rmlydcp0vqyiqwqm98cgwvw3h5hm2zviv8v0y8jnr"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/pkgs/development/tools/rust/rust-analyzer/default.nix b/pkgs/development/tools/rust/rust-analyzer/default.nix index 515ff94ac7a..c9c87991a8a 100644 --- a/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -2,10 +2,10 @@ { rust-analyzer-unwrapped = callPackage ./generic.nix rec { - rev = "2020-08-17"; + rev = "2020-08-24"; version = "unstable-${rev}"; - sha256 = "1lkqhaygl6wak3hypmn3zb2h0v4n082xbpaywmzqr53vhw678sp0"; - cargoSha256 = "00a2fxq1kwybng3gp33lkad4c7wrz0gypigxkalqkyy4nbg3qil4"; + sha256 = "11q5shrq55krgpj7rjfqw84131j5g55zyrwww3cxcbr8ndi3xdnf"; + cargoSha256 = "15kjcgxmigm0lwbp8p0kdxax86ldjqq9q8ysj6khfhqd0173184n"; }; rust-analyzer = callPackage ./wrapper.nix {} { diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 8aad3230003..fc743d56016 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, cairo, fontconfig, freetype, gdk-pixbuf, glib , glibc, gtk2, libX11, makeWrapper, nspr, nss, pango, unzip, gconf -, libXi, libXrender, libXext +, libxcb, libXi, libXrender, libXext }: let allSpecs = { x86_64-linux = { system = "linux64"; - sha256 = "149p43zaz45malmff1274r2bwjcyjwsdickivk3pd0mvnjbfid2r"; + sha256 = "0absr1fp2h87gpyw6jxj2f08sbhkkh3pf13145hfyzdvajj5rfjy"; }; x86_64-darwin = { system = "mac64"; - sha256 = "1xpyqxpsz3r653ls67s6alv4g2vr4lxf29gyxc162ikywyrx80nr"; + sha256 = "1p9k92fgyx0xis6r50vhcpx3iws2gaspq3dnpigglv3bj9yg8zvi"; }; }; @@ -23,12 +23,12 @@ let cairo fontconfig freetype gdk-pixbuf glib gtk2 gconf libX11 nspr nss pango libXrender - gconf libXext libXi + gconf libxcb libXext libXi ]; in stdenv.mkDerivation rec { pname = "chromedriver"; - version = "83.0.4103.39"; + version = "85.0.4183.87"; src = fetchurl { url = "https://chromedriver.storage.googleapis.com/${version}/chromedriver_${spec.system}.zip"; diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 032f64bc348..a100988aead 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.13.1"; + version = "1.13.2"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1v6napcpx8k45s8w55lbxahfc1p0qlvl597zgb4dzyg9w67fwnqk"; + sha256 = "0xicf4bf52fnnwaimxrxv16x15lcmw12a5rrl0xjm4p059jnvy54"; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/tools/so/default.nix b/pkgs/development/tools/so/default.nix new file mode 100644 index 00000000000..0ee2359c841 --- /dev/null +++ b/pkgs/development/tools/so/default.nix @@ -0,0 +1,27 @@ +{ stdenv, rustPlatform, fetchFromGitHub, openssl, pkg-config, libiconv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "so"; + version = "0.4.2"; + + src = fetchFromGitHub { + owner = "samtay"; + repo = pname; + rev = "v${version}"; + sha256 = "09zswxxli9f5ayjwmvqhkp1yv2s4f435dcfp4cyia1zddbrh2zck"; + }; + + cargoSha256 = "1ddbhy1plag4ckbmlyj47wnky7vgmfa68msl3hl25h1lwmzaf1aq"; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv Security + ]; + + meta = with stdenv.lib; { + description = "A TUI interface to the StackExchange network"; + homepage = "https://github.com/samtay/so"; + license = licenses.mit; + maintainers = with maintainers; [ mredaelli ]; + }; +} diff --git a/pkgs/development/tools/spring-boot-cli/default.nix b/pkgs/development/tools/spring-boot-cli/default.nix index 15d6553bbb1..38573e07514 100644 --- a/pkgs/development/tools/spring-boot-cli/default.nix +++ b/pkgs/development/tools/spring-boot-cli/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "spring-boot-cli"; - version = "2.3.1"; + version = "2.3.2"; src = fetchzip { url = "https://repo.spring.io/release/org/springframework/boot/${pname}/${version}.RELEASE/${pname}-${version}.RELEASE-bin.zip"; - sha256 = "0ddmwcifrmw197vc49b0x8vfampj3n947r4vv4nni5vjclqqfds5"; + sha256 = "1zqfnxz57234227rp303iwis0mjkkjkpcqnj9jgw78gykjnqdmmq"; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/development/tools/tracy/default.nix b/pkgs/development/tools/tracy/default.nix index a5087b3b52c..96f232304aa 100644 --- a/pkgs/development/tools/tracy/default.nix +++ b/pkgs/development/tools/tracy/default.nix @@ -1,21 +1,21 @@ -{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk2, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: +{ stdenv, lib, darwin, fetchFromGitHub, tbb, gtk3, glfw, pkgconfig, freetype, Carbon, AppKit, capstone }: stdenv.mkDerivation rec { pname = "tracy"; - version = "0.7"; + version = "0.7.1"; src = fetchFromGitHub { owner = "wolfpld"; repo = "tracy"; rev = "v${version}"; - sha256 = "07cmz2w7iv10f9i9q3fhg80s6riy9bxnk9xvc3q4lw47mc150skp"; + sha256 = "13zg3ijzhh7qkhgqff2ca23nd4gj7ac8jr0bp9w1gjf2cpgqkm40"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ glfw capstone ] ++ lib.optionals stdenv.isDarwin [ Carbon AppKit freetype ] - ++ lib.optionals stdenv.isLinux [ gtk2 tbb ]; + ++ lib.optionals stdenv.isLinux [ gtk3 tbb ]; NIX_CFLAGS_COMPILE = [ ] ++ lib.optional stdenv.isLinux "-ltbb" @@ -35,11 +35,15 @@ stdenv.mkDerivation rec { install -D ./update/build/unix/update-release $out/bin/update ''; + fixupPhase = lib.optionalString stdenv.isDarwin '' + install_name_tool -change libcapstone.4.dylib ${capstone}/lib/libcapstone.4.dylib $out/bin/Tracy + ''; + meta = with stdenv.lib; { description = "A real time, nanosecond resolution, remote telemetry frame profiler for games and other applications."; homepage = "https://github.com/wolfpld/tracy"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; - maintainers = with maintainers; [ mpickering ]; + maintainers = with maintainers; [ mpickering nagisa ]; }; } diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 6fc18fabe7b..21f14adc2f7 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -8,18 +8,18 @@ let in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.06.29"; + version = "2020.07.27"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-176-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-182-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "f93243b000c52b755c70829768d2ae6bcf7bb91a"; - sha256 = "0f7xv99bxmidk7byahc821yzy8mln29gknz3w239i9xbwxzc6wc4"; + rev = "8c0a6382e11b160ed88d17af8493c12a897617ed"; + sha256 = "1g0ppjfw8dq5cg5kl2p1p87grb0i88apaim4f5b6wj4sfqz8iln8"; name = "trellis"; }) diff --git a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch b/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch index f87ff5135b3..fa6555c594e 100644 --- a/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch +++ b/pkgs/development/tools/vagrant/0004-Support-system-installed-plugins.patch @@ -1,7 +1,7 @@ From: Antonio Terceiro <terceiro@debian.org> Date: Wed, 27 May 2015 09:36:17 -0300 Subject: Support system-installed plugins -Source: https://salsa.debian.org/ruby-team/vagrant/blob/cb672c6dc0c63f6552c5ec4d6d7d22929d353503/debian/patches/0004-Support-system-installed-plugins.patch +Source: https://salsa.debian.org/ruby-team/vagrant/-/blob/9d86f222/debian/patches/0004-Support-system-installed-plugins.patch Plugins must be installed as regular Ruby libraries, and they must contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the @@ -22,7 +22,7 @@ following content: 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb -index 567347d..d9d76a0 100644 +index 9058e68..2772131 100644 --- a/lib/vagrant/plugin/manager.rb +++ b/lib/vagrant/plugin/manager.rb @@ -18,7 +18,7 @@ module Vagrant @@ -80,7 +80,7 @@ index c6872d4..935d431 100644 end # Add a plugin that is installed to the state file. -@@ -107,6 +123,14 @@ module Vagrant +@@ -107,6 +123,10 @@ module Vagrant f.close FileUtils.mv(f.path, @path) end @@ -88,10 +88,6 @@ index c6872d4..935d431 100644 + # Ignore permission denied against system-installed plugins; regular + # users are not supposed to write there. + raise unless @system -+ rescue Errno::EROFS -+ # Ignore read-only filesystem against system-installed plugins; regular -+ # users are not supposed to write there. -+ raise unless @system end protected diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 338e8f68d35..4e2930f97a2 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.9"; + version = "2.2.10"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "0fbickjjliaw3cpkh3pl9bp56b2gcqn87c5ag67amc450ah43rdq"; + sha256 = "07wlj4m79m9li3za1jkk4imdhqwpca86qz3c0h706s0w8cmv4bbj"; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -54,13 +54,6 @@ in buildRubyGem rec { ./unofficial-installation-nowarn.patch ./use-system-bundler-version.patch ./0004-Support-system-installed-plugins.patch - - # fix deprecation warning on ruby 2.6.5. - # See also https://github.com/hashicorp/vagrant/pull/11307 - (fetchpatch { - url = "https://github.com/hashicorp/vagrant/commit/d18ed567aaa5da23c9e91ab87f360e7bf6760f13.patch"; - sha256 = "0f61qj41rc3fdggmnha4jrqg4pzmfiriwpsz4fcgf7c0bx6qha7q"; - }) ]; postPatch = '' diff --git a/pkgs/development/tools/vagrant/gemset.nix b/pkgs/development/tools/vagrant/gemset.nix index 00838c6e0c5..3c22b74efed 100644 --- a/pkgs/development/tools/vagrant/gemset.nix +++ b/pkgs/development/tools/vagrant/gemset.nix @@ -24,20 +24,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5"; + sha256 = "08hd3d2lfi19cns4d6wkq51scasn17l83fgbzbjjk3dqccz4rg3j"; type = "gem"; }; - version = "3.0.0"; + version = "4.0.0"; }; concurrent-ruby = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl"; + sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; type = "gem"; }; - version = "1.1.6"; + version = "1.1.7"; }; domain_name = { dependencies = ["unf"]; @@ -149,21 +149,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s"; + sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.5"; }; listen = { - dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"]; + dependencies = ["rb-fsevent" "rb-inotify"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx"; + sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi"; type = "gem"; }; - version = "3.1.5"; + version = "3.2.1"; }; little-plugger = { groups = ["default"]; @@ -191,10 +191,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn"; + sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; + type = "gem"; + }; + version = "2.3.0"; + }; + mime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr"; type = "gem"; }; - version = "2.2.2"; + version = "0.4.4"; }; mime-types = { dependencies = ["mime-types-data"]; @@ -222,10 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr"; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; type = "gem"; }; - version = "1.14.1"; + version = "1.15.0"; }; net-scp = { dependencies = ["net-ssh"]; @@ -244,20 +254,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y"; + sha256 = "185vsybznqgqbb4i2qnxvf1gam8lb634nqcrq7r3i2zy1g6xd8mi"; type = "gem"; }; - version = "2.1.2"; + version = "3.0.0"; }; net-ssh = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40"; + sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; type = "gem"; }; - version = "5.2.0"; + version = "6.1.0"; }; netrc = { groups = ["default"]; diff --git a/pkgs/development/tools/vagrant/use-system-bundler-version.patch b/pkgs/development/tools/vagrant/use-system-bundler-version.patch index c386acf4a1c..8262220140a 100644 --- a/pkgs/development/tools/vagrant/use-system-bundler-version.patch +++ b/pkgs/development/tools/vagrant/use-system-bundler-version.patch @@ -1,8 +1,8 @@ -diff --git i/lib/vagrant/bundler.rb w/lib/vagrant/bundler.rb -index 301e40e37..e361ab510 100644 ---- i/lib/vagrant/bundler.rb -+++ w/lib/vagrant/bundler.rb -@@ -217,7 +217,7 @@ module Vagrant +diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb +index 336ac1e05..1bfd84c0d 100644 +--- a/lib/vagrant/bundler.rb ++++ b/lib/vagrant/bundler.rb +@@ -470,7 +470,7 @@ module Vagrant source_list = {} system_plugins = plugins.map do |plugin_name, plugin_info| plugin_name if plugin_info["system"] diff --git a/pkgs/development/tools/vcstool/default.nix b/pkgs/development/tools/vcstool/default.nix index c4a1cf73987..9657543e0c7 100644 --- a/pkgs/development/tools/vcstool/default.nix +++ b/pkgs/development/tools/vcstool/default.nix @@ -5,11 +5,11 @@ with python3Packages; buildPythonApplication rec { pname = "vcstool"; - version = "0.2.7"; + version = "0.2.9"; src = fetchPypi { inherit pname version; - sha256 = "1mq8lmb1wh55cqdj7javq7qia4217h6vf5ljc99gsjyibi7g7d3k"; + sha256 = "1lb0j120sj76swi702ah6ryn770m1y7gh69237zxpyh897pn5paa"; }; propagatedBuildInputs = [ pyyaml setuptools ]; diff --git a/pkgs/development/tools/vultr/default.nix b/pkgs/development/tools/vultr/default.nix index 9b53c28c60e..7c396f69f25 100644 --- a/pkgs/development/tools/vultr/default.nix +++ b/pkgs/development/tools/vultr/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "vultr"; - version = "2.0.1"; + version = "2.0.2"; goPackagePath = "github.com/JamesClonk/vultr"; src = fetchFromGitHub { owner = "JamesClonk"; repo = "vultr"; rev = "v${version}"; - sha256 = "16wlncf0wax5jhpbfif5k16knigxy89vcby0b821klv6hlm6cc58"; + sha256 = "0br8nxi9syraarp4hzav9a3p4zxhyi45cq5dsclzxi3fga2l6mqg"; }; meta = { diff --git a/pkgs/development/tools/wxformbuilder/default.nix b/pkgs/development/tools/wxformbuilder/default.nix new file mode 100644 index 00000000000..a3f8196b124 --- /dev/null +++ b/pkgs/development/tools/wxformbuilder/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, wxGTK31 +, meson +, ninja +}: + +stdenv.mkDerivation { + pname = "wxFormBuilder"; + version = "unstable-2020-08-18"; + + src = fetchFromGitHub { + owner = "wxFormBuilder"; + repo = "wxFormBuilder"; + rev = "d053665cc33a79dd935b518b5e7aea6baf493c92"; + sha256 = "sha256-hTO7Fyp5ZWpq2CfIYEXB85oOkNrqr6Njfh8h0t9B6wU="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + ninja + meson + ]; + + buildInputs = [ + wxGTK31 + ]; + + meta = with stdenv.lib; { + description = "RAD tool for wxWidgets GUI design"; + homepage = "https://github.com/wxFormBuilder/wxFormBuilder"; + license = licenses.gpl2; + maintainers = with maintainers; [ matthuszagh ]; + }; +} diff --git a/pkgs/development/tools/ydiff/default.nix b/pkgs/development/tools/ydiff/default.nix index f3ecbb451f6..510808fc412 100644 --- a/pkgs/development/tools/ydiff/default.nix +++ b/pkgs/development/tools/ydiff/default.nix @@ -5,11 +5,11 @@ with pythonPackages; buildPythonApplication rec { pname = "ydiff"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit pname version; - sha256 = "0mxcl17sx1d4vaw22ammnnn3y19mm7r6ljbarcjzi519klz26bnf"; + sha256 = "f5430577ecd30974d766ee9b8333e06dc76a947b4aae36d39612a0787865a121"; }; patchPhase = '' diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index 036e824393a..e11a5e18058 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: +{ stdenv, lib, fetchzip, autoPatchelfHook, xorg, gtk2, gnome2, gtk3, nss, alsaLib, udev, unzip, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "cypress"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nss gtk2 alsaLib gnome2.GConf gtk3 unzip ]; - runtimeDependencies = [ udev.lib ]; + runtimeDependencies = [ (lib.getLib udev) ]; installPhase = '' mkdir -p $out/bin $out/opt/cypress diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 3a0583628f0..9430ebd2ef1 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.3.1"; + version = "1.3.2"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "1j5ajasng380p5a7nkk9ag5zp9ybwfz7b2z42lyk1wfg0pcd6j0r"; + sha256 = "0vdz3irhc2pxn5zh0c6frbz7pb8vr06kldxa204xwyl7fl770w3g"; fetchSubmodules = true; }; - cargoSha256 = "0ba7afk4n7k170cqwy0gjc53vz6bjc176s9w1wln6yfhh55fyw6x"; + cargoSha256 = "1ch7vxnhs69paykrglim0ixaw73lzlmrglqhjp8f4xafvdk7n2ks"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/development/web/deno/deps.nix b/pkgs/development/web/deno/deps.nix index 2fd88235a8e..f6baca6fb01 100644 --- a/pkgs/development/web/deno/deps.nix +++ b/pkgs/development/web/deno/deps.nix @@ -2,11 +2,11 @@ {}: rec { rustyV8Lib = { - version = "0.8.1"; + version = "0.9.1"; sha256s = { - x86_64-linux = "0nwssdbwscwkh2w9zhlvaj562z19g5icg2yi00fyw8glws69cd6p"; - aarch64-linux = "0mwd4ix511dzxpah1p2c47a1qhvff0d3kyilc3yra99fa1s0gyxy"; - x86_64-darwin = "04s4x0n85rxnncy4jsl1ak3rdgb4a3lhqg8h53mvvjmsazsj1q70"; + x86_64-linux = "07zph4x3k659ywld27b60as7j06bdbab2ws1pf67iwg7w6h7iash"; + aarch64-linux = "0w9mbsdpkrla3ayaswpdjhiqs74h23qi2sv9355h138pw431ymnx"; + x86_64-darwin = "091kzdg431lvkvcy0401di3if53pii0isk5ipfpsvic82kr7vaqk"; }; }; } diff --git a/pkgs/development/web/nodejs/v14.nix b/pkgs/development/web/nodejs/v14.nix index b3daab5000c..549f29db2fe 100644 --- a/pkgs/development/web/nodejs/v14.nix +++ b/pkgs/development/web/nodejs/v14.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "14.8.0"; - sha256 = "0vghz7g7mih7idgknwzdc2zfw82qqq497m727ydhkas1wvj6i7lv"; + version = "14.9.0"; + sha256 = "1xkfivr0qci50ksg66szyasdlbiwh2j7ia4n6qc5csih2nvzcbh1"; } diff --git a/pkgs/games/exult/arch.patch b/pkgs/games/exult/arch.patch deleted file mode 100644 index 70de34184a2..00000000000 --- a/pkgs/games/exult/arch.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -aur exult-1.4.9rc1.orig/desktop/exult.desktop exult-1.4.9rc1/desktop/exult.desktop ---- exult-1.4.9rc1.orig/desktop/exult.desktop 2008-07-11 05:41:06.000000000 +0600 -+++ exult-1.4.9rc1/desktop/exult.desktop 2012-05-19 13:15:30.616084585 +0600 -@@ -1,9 +1,8 @@ - [Desktop Entry] --Encoding=UTF-8 - Name=Exult - Comment=Exult Ultima 7 Engine - Exec=exult --Icon=exult.png -+Icon=exult - Terminal=false - Type=Application --Categories=Application;Game;RolePlaying; -+Categories=Game;RolePlaying; -diff -aur exult-1.4.9rc1.orig/files/databuf.h exult-1.4.9rc1/files/databuf.h ---- exult-1.4.9rc1.orig/files/databuf.h 2010-03-10 09:07:05.000000000 +0500 -+++ exult-1.4.9rc1/files/databuf.h 2012-05-19 12:50:16.856076030 +0600 -@@ -18,6 +18,7 @@ - #define DATA_H - - #include <cstdio> -+#include <cstddef> - #include <cstring> - #include <cassert> - #include <fstream> -diff -aur exult-1.4.9rc1.orig/files/U7obj.h exult-1.4.9rc1/files/U7obj.h ---- exult-1.4.9rc1.orig/files/U7obj.h 2010-02-25 07:52:07.000000000 +0500 -+++ exult-1.4.9rc1/files/U7obj.h 2012-05-19 12:50:35.916076137 +0600 -@@ -26,6 +26,7 @@ - #include <string> - #include <vector> - #include <cstring> -+#include <cstddef> - #include "common_types.h" - #include "utils.h" - -diff -aur exult-1.4.9rc1.orig/imagewin/manip.h exult-1.4.9rc1/imagewin/manip.h ---- exult-1.4.9rc1.orig/imagewin/manip.h 2010-08-29 20:26:00.000000000 +0600 -+++ exult-1.4.9rc1/imagewin/manip.h 2012-05-19 13:02:45.159413596 +0600 -@@ -319,7 +319,7 @@ - static uintD copy(uintS src) - { - unsigned int r, g, b; -- split_source(src,r,g,b); -+ ManipBaseSrc<color_s,color_d>::split_source(src,r,g,b); - return ManipBaseDest<color_d>::rgb(r,g,b); - } - static void copy(uintD& dest, uintS src) -diff -aur exult-1.4.9rc1.orig/istring.h exult-1.4.9rc1/istring.h ---- exult-1.4.9rc1.orig/istring.h 2005-06-07 15:55:39.000000000 +0600 -+++ exult-1.4.9rc1/istring.h 2012-05-19 13:01:14.886079750 +0600 -@@ -162,19 +162,19 @@ - - _Myt& operator+=(const _Myt& _Right) - { // append _Right -- append(_Right); -+ this->append(_Right); - return (*this); - } - - _Myt& operator+=(const _Elem *_Ptr) - { // append [_Ptr, <null>) -- append(_Ptr); -+ this->append(_Ptr); - return (*this); - } - - _Myt& operator+=(_Elem _Ch) - { // append 1 * _Ch -- append(static_cast<size_type>(1), _Ch); -+ this->append(static_cast<size_type>(1), _Ch); - return (*this); - } - -diff -aur exult-1.4.9rc1.orig/shapes/pngio.cc exult-1.4.9rc1/shapes/pngio.cc ---- exult-1.4.9rc1.orig/shapes/pngio.cc 2010-02-15 18:48:11.000000000 -0200 -+++ exult-1.4.9rc1/shapes/pngio.cc 2013-09-22 20:56:37.809763588 -0300 -@@ -26,6 +26,7 @@ - #ifdef HAVE_CONFIG_H - # include <config.h> - #endif -+#include <string.h> - - #ifdef HAVE_PNG_H - -@@ -79,7 +80,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -208,7 +209,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_write_struct(&png, &info); - fclose(fp); -@@ -306,7 +307,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_read_struct(&png, &info, 0); - fclose(fp); -@@ -395,7 +396,7 @@ - } - // Allocate info. structure. - png_infop info = png_create_info_struct(png); -- if (setjmp(png->jmpbuf)) // Handle errors. -+ if (setjmp(png_jmpbuf(png))) // Handle errors. - { - png_destroy_write_struct(&png, &info); - fclose(fp); - diff --git a/pkgs/games/exult/default.nix b/pkgs/games/exult/default.nix index e735c9c5817..adbf4dd0702 100644 --- a/pkgs/games/exult/default.nix +++ b/pkgs/games/exult/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, SDL, libogg, libvorbis, zlib, unzip }: +{ stdenv, fetchurl, pkgconfig, SDL2, libogg, libvorbis, zlib, unzip }: let @@ -12,27 +12,20 @@ let in stdenv.mkDerivation rec { - name = "exult-1.4.9rc1"; + name = "exult-1.6"; src = fetchurl { url = "mirror://sourceforge/exult/${name}.tar.gz"; - sha256 = "0a03a2l3ji6h48n106d4w55l8v6lni1axniafnvvv5c5n3nz5bgd"; + sha256 = "1dm27qkxj30567zb70q4acddsizn0xyi3z87hg7lysxdkyv49s3s"; }; configureFlags = [ "--disable-tools" ]; - patches = - [ # Arch Linux patch set. - ./arch.patch - ]; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL libogg libvorbis zlib unzip ]; + buildInputs = [ SDL2 libogg libvorbis zlib unzip ]; enableParallelBuilding = true; - makeFlags = [ "DESTDIR=$(out)" ]; - NIX_LDFLAGS = "-lX11"; postInstall = diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 4f7d1cb3750..91b841f6c51 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -4,24 +4,27 @@ stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.8.6"; + version = "0.8.7"; src = fetchFromGitHub { - owner = "gemrb"; - repo = "gemrb"; - rev = "v${version}"; - sha256 = "0vsr3fsqmv9b7s5l0cwhpq2pf7ah2wvgmcn9y8asj6w8hprp17d4"; + owner = "gemrb"; + repo = "gemrb"; + rev = "v${version}"; + sha256 = "14j9mhrbi4gnrbv25nlsvcxzkylijzrnwbqqnrg7pr452lb3srpb"; }; - # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional + # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl + # reqs) optional buildInputs = [ freetype python openal SDL2 SDL2_mixer zlib libpng libvorbis libiconv ]; nativeBuildInputs = [ cmake ]; - enableParallelBuilding = true; - + # TODO: add proper OpenGL support. We are currently (0.8.7) getting a shader + # error on execution when enabled. cmakeFlags = [ "-DLAYOUT=opt" + # "-DOPENGL_BACKEND=GLES" + # "-DOpenGL_GL_PREFERENCE=GLVND" ]; meta = with stdenv.lib; { diff --git a/pkgs/games/katago/default.nix b/pkgs/games/katago/default.nix index 492ccbb63ab..20ad47d3e0a 100644 --- a/pkgs/games/katago/default.nix +++ b/pkgs/games/katago/default.nix @@ -13,35 +13,44 @@ , opencl-headers ? null , ocl-icd ? null , gperftools ? null -, cudaSupport ? false -, useTcmalloc ? true}: +, eigen ? null +, enableAVX2 ? false +, enableBigBoards ? false +, enableCuda ? false +, enableGPU ? true +, enableTcmalloc ? true}: -assert cudaSupport -> ( +assert !enableGPU -> ( + eigen != null && + !enableCuda); + +assert enableCuda -> ( libGL_driver != null && cudatoolkit != null && cudnn != null); -assert !cudaSupport -> ( - opencl-headers != null && - ocl-icd != null); +assert !enableCuda -> ( + !enableGPU || ( + opencl-headers != null && + ocl-icd != null)); -assert useTcmalloc -> ( +assert enableTcmalloc -> ( gperftools != null); let - env = if cudaSupport + env = if enableCuda then gcc8Stdenv else stdenv; in env.mkDerivation rec { pname = "katago"; - version = "1.5.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "lightvector"; repo = "katago"; - rev = "${version}"; - sha256 = "0ajdjdmlzwh7zwk5v0k9zzjawgkf7w30pzqp5bhcsdqz4svvyll2"; + rev = "v${version}"; + sha256 = "030ff9prnvpadgcb4x4hx6b6ggg10bwqcj8vd8nwrdz9sjq67yf7"; }; nativeBuildInputs = [ @@ -52,36 +61,44 @@ in env.mkDerivation rec { buildInputs = [ libzip boost - ] ++ lib.optionals cudaSupport [ + ] ++ lib.optionals (!enableGPU) [ + eigen + ] ++ lib.optionals (enableGPU && enableCuda) [ cudnn libGL_driver - ] ++ lib.optionals (!cudaSupport) [ + ] ++ lib.optionals (enableGPU && !enableCuda) [ opencl-headers ocl-icd - ] ++ lib.optionals useTcmalloc [ + ] ++ lib.optionals enableTcmalloc [ gperftools ]; cmakeFlags = [ "-DNO_GIT_REVISION=ON" - ] ++ lib.optionals cudaSupport [ + ] ++ lib.optionals (!enableGPU) [ + "-DUSE_BACKEND=EIGEN" + ] ++ lib.optionals enableAVX2 [ + "-DUSE_AVX2=ON" + ] ++ lib.optionals (enableGPU && enableCuda) [ "-DUSE_BACKEND=CUDA" - ] ++ lib.optionals (!cudaSupport) [ + ] ++ lib.optionals (enableGPU && !enableCuda) [ "-DUSE_BACKEND=OPENCL" - ] ++ lib.optionals useTcmalloc [ + ] ++ lib.optionals enableTcmalloc [ "-DUSE_TCMALLOC=ON" + ] ++ lib.optionals enableBigBoards [ + "-DUSE_BIGGER_BOARDS_EXPENSIVE=ON" ]; preConfigure = '' cd cpp/ - '' + lib.optionalString cudaSupport '' + '' + lib.optionalString enableCuda '' export CUDA_PATH="${cudatoolkit}" export EXTRA_LDFLAGS="-L/run/opengl-driver/lib" ''; installPhase = '' mkdir -p $out/bin; cp katago $out/bin; - '' + lib.optionalString cudaSupport '' + '' + lib.optionalString enableCuda '' wrapProgram $out/bin/katago \ --prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib" ''; diff --git a/pkgs/games/klavaro/default.nix b/pkgs/games/klavaro/default.nix index 557f75580ca..ac2c787d3ff 100644 --- a/pkgs/games/klavaro/default.nix +++ b/pkgs/games/klavaro/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "klavaro"; - version = "3.10"; + version = "3.11"; src = fetchurl { url = "mirror://sourceforge/klavaro/${pname}-${version}.tar.bz2"; - sha256 = "0jnzdrndiq6m0bwgid977z5ghp4q61clwdlzfpx4fd2ml5x3iq95"; + sha256 = "1rkxaqb62w4mv86fcnmr32lq6y0h4hh92wmsy5ddb9a8jnzx6r7w"; }; nativeBuildInputs = [ intltool makeWrapper pkgconfig ]; @@ -37,6 +37,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Free touch typing tutor program"; homepage = "http://klavaro.sourceforge.net/"; + changelog = "https://sourceforge.net/p/klavaro/code/HEAD/tree/trunk/ChangeLog"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ mimame davidak ]; diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 59e044b482b..074c24389a1 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.806.0"; + version = "2020.820.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "BelmqcDnrGH84fTs6M0krwWz6SHn2hOm7y+PNEOOOZM="; + sha256 = "0vszw0f5x0syshn8bnsbskxvknwpgbnm31kxwh1mfdr7pnxvw922"; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index c29035e5724..53f933d143b 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -281,8 +281,8 @@ }) (fetchNuGet { name = "Markdig"; - version = "0.20.0"; - sha256 = "19qhvyj59i8zcxblpl4vqabb55y5xrk3iipmb656mid1b1m4jfkn"; + version = "0.21.1"; + sha256 = "119v22rvg51ifg54r1ndf2bw7hv1lf5wn3cd04ccg8d7r8c0yhbk"; }) (fetchNuGet { name = "Microsoft.Bcl.AsyncInterfaces"; @@ -306,23 +306,23 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.BannedApiAnalyzers"; - version = "3.0.0"; - sha256 = "19zfz84c1860na8qpkzv6va6d7dh1md9wkrb7c6x3brhjnj859hk"; + version = "3.3.0"; + sha256 = "04z03ir9sal5h9ha97isbh660jijslb8zfiaa48w2r2l6pabz5kd"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Common"; - version = "3.6.0"; - sha256 = "0i8x90700jr30j580mpawj6d90fngrb2zpkjjbn7f8r2p1mz75y7"; + version = "3.7.0"; + sha256 = "0882492nx6x68b0pkh3q5xaawz0b2l5x35r40722ignyjnvjydph"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp"; - version = "3.6.0"; - sha256 = "0c44qp7lfpja6cq5nk7851qrswm2z1k2pnvsw43j9ybf10a27jrn"; + version = "3.7.0"; + sha256 = "0adw6rcag8wxydzyiyhls2mxaqkay5qlz25z1fxrlv5qnchqn0n5"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.CSharp.Workspaces"; - version = "3.6.0"; - sha256 = "1zc9328invqqpisdljw5vpm1kk416prfczakakw1vwkv9r54sd73"; + version = "3.7.0"; + sha256 = "15rlz65wbky0yq7b9s8xwk68dgrhgsk4rj88q9pyjxbm5938vrav"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.FxCopAnalyzers"; @@ -336,13 +336,13 @@ }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.Common"; - version = "3.6.0"; - sha256 = "176faadh1k9xcc8cc2qpkka9j1n426fdff1ax5ikmz2hbrspmigz"; + version = "3.7.0"; + sha256 = "00nm453w4n6kjsicmz5izvkf1ki9rp3xnc9n3y7a9b1g5sxg36fs"; }) (fetchNuGet { name = "Microsoft.CodeAnalysis.Workspaces.MSBuild"; - version = "3.6.0"; - sha256 = "0hxs9x5gpi7yvqf46bxh9niipb0jif7ak5baxw5l920787vysdhc"; + version = "3.7.0"; + sha256 = "1sh8s7b16j06p3gmzsgwd8690vagah4908bpa3gyz2fxgfnj46ax"; }) (fetchNuGet { name = "Microsoft.CodeQuality.Analyzers"; @@ -586,8 +586,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.806.0"; - sha256 = "1d4aprz81xbhk5addl1n7jwj8xxny51s6nvpn37alld0x6n7k8nv"; + version = "2020.819.0"; + sha256 = "1ghbbwpjjl0dp6gs1638v880hr7wwrn2jklqwbbckpx8g57bnq2m"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -596,8 +596,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2020.731.0"; - sha256 = "1q58c627p0yz6b2y4c1hrrr4l9hii418y1vk6hv24x1csdsf3x8p"; + version = "2020.812.0"; + sha256 = "0fsg47bsffvk16clwwwav4yly1ykn09pyap46dvdmsxhjrzkvzb7"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; diff --git a/pkgs/games/papermc/default.nix b/pkgs/games/papermc/default.nix index 9695a350058..c5f7dc37925 100644 --- a/pkgs/games/papermc/default.nix +++ b/pkgs/games/papermc/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, jre }: +{ stdenv, fetchurl, bash, jre }: let - mcVersion = "1.15.2"; - buildNum = "161"; + mcVersion = "1.16.2"; + buildNum = "141"; jar = fetchurl { url = "https://papermc.io/api/v1/paper/${mcVersion}/${buildNum}/download"; - sha256 = "1jngj5djs1fjdj25wg9iszw0dsp56f386j8ydms7x4ky8s8kxyms"; + sha256 = "1qhhnaysw9r73fpvj9qcmjah722a6a4s6g4cblna56n1hpz4lw1s"; }; in stdenv.mkDerivation { pname = "papermc"; @@ -13,22 +13,23 @@ in stdenv.mkDerivation { preferLocalBuild = true; dontUnpack = true; - installPhase = '' - mkdir -p $out/bin - cp ${jar} $out/papermc.jar - cat > $out/bin/minecraft-server << EOF - #!/bin/sh - exec ${jre}/bin/java \$@ -jar $out/papermc.jar nogui - EOF - chmod +x $out/bin/minecraft-server + dontConfigure = true; + + buildPhase = '' + cat > minecraft-server << EOF + #!${bash}/bin/sh + exec ${jre}/bin/java \$@ -jar $out/share/papermc/papermc.jar nogui ''; - phases = "installPhase"; + installPhase = '' + install -Dm444 ${jar} $out/share/papermc/papermc.jar + install -Dm555 -t $out/bin minecraft-server + ''; meta = { description = "High-performance Minecraft Server"; homepage = "https://papermc.io/"; - license = stdenv.lib.licenses.gpl3; + license = stdenv.lib.licenses.gpl3Only; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ aaronjanse ]; }; diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix index 76f6ecfb81a..6626e4df8a2 100644 --- a/pkgs/games/shattered-pixel-dungeon/default.nix +++ b/pkgs/games/shattered-pixel-dungeon/default.nix @@ -10,13 +10,13 @@ let pname = "shattered-pixel-dungeon"; - version = "0.8.2"; + version = "0.8.2b"; src = fetchFromGitHub { owner = "00-Evan"; repo = "shattered-pixel-dungeon"; rev = "v${version}"; - sha256 = "1ra697237vnpx8nsy7dzk958vlyf6jpx1k5dpbr8ybg6vgc3kqx3"; + sha256 = "02ksxm7iknxfc7l8dl2pr1kyhfmi7vkchz0lh46w3p5mqf82psfb"; }; postPatch = '' diff --git a/pkgs/games/tome2/default.nix b/pkgs/games/tome2/default.nix index a632e523aaa..fa73697ab42 100644 --- a/pkgs/games/tome2/default.nix +++ b/pkgs/games/tome2/default.nix @@ -9,7 +9,7 @@ let name = pname; exec = "${pname}-x11"; icon = pname; - terminal = "False"; + terminal = "false"; comment = description; type = "Application"; categories = "Game;RolePlaying;"; diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix index 55848d91fab..413d98d26ac 100644 --- a/pkgs/games/vassal/default.nix +++ b/pkgs/games/vassal/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, jre, makeWrapper }: stdenv.mkDerivation rec { - name = "VASSAL-3.2.17"; + name = "VASSAL-3.3.2"; src = fetchurl { url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2"; - sha256 = "0nxskr46janxnb31c03zv61kr46vy98l7cwxha3vll81l4ij1sjb"; + sha256 = "1abhlkl27gyfa1lghvv76xa6ks5hiwv2s9wb9ddadm0m07f87n1w"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/games/xcowsay/default.nix b/pkgs/games/xcowsay/default.nix new file mode 100644 index 00000000000..dd95bf1e5a1 --- /dev/null +++ b/pkgs/games/xcowsay/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, makeWrapper, pkg-config +, dbus, dbus-glib, gtk3, gdk-pixbuf, librsvg +, fortune +}: + +stdenv.mkDerivation rec { + pname = "xcowsay"; + version = "1.5"; + + src = fetchurl { + url = "http://www.nickg.me.uk/files/xcowsay-${version}.tar.gz"; + sha256 = "0pyaa062z1ag26dhkm1yzp2hivnlmhlpqn5xg7mx9r1m652mm91y"; + }; + + buildInputs = [ + dbus + dbus-glib + gtk3 + gdk-pixbuf # loading cow images + librsvg # dreaming SVG images + ]; + nativeBuildInputs = [ makeWrapper pkg-config ]; + + configureFlags = [ "--enable-dbus" ]; + + postInstall = '' + for tool in xcowdream xcowsay xcowthink xcowfortune; do + wrapProgram $out/bin/$tool \ + --prefix PATH : $out/bin:${fortune}/bin + done + ''; + + meta = with stdenv.lib; { + homepage = "http://www.doof.me.uk/xcowsay"; + description = + "A program based on cowsay that displays a cute cow and message on your desktop"; + license = licenses.gpl3; + maintainers = with maintainers; [ das_j ]; + }; +} diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index eca15faf1ad..d3d06d98cb1 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -45,6 +45,11 @@ stdenv.mkDerivation rec { }; patches = [ + (fetchpatch { + name = "CVE-2020-15900.patch"; + url = "https://github.com/ArtifexSoftware/ghostpdl/commit/5d499272b95a6b890a1397e11d20937de000d31b.patch"; + sha256 = "1nnnrn8q33x7nc8227ygc60f3mj4bjzrhj40sxp6dah58rb5x5jz"; + }) ./urw-font-files.patch ./doc-no-ref.diff # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, diff --git a/pkgs/misc/hdt/default.nix b/pkgs/misc/hdt/default.nix new file mode 100644 index 00000000000..8a4c7c3e6f5 --- /dev/null +++ b/pkgs/misc/hdt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, autoreconfHook, libtool, pkgconfig, zlib, serd }: + +stdenv.mkDerivation rec { + pname = "hdt"; + version = "1.3.3"; + + src = fetchFromGitHub { + owner = "rdfhdt"; + repo = "hdt-cpp"; + rev = "v${version}"; + sha256 = "1vsq80jnix6cy78ayag7v8ajyw7h8dqyad1q6xkf2hzz3skvr34z"; + }; + + buildInputs = [ zlib serd ]; + + nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = "http://www.rdfhdt.org/"; + description = "Header Dictionary Triples (HDT) is a compression format for RDF data that can also be queried for Triple Patterns."; + license = licenses.lgpl21; + platforms = platforms.linux; + maintainers = [ maintainers.koslambrou ]; + }; +} diff --git a/pkgs/misc/logging/beats/6.x.nix b/pkgs/misc/logging/beats/6.x.nix index c3bca18a9a4..2d01ea62261 100644 --- a/pkgs/misc/logging/beats/6.x.nix +++ b/pkgs/misc/logging/beats/6.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: +{ stdenv, lib, fetchFromGitHub, elk6Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -46,7 +46,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix index 61c89339fe7..465051d3726 100644 --- a/pkgs/misc/logging/beats/7.x.nix +++ b/pkgs/misc/logging/beats/7.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: +{ stdenv, lib, fetchFromGitHub, elk7Version, buildGoPackage, libpcap, systemd }: let beat = package : extraArgs : buildGoPackage (rec { name = "${package}-${version}"; @@ -45,7 +45,7 @@ in { journal entries from Linuxes with systemd. ''; buildInputs = [ systemd.dev ]; - postFixup = let libPath = stdenv.lib.makeLibraryPath [ systemd.lib ]; in '' + postFixup = let libPath = stdenv.lib.makeLibraryPath [ (lib.getLib systemd) ]; in '' patchelf --set-rpath ${libPath} "$out/bin/journalbeat" ''; }; diff --git a/pkgs/misc/screensavers/xlockmore/default.nix b/pkgs/misc/screensavers/xlockmore/default.nix index 01ee818f256..b59ed85f6bc 100644 --- a/pkgs/misc/screensavers/xlockmore/default.nix +++ b/pkgs/misc/screensavers/xlockmore/default.nix @@ -2,11 +2,11 @@ , libXdmcp, libXt }: stdenv.mkDerivation rec { - name = "xlockmore-5.64"; + name = "xlockmore-5.65"; src = fetchurl { url = "http://sillycycle.com/xlock/${name}.tar.xz"; - sha256 = "0fbh6avdzsm1prafglr2xdd8c4ibkddi6xxywvqgvzp0zb2kqimr"; + sha256 = "0d4l8ibbvc62whlq8rrbvqr3011a7h21l9na93r579g0dfwdbh6d"; curlOpts = "--user-agent 'Mozilla/5.0'"; }; diff --git a/pkgs/misc/seafile-shared/default.nix b/pkgs/misc/seafile-shared/default.nix index 7546c7626ed..21a89e5f5f2 100644 --- a/pkgs/misc/seafile-shared/default.nix +++ b/pkgs/misc/seafile-shared/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "seafile-shared"; - version = "7.0.7"; + version = "7.0.8"; src = fetchFromGitHub { owner = "haiwen"; repo = "seafile"; rev = "v${version}"; - sha256 = "0vgzb923x2q2w1zgbc56d50a5qj9xm77lg7czfzg3va7vd921gy8"; + sha256 = "0q0zylv8hkhnfw0084bj1wmqwqvpflmdy1njxvvkjsbnflh8kc2y"; }; nativeBuildInputs = [ diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 85df90a9fe1..66f41962666 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -271,6 +271,13 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPinebookPro = buildUBoot { + defconfig = "pinebook-pro-rk3399_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareRK3399}/bl31.elf"; + filesToInstall = [ "u-boot.itb" "idbloader.img"]; + }; + ubootQemuAarch64 = buildUBoot { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/misc/vim-plugins/deprecated.json index 218a1ab622f..b95e91a19b2 100644 --- a/pkgs/misc/vim-plugins/deprecated.json +++ b/pkgs/misc/vim-plugins/deprecated.json @@ -3,6 +3,10 @@ "date": "2020-03-27", "new": "vim-gist" }, + "nvim-lsp": { + "date": "2020-08-31", + "new": "nvim-lspconfig" + }, "vim-jade": { "date": "2020-03-27", "new": "vim-pug" diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 0db9069b748..77b1777ab63 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2020-08-20"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "2b785688ead505dcbc1007374d3dca9914aa247a"; - sha256 = "1n91vm354fd45vvg4skvx7s9mpjpsk1l61n2x5ylqr8dlm7vgjkw"; + rev = "d4a14746cdcda99ec70915c5540962c85e33f661"; + sha256 = "1k93gab46y3ld9s3h3ha3vmdfy37vhb3px79p5a62b21jwma9mxc"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -185,12 +185,12 @@ let awesome-vim-colorschemes = buildVimPluginFrom2Nix { pname = "awesome-vim-colorschemes"; - version = "2020-08-15"; + version = "2020-08-26"; src = fetchFromGitHub { owner = "rafi"; repo = "awesome-vim-colorschemes"; - rev = "0e04854da7695854e7df7c3c771e72ac55a60040"; - sha256 = "1i6y0p7fcvzgxkm82xrypwh7xgp1ywyvqlpglf93bgq8ygsll0v9"; + rev = "b89e17b44dc1bcc189298882a4cb6e3252c2fb4c"; + sha256 = "0grgii328c4y086par9l3f2cq2xh47dqv2w2f4lwd5z9zmnxkv4f"; }; meta.homepage = "https://github.com/rafi/awesome-vim-colorschemes/"; }; @@ -401,12 +401,12 @@ let coc-eslint = buildVimPluginFrom2Nix { pname = "coc-eslint"; - version = "2020-05-21"; + version = "2020-08-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-eslint"; - rev = "eed42192dab175bbf249e21c18c85cbd5afdd92a"; - sha256 = "1a9csiyj7abksar917acfjgypmc28rcfsqga0p1550mjxvkjr2ia"; + rev = "ba4d02c324e3eb5d5f111fe510f623ef14ee340c"; + sha256 = "1badkyfa8zznwlb9a6kqxnyylcjb72rfjrzb48pvx2dr7s631x8g"; }; meta.homepage = "https://github.com/neoclide/coc-eslint/"; }; @@ -425,12 +425,12 @@ let coc-fzf = buildVimPluginFrom2Nix { pname = "coc-fzf"; - version = "2020-08-20"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "antoinemadec"; repo = "coc-fzf"; - rev = "341ea7db0ab85a2ecb3a067ca721c1327fcd7013"; - sha256 = "0gqs6xdnmg33xraxqv10jl7dhaca19dlidmc86zdki2hg1bckr9b"; + rev = "085e54bf91b7f6ce19be9c2801ad4e69b15c24f9"; + sha256 = "0dfpl26jn6gc3nswbz0nclzr0s58fhmrhqvmknssg600wgnrd12v"; }; meta.homepage = "https://github.com/antoinemadec/coc-fzf/"; }; @@ -449,12 +449,12 @@ let coc-go = buildVimPluginFrom2Nix { pname = "coc-go"; - version = "2020-08-12"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-go"; - rev = "b068394634189ede2fb96b742cadcaa852bf46b0"; - sha256 = "099dgk3kc814hgnpd0jhc6sz3d7512i86i99n6hq6yswsg7n1d51"; + rev = "fbac3db20cc5e728b6f1c86bbb73414254c3dce3"; + sha256 = "1d9izf0ypnpbwg15kz3fd62gzz6c5h5568ydc7h5hxh4zj5qfg5h"; }; meta.homepage = "https://github.com/josa42/coc-go/"; }; @@ -557,12 +557,12 @@ let coc-metals = buildVimPluginFrom2Nix { pname = "coc-metals"; - version = "2020-08-19"; + version = "2020-08-21"; src = fetchFromGitHub { owner = "ckipp01"; repo = "coc-metals"; - rev = "14c820dad44b057e2b8343f7d8896529cd973ee6"; - sha256 = "0569by8x73dpb3hapbx73x9fg2wzzb965mkkifqgdq4wdg6wizkx"; + rev = "e2f5e3c2bc6a8226cea5a607585f6db554e15846"; + sha256 = "0kp8q5ds9b64acmkc006664460lfcahly65bx5x95rvy0wy8z5b1"; }; meta.homepage = "https://github.com/ckipp01/coc-metals/"; }; @@ -641,12 +641,12 @@ let coc-rust-analyzer = buildVimPluginFrom2Nix { pname = "coc-rust-analyzer"; - version = "2020-08-20"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "ac57b7b3cdaee3cfb56b76a8fc13444337f09276"; - sha256 = "0n26d63qifhnsrpwq8x587mh9y83rmayc2car222hjqbrg705r28"; + rev = "d66f9a5744477b317423d06463331df7b80a0a7f"; + sha256 = "0vlbyjz09n0zvkbx1kks44mawn21xr24ry28z21zgcv6r0clh1xk"; }; meta.homepage = "https://github.com/fannheyward/coc-rust-analyzer/"; }; @@ -749,24 +749,24 @@ let coc-tsserver = buildVimPluginFrom2Nix { pname = "coc-tsserver"; - version = "2020-08-20"; + version = "2020-08-21"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-tsserver"; - rev = "e4f3ab555b35a0057d22dcc8bb7b7af7e43546d6"; - sha256 = "0i1fpvbl228jhh50fbz8cppv2v20zy0zywb1qgh9hsmw6pfgjg1w"; + rev = "516f2bd75afee70bb8668aa2ecbc00ebfd5984a0"; + sha256 = "1qdgm9w9d9n0aq5y77zlhxzjdilxky7n4ipl6y6gr2pirxw5idw5"; }; meta.homepage = "https://github.com/neoclide/coc-tsserver/"; }; coc-vetur = buildVimPluginFrom2Nix { pname = "coc-vetur"; - version = "2020-06-28"; + version = "2020-08-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc-vetur"; - rev = "37c70071a93aeacf23ac651cd6e9f7ed11582033"; - sha256 = "037p3zkavfyh75wclibd2iwd1ds8kzi72q8zy7rwdchwxw57xwhj"; + rev = "217251dd0fe87d951e630e8fa9d4cde84da0ec91"; + sha256 = "13ni7j70pcz9w856hrgnbm0jsv7a22f1r42wnvif5lvhrcfw3y9d"; }; meta.homepage = "https://github.com/neoclide/coc-vetur/"; }; @@ -833,12 +833,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-08-08"; + version = "2020-08-26"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "806ce47583d66d0b574a3c993526033971e700cf"; - sha256 = "1v29l7jrp1n141q8lywas5jflbjid6rryym732ga41yjqkrmlvip"; + rev = "52c18cefd06879924a8469fc493af58fb3e7f1f4"; + sha256 = "1ddcmfy6mgmmqmj7a5v1dhz5z43wz2wfyzaxbg6hchb3j0h8dmc5"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -882,24 +882,24 @@ let committia-vim = buildVimPluginFrom2Nix { pname = "committia-vim"; - version = "2020-05-14"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "rhysd"; repo = "committia.vim"; - rev = "2cded48477a5e308c77a0d289cc9b540669b701f"; - sha256 = "1g6ykdh7d16q6nvpvmxx4ss8w7cisx5r8qmbrrvhpwmbb3894pxp"; + rev = "1d288281586d1e6b52646a4c412df3dd3a2fe231"; + sha256 = "11ik72qi7fvxkz7fnyisaa0xscy4pksq8l2pvclywzg3lcclhxp1"; }; meta.homepage = "https://github.com/rhysd/committia.vim/"; }; completion-nvim = buildVimPluginFrom2Nix { pname = "completion-nvim"; - version = "2020-08-13"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "completion-nvim"; - rev = "43cb0b123544b602bd31747a3d8cf52ef0660723"; - sha256 = "0qllj4zqbw2fhp17lqk0xmbraq86gl9gjp9vszpd9jbw7h4lh168"; + rev = "ade764f6937721493cbfdc21b5b7e44ba71ee5cc"; + sha256 = "1abdgqpnljy17wfx3ixa73hyzhf3rixmnb2b8h8iyks3hgv9i36r"; }; meta.homepage = "https://github.com/nvim-lua/completion-nvim/"; }; @@ -1086,12 +1086,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-08-19"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "1cfffcff2aba8a7b819f8b27414021d451abb4ce"; - sha256 = "0ysnkwv9hk84i4rdglrmjms24nh9i5x5qvr8lyzrjzzp8zj7qs2l"; + rev = "e4ea8290eba832997eaa36b6810e8ecc15ca1151"; + sha256 = "063vy5kl8vz9c3nnz7g8yw1f1v1vcmxfg4p59mzsfrqf93fs2y30"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1280,12 +1280,12 @@ let deoplete-lsp = buildVimPluginFrom2Nix { pname = "deoplete-lsp"; - version = "2020-07-13"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete-lsp"; - rev = "ae0b7d023a33f0692652a21f532051e8718e1800"; - sha256 = "00008andpp08l6fm8qadp8ycm59s8gx2m1vskmzg3lw905fk0gra"; + rev = "4fd2507dd295d9c114febabb0c9cf31da87df008"; + sha256 = "1alwf8gjvgj5q3sbrqxrm0f2nbf6drk6dxqipk9pmvbj50iadyf1"; }; meta.homepage = "https://github.com/Shougo/deoplete-lsp/"; }; @@ -1350,6 +1350,18 @@ let meta.homepage = "https://github.com/carlitux/deoplete-ternjs/"; }; + deoplete-vim-lsp = buildVimPluginFrom2Nix { + pname = "deoplete-vim-lsp"; + version = "2020-07-24"; + src = fetchFromGitHub { + owner = "lighttiger2505"; + repo = "deoplete-vim-lsp"; + rev = "2ea06074dc07c67ccffc24b976b92e17e9d795d1"; + sha256 = "03rpw1z5fgglba7vymi3ln810nh5x3x9hjqlm41shdik9pgmg867"; + }; + meta.homepage = "https://github.com/lighttiger2505/deoplete-vim-lsp/"; + }; + deoplete-zsh = buildVimPluginFrom2Nix { pname = "deoplete-zsh"; version = "2019-11-10"; @@ -1364,16 +1376,28 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2020-08-10"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "ba3913cc52b457877836f7423b0929b770dda42b"; - sha256 = "16hn83ns278x9p280b0gpk4b4vhg50004bpnff7d3inf3x6pli4j"; + rev = "7ab4c1bde7f9bd8824219594b07e4c1aa0814d4e"; + sha256 = "13p59bxad46pxcihsns2vybjv8m6vhka9vbjvsvn6nwgck4rs1w3"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; + devdocs-vim = buildVimPluginFrom2Nix { + pname = "devdocs-vim"; + version = "2018-08-27"; + src = fetchFromGitHub { + owner = "rhysd"; + repo = "devdocs.vim"; + rev = "1c91c619874f11f2062f80e6ca4b49456f21ae91"; + sha256 = "1nxww2mjabl2g2wchxc4h3a58j64acls24zb5jmfi71b8sai8a9b"; + }; + meta.homepage = "https://github.com/rhysd/devdocs.vim/"; + }; + dhall-vim = buildVimPluginFrom2Nix { pname = "dhall-vim"; version = "2020-08-19"; @@ -1631,12 +1655,12 @@ let fruzzy = buildVimPluginFrom2Nix { pname = "fruzzy"; - version = "2019-10-28"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "raghur"; repo = "fruzzy"; - rev = "b312ae79db98cf6939c8319f2511efa06889e8e3"; - sha256 = "01iisbawq2w7yw866qvv109amnvyaymzyz9nqal3cjrrcwk6mmdk"; + rev = "4cdfee7b828a5cace22bfd93cf23fee0b2b233c4"; + sha256 = "1dmxz283ypz1klcmdf4jk699aifr3dywkh9y8v8v8vyflampqwwp"; }; meta.homepage = "https://github.com/raghur/fruzzy/"; }; @@ -1775,12 +1799,12 @@ let goyo-vim = buildVimPluginFrom2Nix { pname = "goyo-vim"; - version = "2020-06-08"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "goyo.vim"; - rev = "3e129198bba7d6b50406902002ad7d213a6cccaa"; - sha256 = "1b2wsxbg27nmwxrncwddkl2ck8hbiqdqi821vl9d1fl5nx042y2b"; + rev = "a865dec7ca7616dbbd69315ad1417b84d0c411f8"; + sha256 = "09mqmcz79dwcc5mv0p2wc84jc20ipa0vv2yckp4la4xh909ph4hm"; }; meta.homepage = "https://github.com/junegunn/goyo.vim/"; }; @@ -2592,12 +2616,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-08-16"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "56a9d6259981d0d9c2b33a4d65ccbb674af70baa"; - sha256 = "0kn35l7kfqa0zvh1l8mdl3755hv1rx6xp5wjib9acsbk2czhg5nx"; + rev = "491d83c50c9b17c896850bbd7ec00f2019e2f110"; + sha256 = "0mj20dyf2hj9wr1df6rv7yn3mcb8z20bivclm8ircni2gi64bdb9"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2832,38 +2856,38 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2020-08-16"; + version = "2020-08-22"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "47b0828287b410b56ff1a31906c4d5709d143d4a"; - sha256 = "0kl2d58plpnlz2w9haadmbpmkb04bjwgfrs1scwi04mcc8dfpbmn"; + rev = "004dc3cfa93fb56baeaed55291cf356dd1b18f9b"; + sha256 = "0x4r0s9rm2zk8rrvw2m1rfmagmy68d88bmxiqps2c3fb9zd1c7ny"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-hs-vim = buildVimPluginFrom2Nix { pname = "nvim-hs-vim"; - version = "2019-04-14"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "neovimhaskell"; repo = "nvim-hs.vim"; - rev = "5bc177a87c9575c4995df90a098d330fe6e02f75"; - sha256 = "14jgvkvakpy36md5si2a3rf2w869snb65inriq68xbk32bg5pg8q"; + rev = "30baacd3c7a10625cb2d4dd64ae3bbfc4fe3f8c6"; + sha256 = "1w6cr6j77nwxszm1d0y4phvjsz9q4aw214xkscw6izakfmk06h1x"; }; meta.homepage = "https://github.com/neovimhaskell/nvim-hs.vim/"; }; - nvim-lsp = buildVimPluginFrom2Nix { - pname = "nvim-lsp"; - version = "2020-08-10"; + nvim-lspconfig = buildVimPluginFrom2Nix { + pname = "nvim-lspconfig"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "neovim"; - repo = "nvim-lsp"; - rev = "fc9d94ef006e082596c2e8724eb3f1c92ff203c7"; - sha256 = "1byji4p0xigyp8y71s00fs2vrhgz3xkf51mmyz489pp52c7nfx4v"; + repo = "nvim-lspconfig"; + rev = "b7b311e22a0b071dfb43aa6a9ccc0ed92e5eab3d"; + sha256 = "1q9z5hryjm6j2bb6iy57bwadm45m402k2bq1w0dkn1bgsnfkbsg3"; }; - meta.homepage = "https://github.com/neovim/nvim-lsp/"; + meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; nvim-terminal-lua = buildVimPluginFrom2Nix { @@ -2880,12 +2904,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-08-20"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "5c0ca925af3332769f04c122ecb5bb9a5ca36dd0"; - sha256 = "0fmciqdmg5fy1jx2wind0vyykfdvdbls0lyrn85xi4c7d8yg74h2"; + rev = "5948aba886e8aad26043402684cf85c307813c4d"; + sha256 = "1x9pmxwm3lh5w7d22danp8r8g5hycxl1w8q8d1milx882qsjwnqa"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -2976,12 +3000,12 @@ let palenight-vim = buildVimPluginFrom2Nix { pname = "palenight-vim"; - version = "2020-08-10"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "drewtempelmeyer"; repo = "palenight.vim"; - rev = "9637fc4b6dc8ba852d5ec21c2c54851d81576490"; - sha256 = "1im9iggwiz86h0rydaz73482q8ildhd81hscq8czwigb03pslyxg"; + rev = "677745d52c4c03b344cd382dab0554a1d63b0692"; + sha256 = "0av2if81vcknv3w74h5y1mbip8y8i0kif94v5mdc17cfi6d5ngks"; }; meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; }; @@ -3382,6 +3406,18 @@ let meta.homepage = "https://github.com/vim-scripts/ShowMultiBase/"; }; + sideways-vim = buildVimPluginFrom2Nix { + pname = "sideways-vim"; + version = "2020-08-31"; + src = fetchFromGitHub { + owner = "AndrewRadev"; + repo = "sideways.vim"; + rev = "c81d2cabc1ada11f1531b05669fd07f52c75da22"; + sha256 = "042safg5i1f7rnfwlf37ic40rg6s5svsjci3cp06lzy3v9r8n2qf"; + }; + meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; + }; + SimpylFold = buildVimPluginFrom2Nix { pname = "SimpylFold"; version = "2017-06-13"; @@ -3577,12 +3613,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2020-08-14"; + version = "2020-08-24"; src = fetchFromGitHub { owner = "vim-syntastic"; repo = "syntastic"; - rev = "25b816d9b0016eff68e7025fe52fb67ef253920e"; - sha256 = "1hb9f1p7sqpb7kc0rih9kaixwg4s9a6z86ycnc6kxp1iz97d6ai1"; + rev = "9041bc76b4084dda00933744c0dce4bdf43d15c7"; + sha256 = "076z5cs7gjl4hl92fzplabl0wq87hxzsgvmdna6vrzkh7ki2m3cb"; }; meta.homepage = "https://github.com/vim-syntastic/syntastic/"; }; @@ -3625,12 +3661,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-08-17"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "majutsushi"; repo = "tagbar"; - rev = "a81c01c29406df6aa59be221a17953c18ed57ccc"; - sha256 = "1amqxazfjnljylkj5jz3in927mkkhbvchs9pb5cnijfbvrf3dh5s"; + rev = "e5c864738db6135a27b6373585d6f4987ffdddb5"; + sha256 = "0zqmh4lrlb8v1l17789dbl2rj9i0ywcjdpjxzpikiajnsd8q4yl6"; }; meta.homepage = "https://github.com/majutsushi/tagbar/"; }; @@ -3661,12 +3697,12 @@ let tcomment_vim = buildVimPluginFrom2Nix { pname = "tcomment_vim"; - version = "2020-06-18"; + version = "2020-08-23"; src = fetchFromGitHub { owner = "tomtom"; repo = "tcomment_vim"; - rev = "920d465b56bcf96c976fa22e9558d51aa55dcd9c"; - sha256 = "0n7gwdyzim4f92mxnjz4zwfiyapyjhbf21b1l3dq9b07x9m40365"; + rev = "25bdb50a6c5934d4ac9313cef0d7d2168d84803b"; + sha256 = "04dmdydrc4v055qkjn5gfvibyzd30fg00abnk8ijvabfcmhvlh40"; }; meta.homepage = "https://github.com/tomtom/tcomment_vim/"; }; @@ -4140,26 +4176,38 @@ let meta.homepage = "https://github.com/MarcWeber/vim-addon-xdebug/"; }; + vim-after-object = buildVimPluginFrom2Nix { + pname = "vim-after-object"; + version = "2018-09-17"; + src = fetchFromGitHub { + owner = "junegunn"; + repo = "vim-after-object"; + rev = "7f52106df8a05e9bc1c53960c31a55f77e303903"; + sha256 = "13726m0c73n5pw9gil4ahbg71ibklrwkw9yvbr6qxxvn6qyijpdy"; + }; + meta.homepage = "https://github.com/junegunn/vim-after-object/"; + }; + vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2020-08-20"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "ef4666bd86ea1d6ac06a709cde0cde3df537c9e3"; - sha256 = "0rql6vbfr78pnjpbavpkdh47bh4jlzcg5pjf7xcl0273v03b6rbf"; + rev = "c77d89046e5dc66438190e2261fb2197df2a8932"; + sha256 = "009n427sgjmc12rvamda70marjaqpzi9zlddk5d1yim61qvh7djh"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; vim-airline-themes = buildVimPluginFrom2Nix { pname = "vim-airline-themes"; - version = "2020-06-26"; + version = "2020-08-27"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline-themes"; - rev = "04fa4fc40f21d9490954213c1ee06c7fdea66a6d"; - sha256 = "0dzckj0449rw37v5kwmfm5wa9spfhsbfr56i30mb063zmv8wk551"; + rev = "155bce6665ab8c83447102e8402cc9d3b7c3b3f3"; + sha256 = "1qavi386va4wnalaf03b19lfxypbkjcjdiiasbdzfnlqpz7d4rwy"; }; meta.homepage = "https://github.com/vim-airline/vim-airline-themes/"; }; @@ -4238,12 +4286,12 @@ let vim-bazel = buildVimPluginFrom2Nix { pname = "vim-bazel"; - version = "2019-08-14"; + version = "2020-08-22"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "vim-bazel"; - rev = "7c4987b4266d117a9f1d4c7fe7f4dfba33dfc8c8"; - sha256 = "182w8ibr34z86nmx6byabkah0q9fgrzml8m2ardaqzqjqr2ya5yg"; + rev = "85a044d854e5e48f72414726c255112be31e2cac"; + sha256 = "1hcfbl958v39w00kyfg75rcxs9xzaqnd98i4y322ayqfgrhd95n8"; }; meta.homepage = "https://github.com/bazelbuild/vim-bazel/"; }; @@ -4358,12 +4406,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-08-20"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "e690bde9e7838894b68f9d3d4d1a131e86c13ffb"; - sha256 = "1pl32zgwn7ffyfn8xqqlck48sqv78jv8v4pfjay0rgr3jvaxis1v"; + rev = "3850f5aebffeddf3f1a9dfcd8430e8d0b1413480"; + sha256 = "1ivrsiqid4g89vb0kz3mdmlmar4m5irbnqb5j2lnaxbr7dfl7w3c"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4646,12 +4694,12 @@ let vim-dirvish = buildVimPluginFrom2Nix { pname = "vim-dirvish"; - version = "2020-06-30"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "7c4dc5945b15a6b97ebef860070d30e36da01788"; - sha256 = "0mg8fdfsr59015m309kr9v5akwc3zfwfygn36x47c8q2bwjjr052"; + rev = "b136fd27a0afaee8306655eca7ac19d0e780faa3"; + sha256 = "0b6cjxjzkqsrip8b8glwgjam17hjrpk21pgyikfhdrv2cxqvil9z"; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; }; @@ -4862,12 +4910,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2020-08-04"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "8963dd3b385410e27752fb859bd5cecdd22b5f71"; - sha256 = "0ax42ilx24cagy0m6ryda6h0fn7l8g1ckry24vfz2zp7d8y14hah"; + rev = "9e62520397f6e98c6031aba4cb63e611abe4583b"; + sha256 = "144qiari81xwaxw9rd5mh4g1ywn2r141438r3km6dh3acx18f6ij"; }; meta.homepage = "https://github.com/tpope/vim-fireplace/"; }; @@ -4922,12 +4970,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2020-08-21"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "2de1b9bdea54baeb40bc6f3fe761309b4435d156"; - sha256 = "09m31j8cgd8pnyd4p2rh7bj74gh27df98cjy13diljaa56jd6grr"; + rev = "ff4c8b634676e67bf089e936c9afb1d308d594dc"; + sha256 = "1vj0qvbxsp6r4g8v2xwpgmswy54l4lvphzmmvkxp58cpwj7cc10w"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -4970,12 +5018,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2020-07-31"; + version = "2020-08-26"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "260182c65cae653ac20e6a69ba8cc6124e7ba6c2"; - sha256 = "14dmar7d9qajjk2vy223mw7gwdcz548lcj5jg8pg7j4cyc6ffbyp"; + rev = "511d3035d4da2453a9cb0188b6020ed7bc8fc18f"; + sha256 = "003k746mqasd64yca0ay4lzbif7jx0p6ivs2g2f3mlnvpwiiim23"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5030,12 +5078,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2020-08-07"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "8005f71aabef13f5872b3ef4802f36503a16c451"; - sha256 = "0ns33dbkw8lc6rj6mvkgymdsl3i4g8slbh06g8h4rfn8qq5wjxbw"; + rev = "098b9c82e9ac39b0d203635a8041bb1aceb8426c"; + sha256 = "1d0shs6q509zwfpp0dqffhh5fm8fr8x6km6w8mf4m9p1fkxyaz1g"; }; meta.homepage = "https://github.com/airblade/vim-gitgutter/"; }; @@ -5066,12 +5114,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2020-08-19"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "7c14e8ae5de7f4562c365249c83abc4d0e0d906c"; - sha256 = "1l96mlkfvpsa2bw9rc4m8s7abjvcfyy05gsm445rzbijqxigkknk"; + rev = "bf2dd524a7d7a2c6f50642ec3dae2bc1506b5c94"; + sha256 = "0d1gnszjppp4p1b39jxa19fdg77iq6baxm5hbjiinidmhgbal35w"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -5090,12 +5138,12 @@ let vim-graphql = buildVimPluginFrom2Nix { pname = "vim-graphql"; - version = "2020-08-17"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "1b9db5b2089751dc80a5dab9fa976a9750c3066c"; - sha256 = "14bp6knckqa8rc9xwd5cnd6cnfhi0j6vgv0yl5nin47yzv0navha"; + rev = "e64fba4ee17fa8dd391405982500c72d68fc50b9"; + sha256 = "1pf0lpjy88hwmxn3lybjkq10w6s666wmpbzsfkjbp8xmqhzlvaf6"; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; }; @@ -5306,12 +5354,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2020-06-09"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "0778289e391c419f7a3af9de8229f798ee292013"; - sha256 = "1l5s5f4fw96w437rdf85lym7g75hnz8sb2fdj9hygyg0sp42r0cf"; + rev = "56e7df8f402a8302fa7f6cb21760d366a105d94c"; + sha256 = "0j4986pdh06q5d0bq4k6lq0b6bgi1fazng106ykhg3aaxjqqhs37"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -5463,12 +5511,12 @@ let vim-jsdoc = buildVimPluginFrom2Nix { pname = "vim-jsdoc"; - version = "2020-07-23"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "heavenshell"; repo = "vim-jsdoc"; - rev = "ed31c776d1da96ed8d950aef5ffba3f767f2acb4"; - sha256 = "1qp5n04igirkqzqh7vfw0jnb31p36h356nc4n1kzna4zyqndzk9s"; + rev = "5bbe872ee41e50bd5b99bf6204d6147dab39cdc5"; + sha256 = "0jmmkqzan5mkc0j05243f5layqj7fny92rl1vlj32ipv8wgdmczn"; }; meta.homepage = "https://github.com/heavenshell/vim-jsdoc/"; }; @@ -5655,16 +5703,28 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2020-07-12"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "632d49bf7a227e13bea6ef341de35f89e45c55b0"; - sha256 = "1an37vkr9di0abxfnidlbij37xxy5z1cwnvpcnink4gman1msyzy"; + rev = "ab952d62a3c57d176e6c63b3f3c95b8ba37b0630"; + sha256 = "07caiz9k3bx5qn5kg5hbh2a2d77bfvyfg9rx7s7zkavpz312r4kc"; }; meta.homepage = "https://github.com/natebosch/vim-lsc/"; }; + vim-lsp = buildVimPluginFrom2Nix { + pname = "vim-lsp"; + version = "2020-08-31"; + src = fetchFromGitHub { + owner = "prabirshrestha"; + repo = "vim-lsp"; + rev = "1230ae8fa3d7004e6c3d74c1a5aa6c17acaf9f74"; + sha256 = "1q08h0in1x4hhhvpjx379qw07ghinrxizzvr8f7xxsgg9lpdjxji"; + }; + meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; + }; + vim-maktaba = buildVimPluginFrom2Nix { pname = "vim-maktaba"; version = "2020-08-06"; @@ -5689,6 +5749,18 @@ let meta.homepage = "https://github.com/lambdalisue/vim-manpager/"; }; + vim-markbar = buildVimPluginFrom2Nix { + pname = "vim-markbar"; + version = "2020-08-31"; + src = fetchFromGitHub { + owner = "Yilin-Yang"; + repo = "vim-markbar"; + rev = "df13c3abe88c01a716b1099de953dcfa1679e663"; + sha256 = "1y5w182d57z1nl8c7ng25m88by88pnxqdsxmcnnygdfjmvbv8jl9"; + }; + meta.homepage = "https://github.com/Yilin-Yang/vim-markbar/"; + }; + vim-markdown = buildVimPluginFrom2Nix { pname = "vim-markdown"; version = "2020-07-14"; @@ -5725,6 +5797,18 @@ let meta.homepage = "https://github.com/samoshkin/vim-mergetool/"; }; + vim-merginal = buildVimPluginFrom2Nix { + pname = "vim-merginal"; + version = "2020-01-29"; + src = fetchFromGitHub { + owner = "idanarye"; + repo = "vim-merginal"; + rev = "02ac69b0468b7aec437df48df07f939558e85c9a"; + sha256 = "0m5lym56xzp1gnwb79vjmigfi6ar0iqbzaydv2r8c47jj7xyxiz6"; + }; + meta.homepage = "https://github.com/idanarye/vim-merginal/"; + }; + vim-metamath = buildVimPluginFrom2Nix { pname = "vim-metamath"; version = "2017-02-10"; @@ -5751,12 +5835,12 @@ let vim-monokai = buildVimPluginFrom2Nix { pname = "vim-monokai"; - version = "2020-08-08"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "crusoexia"; repo = "vim-monokai"; - rev = "85b18e98a22b17f9e01867988c18cf396316c20f"; - sha256 = "1vzllvq1ncq4qyqbkp8z26sr4n9kpqv35zkfjas3r2jqbn958a93"; + rev = "e0714a6e21dfba55b1af202d09f8f50d27b00e85"; + sha256 = "0q1sxla2s381yjsyjjcd77pp4s98s0579mpr4iln59z60ysayc95"; }; meta.homepage = "https://github.com/crusoexia/vim-monokai/"; }; @@ -6135,12 +6219,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-08-08"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "13ea184015c30be5160ae285aedc0eaec0c72e6c"; - sha256 = "19vd5cmshlwrrf5ncgkny9p478d7bhjjwwjv71xb2adyfc9r1rv6"; + rev = "a9bf5bd72212ff7cf9e9e863c365a3464faa2426"; + sha256 = "0rrmz7vn3kxgrbwmil3vlddq13sy9wbgmn5kgz1r12wcbwf1sb56"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -6159,12 +6243,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-08-18"; + version = "2020-08-29"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "0df1bfa0c5f3efb6688566d5656a330034772037"; - sha256 = "1ba96gk3qs1d2zaxs24dk624z9b9ip7yx4vg0klasf4xq8s6kwjs"; + rev = "d4fcef1aa835f20f4f9df41eceb406b66f446f70"; + sha256 = "1jn0581k1xcsvl0nz0q3qbz2k4cpzn9bjw77fn86xx3v9pg55szh"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6291,12 +6375,12 @@ let vim-quickrun = buildVimPluginFrom2Nix { pname = "vim-quickrun"; - version = "2020-07-25"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-quickrun"; - rev = "3f49e05fb6072d6b7bc7fe20d0356cf15ef3b9de"; - sha256 = "02kyp6l6m1nybfqx3d88yi34isrid355wiln6cskvxz2hpx532g8"; + rev = "c688f336a4aeb002319994f4fb4a8873f204f0ab"; + sha256 = "1wzcvshwn4gvjbcmni1r473001m5ipamggkcpwsa7xr74sj4rn73"; }; meta.homepage = "https://github.com/thinca/vim-quickrun/"; }; @@ -6327,12 +6411,12 @@ let vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2020-06-19"; + version = "2020-08-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "187742a3c18d93e6968f024d7db0f4fc5548408e"; - sha256 = "132rvyn5pwg5xkm6q64k33vm6q9hfpng0wq25387l8l8a7hvj3az"; + rev = "858a379bcb389d67abdb7e0eb1b0a1fa78d8ba39"; + sha256 = "077jxka05w452g7vrlx1dly85ddqv8z8fh3xklq6dvz016x306m4"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -6387,12 +6471,12 @@ let vim-ruby = buildVimPluginFrom2Nix { pname = "vim-ruby"; - version = "2020-08-03"; + version = "2020-08-28"; src = fetchFromGitHub { owner = "vim-ruby"; repo = "vim-ruby"; - rev = "fe2e520c62dfe10b9bc192b6c2651ef0519b1070"; - sha256 = "1xh6h5wg242mzqshka5m3693r25www46p29cr92yi995a2izm2fw"; + rev = "e367f7b33fe9159c943963f3f839e4d08b74090e"; + sha256 = "1pngmr6ww4fmn71rshi1npyswp48dq3p7m02s6s703bg83smvmc8"; }; meta.homepage = "https://github.com/vim-ruby/vim-ruby/"; }; @@ -6603,12 +6687,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2020-06-29"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "afe94543bb3bb95ef9ae2a58eebcbc17d69eb304"; - sha256 = "0iaksyh77xahg5cp0q9x5c14jdklsrgy9400jp4xjb83qgg6d7qq"; + rev = "7d82982e3858a6a514525acbba8bf2dff7da6c64"; + sha256 = "124iqc9vdaa4ms03v20d9np95dizbp23gs3680dws1gjskq9z2pv"; }; meta.homepage = "https://github.com/justinmk/vim-sneak/"; }; @@ -6627,12 +6711,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-08-19"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "c093074fec6ba83aced4958ea44af11c5e5dff30"; - sha256 = "0919fhzpg7scm7idq4vh7kqjvlmc4037cn5d24ggsvziybi07k9p"; + rev = "c609efe753ccc2f2631908149e94febc0b257052"; + sha256 = "00m2kjkqyz1s36hn2m7qd98ms26cxhcbh1qhpnzbhfldz0wq9dd5"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6844,12 +6928,12 @@ let vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2020-08-12"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "vim-test"; repo = "vim-test"; - rev = "edacfbe57fdbba4788e8c280d37606470b9b70ca"; - sha256 = "1bi2rsszdpv7vj1xk536lzm54dzk1z41hfp0qr1pzz9lv8fa4sgv"; + rev = "d1b82e939135bbfc928d2fe54382631f20c6cbb3"; + sha256 = "1avlh0srwi0xyawp24s1s2hlzs1pj83d5wsn5ha8y9hd96byaxja"; }; meta.homepage = "https://github.com/vim-test/vim-test/"; }; @@ -6928,12 +7012,12 @@ let vim-themis = buildVimPluginFrom2Nix { pname = "vim-themis"; - version = "2020-07-29"; + version = "2020-08-23"; src = fetchFromGitHub { owner = "thinca"; repo = "vim-themis"; - rev = "47bc9855d7c2b1452d8a0abda91bda35837f8552"; - sha256 = "083k1v9gmmmhmll61kywgd1cn1l2qkfk6sqjjkcv6az01rkrm521"; + rev = "51bec3386b661d28fda7736006475b8b2ebe343d"; + sha256 = "05988ila63kj1r62v7ii76972fgw2300h4dbaml81i643yw0p81p"; }; meta.homepage = "https://github.com/thinca/vim-themis/"; }; @@ -7046,6 +7130,18 @@ let meta.homepage = "https://github.com/lumiliet/vim-twig/"; }; + vim-twiggy = buildVimPluginFrom2Nix { + pname = "vim-twiggy"; + version = "2019-06-24"; + src = fetchFromGitHub { + owner = "sodapopcan"; + repo = "vim-twiggy"; + rev = "962b181f402f05b66641308fe1b3538d5f863ab8"; + sha256 = "0cqarsvdw9gr8pqp1gjy4rb6aaifjyb7iaaa2g8msr1ps0ihs3gd"; + }; + meta.homepage = "https://github.com/sodapopcan/vim-twiggy/"; + }; + vim-unimpaired = buildVimPluginFrom2Nix { pname = "vim-unimpaired"; version = "2020-04-26"; @@ -7120,12 +7216,12 @@ let vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2020-08-21"; + version = "2020-08-31"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "bf0d6c142721d3c1e3ce1f35b205655657db13c9"; - sha256 = "1z90g90h0yc9xiwl4bwbq3nawks0rzsbxr1ryy07w3qjcg7kwrdp"; + rev = "7bdd786c0ffe1f0876eabcd70daa15f82dc07af9"; + sha256 = "1bab231y2fcdnpi3fi3as79m2cx28d2drpy5iv77h5q1xgpz2jak"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -7370,14 +7466,27 @@ let meta.homepage = "https://github.com/Shougo/vimshell.vim/"; }; + vimspector = buildVimPluginFrom2Nix { + pname = "vimspector"; + version = "2020-08-29"; + src = fetchFromGitHub { + owner = "puremourning"; + repo = "vimspector"; + rev = "e634982d78573cf0d678b2981b9ac59cd99126cb"; + sha256 = "09ifckx1rks7qdj6zq7vqw3acfx6bxqa6ylsls1rnckn0fnn6li4"; + fetchSubmodules = true; + }; + meta.homepage = "https://github.com/puremourning/vimspector/"; + }; + vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2020-08-21"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "e14617591fcf59b638d25320215a80f437009119"; - sha256 = "10nlqbqfna5lvlk6rd4zsr5056vx2d22n6hm8sdpxp094nrqbdic"; + rev = "5ff0ed043eefba26f93883759204e86d25323253"; + sha256 = "0nhxcfkr9f1svjki8m85if8acanw06ki1gax8x47sr43xns1i92r"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; @@ -7553,12 +7662,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2020-08-05"; + version = "2020-08-25"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "bcfd153813ac1f99947b706991eba2861f54a8a2"; - sha256 = "1mqgqzfx6v7ps8gk7qgs8mihb35i3q100m39sd8wl1ihgcsq3w1r"; + rev = "2afee9d9771cf53eec63ab854bcd491fe277109e"; + sha256 = "08dmzy789zg8s9m5gm4rlg9jrs9fv546x6lvziiamn70jbrfrrlg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -7590,24 +7699,24 @@ let zenburn = buildVimPluginFrom2Nix { pname = "zenburn"; - version = "2020-01-23"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "jnurmine"; repo = "zenburn"; - rev = "ec6f369a000602e37e7c066b725f9d6bd12538f4"; - sha256 = "1ff5ac8lp7fq854kgf03c5h695lm60giw0qda5z428mmzwq0xask"; + rev = "94b8319a881b0d2dfe738bae23dbc2129f0e78db"; + sha256 = "1js7zadw2y2gml3h1z5nqsjw8jafhgw4f2ajplr5nvai8j89j983"; }; meta.homepage = "https://github.com/jnurmine/zenburn/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2020-07-20"; + version = "2020-08-30"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "079985534a5f2795bfaf549f276d4a1c213bfcb1"; - sha256 = "173yx5nv9pnjm1qxcfkgbf4yfbjyifqjn5qvk8ibdvdxrhyvbrdn"; + rev = "3c95b67a76934959f9124e39e64eb14f65f14dc9"; + sha256 = "0m152kf9yw7q2slci2bzsqmycl9nxawhhclr4r9k5q87xdrzjqk0"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 6b521cadfc3..0b367bd4bb1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -11,6 +11,7 @@ alx741/vim-stylishask amiorin/ctrlp-z andrep/vimacs andreshazard/vim-logreview +AndrewRadev/sideways.vim AndrewRadev/splitjoin.vim andsild/peskcolor.vim andviro/flake8-vim @@ -155,6 +156,7 @@ hsitz/VimOrganizer iamcco/coc-spell-checker iamcco/coc-vimlsp ianks/vim-tsx +idanarye/vim-merginal idris-hackers/idris-vim ihsanturk/neuron.vim Inazuma110/deoplete-greek @@ -205,6 +207,7 @@ junegunn/gv.vim junegunn/limelight.vim junegunn/seoul256.vim junegunn/vader.vim +junegunn/vim-after-object junegunn/vim-easy-align junegunn/vim-github-dashboard junegunn/vim-peekaboo @@ -249,6 +252,7 @@ lepture/vim-jinja lervag/vimtex lfilho/cosco.vim lifepillar/vim-mucomplete +lighttiger2505/deoplete-vim-lsp lilydjwg/colorizer liuchengxu/vim-clap liuchengxu/vim-which-key @@ -380,7 +384,7 @@ neoclide/denite-extra neoclide/denite-git neoclide/vim-easygit neomake/neomake -neovim/nvim-lsp +neovim/nvim-lspconfig neovim/nvimdev.nvim neovimhaskell/haskell-vim neovimhaskell/nvim-hs.vim @@ -420,10 +424,12 @@ ponko2/deoplete-fish posva/vim-vue powerman/vim-plugin-AnsiEsc PProvost/vim-ps1 +prabirshrestha/vim-lsp preservim/nerdcommenter preservim/nerdtree psliwka/vim-smoothie ptzz/lf.vim +puremourning/vimspector purescript-contrib/purescript-vim python-mode/python-mode qnighy/lalrpop.vim @@ -440,6 +446,7 @@ rbgrouleff/bclose.vim reedes/vim-pencil reedes/vim-wordy rhysd/committia.vim +rhysd/devdocs.vim rhysd/git-messenger.vim rhysd/vim-clang-format rhysd/vim-grammarous @@ -491,6 +498,7 @@ sjl/gundo.vim sjl/splice.vim sk1418/last256 slashmili/alchemist.vim +sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf stefandtw/quickfix-reflector.vim @@ -629,6 +637,7 @@ xolox/vim-misc xuhdev/vim-latex-live-preview ycm-core/YouCompleteMe Yggdroot/indentLine +Yilin-Yang/vim-markbar yuki-ycino/ncm2-dictionary zah/nim.vim ziglang/zig.vim diff --git a/pkgs/misc/vscode-extensions/updateSettings.nix b/pkgs/misc/vscode-extensions/updateSettings.nix index a033229c589..c7fecf08072 100644 --- a/pkgs/misc/vscode-extensions/updateSettings.nix +++ b/pkgs/misc/vscode-extensions/updateSettings.nix @@ -16,7 +16,7 @@ let updateVSCodeSettingsCmd = '' ( - echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' + echo 'updateSettings.nix: Updating ${vscodeSettingsFile}...' oldSettings=$(cat ${vscodeSettingsFile}) echo $oldSettings' ${builtins.toJSON settings}' | ${jq}/bin/jq -s add > ${vscodeSettingsFile} )''; @@ -25,10 +25,10 @@ let fileName = builtins.baseNameOf vscodeSettingsFile; symlinkFromUserSettingCmd = lib.optionalString symlinkFromUserSetting '' && mkdir -p "${userSettingsFolder}" && ln -sfv "$(pwd)/${vscodeSettingsFile}" "${userSettingsFolder}/" ''; -in +in writeShellScriptBin ''vscodeNixUpdate-${lib.removeSuffix ".json" (fileName)}'' - (lib.optionalString (settings != {}) + (lib.optionalString (settings != {}) (if createIfDoesNotExists then '' [ ! -f "${vscodeSettingsFile}" ] && ${createEmptySettingsCmd} ${updateVSCodeSettingsCmd} ${symlinkFromUserSettingCmd} diff --git a/pkgs/misc/vscode-extensions/vscodeEnv.nix b/pkgs/misc/vscode-extensions/vscodeEnv.nix index 6e4bb7b3ea8..7c58a4bdfb3 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnv.nix +++ b/pkgs/misc/vscode-extensions/vscodeEnv.nix @@ -21,13 +21,13 @@ , user-data-dir ? ''"''${TMP}''${name}"/vscode-data-dir'' # if file exists will use it and import the extensions in it into this dervation else will use empty extensions list # this file will be created/updated by vscodeExts2nix when vscode exists -, mutableExtensionsFile +, mutableExtensionsFile }: -let +let mutableExtensionsFilePath = toString mutableExtensionsFile; - mutableExtensions = if builtins.pathExists mutableExtensionsFile + mutableExtensions = if builtins.pathExists mutableExtensionsFile then import mutableExtensionsFilePath else []; - vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { + vscodeWithConfiguration = import ./vscodeWithConfiguration.nix { inherit lib writeShellScriptBin extensionsFromVscodeMarketplace; vscodeDefault = vscode; } @@ -63,19 +63,19 @@ let symlinkFromUserSetting = (user-data-dir != ""); }; - vscodeExts2nix = import ./vscodeExts2nix.nix { + vscodeExts2nix = import ./vscodeExts2nix.nix { inherit lib writeShellScriptBin; vscodeDefault = vscodeWithConfiguration; } { extensionsToIgnore = nixExtensions; - extensions = mutableExtensions; + extensions = mutableExtensions; }; code = writeShellScriptBin "code" '' ${updateSettingsCmd}/bin/vscodeNixUpdate-settings ${updateLaunchCmd}/bin/vscodeNixUpdate-launch ${updateKeybindingsCmd}/bin/vscodeNixUpdate-keybindings - ${vscodeWithConfiguration}/bin/code --wait "$@" + ${vscodeWithConfiguration}/bin/code --wait "$@" echo 'running vscodeExts2nix to update ${mutableExtensionsFilePath}...' ${vscodeExts2nix}/bin/vscodeExts2nix > ${mutableExtensionsFilePath} ''; diff --git a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix index d7e586cab6e..19a9edbf1af 100644 --- a/pkgs/misc/vscode-extensions/vscodeEnvTest.nix +++ b/pkgs/misc/vscode-extensions/vscodeEnvTest.nix @@ -1,5 +1,5 @@ with import <nixpkgs>{}; -callPackage (import ./vscodeEnv.nix) { +callPackage (import ./vscodeEnv.nix) { extensionsFromVscodeMarketplace = vscode-utils.extensionsFromVscodeMarketplace; vscodeDefault = vscode; } { @@ -9,4 +9,3 @@ callPackage (import ./vscodeEnv.nix) { t = "test"; }; } - diff --git a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix index afd176b4c5e..58ad5866c93 100644 --- a/pkgs/misc/vscode-extensions/vscodeExts2nix.nix +++ b/pkgs/misc/vscode-extensions/vscodeExts2nix.nix @@ -1,24 +1,24 @@ -# based on the passed vscode will stdout a nix expression with the installed vscode extensions +# based on the passed vscode will stdout a nix expression with the installed vscode extensions { lib , vscodeDefault , writeShellScriptBin }: ##User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault , extensionsToIgnore ? [] # will use those extensions to get sha256 if still exists when executed. -, extensions ? [] +, extensions ? [] }: -let +let mktplcExtRefToFetchArgs = import ./mktplcExtRefToFetchArgs.nix; in writeShellScriptBin "vscodeExts2nix" '' - echo '[' + echo '[' for line in $(${vscode}/bin/code --list-extensions --show-versions \ ${lib.optionalString (extensionsToIgnore != []) '' - | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' + | grep -v -i '^\(${lib.concatMapStringsSep "\\|" (e : ''${e.publisher}.${e.name}'') extensionsToIgnore}\)' ''} ) ; do [[ $line =~ ([^.]*)\.([^@]*)@(.*) ]] diff --git a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix index f15d14c7441..e20c631f8c0 100644 --- a/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix +++ b/pkgs/misc/vscode-extensions/vscodeWithConfiguration.nix @@ -1,22 +1,22 @@ # wrapper over vscode to control extensions per project (extensions folder will be created in execution path) -{ lib -, writeShellScriptBin -, extensionsFromVscodeMarketplace +{ lib +, writeShellScriptBin +, extensionsFromVscodeMarketplace , vscodeDefault }: ## User input -{ vscode ? vscodeDefault +{ vscode ? vscodeDefault # extensions to be symlinked into the project's extensions folder -, nixExtensions ? [] +, nixExtensions ? [] # extensions to be copied into the project's extensions folder -, mutableExtensions ? [] -, vscodeExtsFolderName ? ".vscode-exts" +, mutableExtensions ? [] +, vscodeExtsFolderName ? ".vscode-exts" , user-data-dir ? ''"''${TMP}vscodeWithConfiguration/vscode-data-dir"'' }: -let +let nixExtsDrvs = extensionsFromVscodeMarketplace nixExtensions; mutExtsDrvs = extensionsFromVscodeMarketplace mutableExtensions; - mutableExtsPaths = lib.forEach mutExtsDrvs ( e: + mutableExtsPaths = lib.forEach mutExtsDrvs ( e: { origin = ''${e}/share/vscode/extensions/${e.vscodeExtUniqueId}''; target = ''${vscodeExtsFolderName}/${e.vscodeExtUniqueId}-${(lib.findSingle (ext: ''${ext.publisher}.${ext.name}'' == e.vscodeExtUniqueId) "" "m" mutableExtensions ).version}''; @@ -39,16 +39,16 @@ let cp -a ${ePath.origin} ${ePath.target} chmod -R u+rwx ${ePath.target} fi - '') mutableExtsPaths} + '') mutableExtsPaths} ''; in writeShellScriptBin "code" '' - if ! [[ "$@" =~ "--list-extension" ]]; then - mkdir -p "${vscodeExtsFolderName}" + if ! [[ "$@" =~ "--list-extension" ]]; then + mkdir -p "${vscodeExtsFolderName}" ${rmExtensions} ${cpExtensions} fi - ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ + ${vscode}/bin/code --extensions-dir "${vscodeExtsFolderName}" ${ lib.optionalString (user-data-dir != "") ''--user-data-dir ${user-data-dir }'' } "$@" '' diff --git a/pkgs/os-specific/darwin/discrete-scroll/default.nix b/pkgs/os-specific/darwin/discrete-scroll/default.nix new file mode 100644 index 00000000000..e72402b7793 --- /dev/null +++ b/pkgs/os-specific/darwin/discrete-scroll/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, Cocoa }: + +## after launching for the first time, grant access for parent application (e.g. Terminal.app) +## from 'system preferences >> security & privacy >> accessibility' +## and then launch again + +stdenv.mkDerivation rec { + pname = "discrete-scroll"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "emreyolcu"; + repo = "discrete-scroll"; + rev = "v${version}"; + sha256 = "0aqkp4kkwjlkll91xbqwf8asjww8ylsdgqvdk8d06bwdvg2cgvhg"; + }; + + buildInputs = [ Cocoa ]; + + buildPhase = '' + cc -std=c99 -O3 -Wall -framework Cocoa -o dc DiscreteScroll/main.m + ''; + + installPhase = '' + mkdir -p $out/bin + cp ./dc $out/bin/discretescroll + ''; + + meta = with lib; { + description = "Fix for OS X's scroll wheel problem"; + homepage = "https://github.com/emreyolcu/discrete-scroll"; + platforms = platforms.darwin; + license = licenses.mit; + }; +} diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index 807ab4fa44b..0e10add5561 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -130,7 +130,11 @@ let libapparmor.python ]; - prePatch = prePatchCommon; + prePatch = prePatchCommon + '' + substituteInPlace ./utils/apparmor/easyprof.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" + substituteInPlace ./utils/apparmor/aa.py --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" + substituteInPlace ./utils/logprof.conf --replace "/sbin/apparmor_parser" "${apparmor-parser}/bin/apparmor_parser" + ''; inherit patches; postPatch = "cd ./utils"; makeFlags = [ "LANGS=" ]; diff --git a/pkgs/os-specific/linux/bcc/default.nix b/pkgs/os-specific/linux/bcc/default.nix index 98de3ed1b11..de02ffb30a3 100644 --- a/pkgs/os-specific/linux/bcc/default.nix +++ b/pkgs/os-specific/linux/bcc/default.nix @@ -1,15 +1,16 @@ -{ stdenv, fetchurl, makeWrapper, cmake, llvmPackages, kernel +{ stdenv, fetchurl, fetchpatch +, makeWrapper, cmake, llvmPackages, kernel , flex, bison, elfutils, python, luajit, netperf, iperf, libelf , systemtap, bash }: python.pkgs.buildPythonApplication rec { pname = "bcc"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { url = "https://github.com/iovisor/bcc/releases/download/v${version}/bcc-src-with-submodule.tar.gz"; - sha256 = "1k00xbhdzdvqp4hfxpgg34bbhnx597jjhpg1x6dz2w80r7xzsj28"; + sha256 = "sha256-ekVRyugpZOU1nr0N9kWCSoJTmtD2qGsn/DmWgK7XZ/c="; }; format = "other"; @@ -23,6 +24,12 @@ python.pkgs.buildPythonApplication rec { # This is needed until we fix # https://github.com/NixOS/nixpkgs/issues/40427 ./fix-deadlock-detector-import.patch + + # This is already upstream; remove it on the next release + (fetchpatch { + url = "https://github.com/iovisor/bcc/commit/60de17161fe7f44b534a8da343edbad2427220e3.patch"; + sha256 = "0pd5b4vgpdxbsrjwrw2kmn4l9hpj0rwdm3hvwvk7dsr3raz7w4b3"; + }) ]; propagatedBuildInputs = [ python.pkgs.netaddr ]; diff --git a/pkgs/os-specific/linux/bpftrace/default.nix b/pkgs/os-specific/linux/bpftrace/default.nix index 0c360e60b7e..fc7c8ecba2d 100644 --- a/pkgs/os-specific/linux/bpftrace/default.nix +++ b/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchFromGitHub , cmake, pkgconfig, flex, bison -, llvmPackages, kernel, elfutils, libelf, bcc +, llvmPackages, kernel, elfutils +, libelf, libbfd, libbpf, libopcodes, bcc }: stdenv.mkDerivation rec { pname = "bpftrace"; - version = "0.9.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "iovisor"; repo = "bpftrace"; rev = "refs/tags/v${version}"; - sha256 = "00fvkq3razwacnpb82zkpv63dgyigbqx3gj6g0ka94nwa74i5i77"; + sha256 = "02f2r731yj3fdc8341id1ksk4dma9rwm2765n2xgx2ldrrz5823y"; }; enableParallelBuilding = true; @@ -19,6 +20,7 @@ stdenv.mkDerivation rec { buildInputs = with llvmPackages; [ llvm clang-unwrapped kernel elfutils libelf bcc + libbpf libbfd libopcodes ]; nativeBuildInputs = [ cmake pkgconfig flex bison ] @@ -41,7 +43,7 @@ stdenv.mkDerivation rec { # cmakeFlags = [ "-DBUILD_TESTING=FALSE" - "-DLIBBCC_INCLUDE_DIRS=${bcc}/include/bcc" + "-DLIBBCC_INCLUDE_DIRS=${bcc}/include" ]; # nuke the example/reference output .txt files, for the included tools, diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix index 32905b8ec39..a52b8738570 100644 --- a/pkgs/os-specific/linux/conspy/default.nix +++ b/pkgs/os-specific/linux/conspy/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="conspy"; - version="1.14"; + version="1.16"; name="${baseName}-${version}"; - hash="069k26xpzsvrn3197ix5yd294zvz03zi2xqj4fip6rlsw74habsf"; - url="mirror://sourceforge/project/conspy/conspy-1.14-1/conspy-1.14.tar.gz"; - sha256="069k26xpzsvrn3197ix5yd294zvz03zi2xqj4fip6rlsw74habsf"; + hash="02andak806vd04bgjlr0y0d2ddx7cazyf8nvca80vlh8x94gcppf"; + url="mirror://sourceforge/project/conspy/conspy-1.16-1/conspy-1.16.tar.gz"; + sha256="02andak806vd04bgjlr0y0d2ddx7cazyf8nvca80vlh8x94gcppf"; }; buildInputs = [ autoconf automake ncurses diff --git a/pkgs/os-specific/linux/deepin-anything/default.nix b/pkgs/os-specific/linux/deepin-anything/default.nix deleted file mode 100644 index 4139cc153cd..00000000000 --- a/pkgs/os-specific/linux/deepin-anything/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, deepin, kernel }: - -stdenv.mkDerivation { - pname = "deepin-anything-module"; - version = "${deepin.deepin-anything.version}-${kernel.version}"; - src = deepin.deepin-anything.modsrc; - - nativeBuildInputs = kernel.moduleBuildDependencies; - - buildPhase = '' - make -C src/deepin-anything-0.0 kdir=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build - ''; - - installPhase = '' - install -m 644 -D -t $out/lib/modules/${kernel.modDirVersion}/extra src/deepin-anything-0.0/*.ko - ''; - - meta = deepin.deepin-anything.meta // { - description = deepin.deepin-anything.meta.description + " (kernel modules)"; - badPlatforms = [ "aarch64-linux" ]; # the kernel module is not building - }; -} diff --git a/pkgs/os-specific/linux/firmware/fwupd/default.nix b/pkgs/os-specific/linux/firmware/fwupd/default.nix index 0783fb79296..66edb34d244 100644 --- a/pkgs/os-specific/linux/firmware/fwupd/default.nix +++ b/pkgs/os-specific/linux/firmware/fwupd/default.nix @@ -167,6 +167,11 @@ let # Needs a different set of modules than po/make-images. inherit installedTestsPython; }) + + (fetchpatch { + url = "https://github.com/fwupd/fwupd/commit/3e82beeddac31292c50229e59e2404865edee5ad.patch"; + sha256 = "17p9r8qddqkrnhy9bvp9207afh5fcl1whn79nqcp57b4q4c17zgk"; + }) ]; postPatch = '' diff --git a/pkgs/os-specific/linux/fscrypt/default.nix b/pkgs/os-specific/linux/fscrypt/default.nix index 1086e5ece04..000400e4cdf 100644 --- a/pkgs/os-specific/linux/fscrypt/default.nix +++ b/pkgs/os-specific/linux/fscrypt/default.nix @@ -34,10 +34,6 @@ buildGoModule rec { make install ''; - preFixup = '' - remove-references-to -t ${fscrypt-experimental.go} $out/lib/security/pam_fscrypt.so - ''; - meta = with stdenv.lib; { description = "A high-level tool for the management of Linux filesystem encryption"; diff --git a/pkgs/os-specific/linux/fswebcam/default.nix b/pkgs/os-specific/linux/fswebcam/default.nix index 53a1bdbc4c7..fc1a2563382 100644 --- a/pkgs/os-specific/linux/fswebcam/default.nix +++ b/pkgs/os-specific/linux/fswebcam/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libv4l, gd }: stdenv.mkDerivation rec { - name = "fswebcam-20140113"; + name = "fswebcam-20200725"; src = fetchurl { url = "https://www.sanslogic.co.uk/fswebcam/files/${name}.tar.gz"; - sha256 = "3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199"; + sha256 = "1dazsrcaw9s30zz3jpxamk9lkff5dkmflp1s0jjjvdbwa0k6k6ii"; }; buildInputs = diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 5a3a5bf7a4d..bba3549daf6 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,18 +11,15 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "20.02.15268"; + version = "20.33.17675"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "138gi92w85bn6haw5x38k39pgiyvvzfhiwpvz6hqlx2j03n8cs2k"; + sha256 = "1ckzspf05skdrjh947gv96finxbv5dpgc84hppm5pdsp5q70iyxp"; }; - # Build script tries to write the ICD to /etc - patches = [ ./etc-dir.patch ]; - nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ intel-gmmlib intel-graphics-compiler libva ]; @@ -31,7 +28,7 @@ stdenv.mkDerivation rec { "-DSKIP_UNIT_TESTS=1" "-DIGC_DIR=${intel-graphics-compiler}" - "-DETC_DIR=${placeholder "out"}/etc" + "-DOCL_ICD_VENDORDIR=${placeholder "out"}/etc/OpenCL/vendors" # The install script assumes this path is relative to CMAKE_INSTALL_PREFIX "-DCMAKE_INSTALL_LIBDIR=lib" diff --git a/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch b/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch deleted file mode 100644 index d9a80ffa6f9..00000000000 --- a/pkgs/os-specific/linux/intel-compute-runtime/etc-dir.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/package.cmake b/package.cmake -index 24960d5..e9a21e7 100644 ---- a/package.cmake -+++ b/package.cmake -@@ -24,7 +24,9 @@ if(UNIX) - - get_os_release_info(os_name os_version) - -- if("${os_name}" STREQUAL "clear-linux-os") -+ if(DEFINED ETC_DIR) -+ set(_dir_etc ${ETC_DIR}) -+ elseif("${os_name}" STREQUAL "clear-linux-os") - # clear-linux-os distribution avoids /etc for distribution defaults. - set(_dir_etc "/usr/share/defaults/etc") - else() diff --git a/pkgs/os-specific/linux/iproute/default.nix b/pkgs/os-specific/linux/iproute/default.nix index 3ac79464ac4..a9fcf455ee4 100644 --- a/pkgs/os-specific/linux/iproute/default.nix +++ b/pkgs/os-specific/linux/iproute/default.nix @@ -5,16 +5,19 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.7.0"; + version = "5.8.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "088gs56iqhdlpw1iqjwrss4zxd4zbl2wl8s2implrrdajjxcfpbj"; + sha256 = "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg"; }; preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile + # TODO: Drop temporary version fix for 5.8 (53159d81) once 5.9 is out: + substituteInPlace include/version.h \ + --replace "v5.7.0-77-gb687d1067169" "5.8.0" ''; outputs = [ "out" "dev" ]; diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 36277dd74cd..060d747e763 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,22 +1,22 @@ { "4.14": { - "name": "linux-hardened-4.14.193.a.patch", - "sha256": "0hxr4v6ph29p0916dh894aknna5qxszcpz5xrci81xla3i50vy9v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.193.a/linux-hardened-4.14.193.a.patch" + "name": "linux-hardened-4.14.195.a.patch", + "sha256": "1a1g9q750gbnkcycqnzafb22f7250ck8dvzx6jqkz669wdg2pd7z", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.195.a/linux-hardened-4.14.195.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.140.a.patch", - "sha256": "03y0kp89wka9bjw44y2jqralnwi7rjxbgm7wym1ad5yqd4q29l4d", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.140.a/linux-hardened-4.19.140.a.patch" + "name": "linux-hardened-4.19.142.a.patch", + "sha256": "1gwvacr23lp8qryfhnqn89pn9ly9d8c42rirvkz5psfmvnm7vxbn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.142.a/linux-hardened-4.19.142.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.59.a.patch", - "sha256": "138kms73rlj5zmsb2ivjzz1jr5aa8y8pmwzx02c7j1qk08v82823", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.59.a/linux-hardened-5.4.59.a.patch" + "name": "linux-hardened-5.4.61.a.patch", + "sha256": "1sgysrkycca860m2h7vrnfkplbsari6blcrkbsn285s5d0fsicnc", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.61.a/linux-hardened-5.4.61.a.patch" }, "5.7": { - "name": "linux-hardened-5.7.16.a.patch", - "sha256": "1fiyd6qsf8r84p05cxhwma7zwi81xyn9pl6yci93n583z8n1k2sw", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.16.a/linux-hardened-5.7.16.a.patch" + "name": "linux-hardened-5.7.19.a.patch", + "sha256": "1lydlh499aj3ck5cnv8q2271y4klvp17zm7j7qni16am14bld936", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.7.19.a/linux-hardened-5.7.19.a.patch" } } diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 4807ff7dba4..04d121de307 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.194"; + version = "4.14.195"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1q7ssi2790bqjn8s8ra5ihma70hmxykahink7iq5h78738id191y"; + sha256 = "08d08la3h48fbdlr3h8zbvdghydx3x9cwb4yrnm0n93hhrwjhkrr"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index e0c9c69061a..2eb697be684 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.141"; + version = "4.19.142"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0511vb9rfpy5l6cz69v0v97rw2rk2pscc4hkz2pfmgikagm1shm4"; + sha256 = "19372sri4962dqf5rbr211lrfpckmj11kxsginfcwwid4hfdn4k9"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 033599900ff..0be1f1bef7b 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.233"; + version = "4.4.234"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1z77dikgkvkp9ggwxp07hl8vxsf9kq57rhfdpbvhny1x13fqkrlp"; + sha256 = "123354h05fip161rzlxc8h0cn5lh0d1gz06gc5b7zyz9i2lxv539"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index c1da330e4ae..8ec9b8e51a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.233"; + version = "4.9.234"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "19dcwylhy5iqq3dmppqf7s9wy9d16m103djn1n183c9acnqclv9a"; + sha256 = "1qw26x2qc29yr094c7scw68m9yz4j0b2c4f92rvi3s31s928avvm"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index 1c903902b61..4c5d4bcd8e8 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.4.60"; + version = "5.4.61"; # 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 = "08x2a78n23371k7l5p677mihnl58dpjh7r7bvyiwj3y4hlisplmd"; + sha256 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.7.nix b/pkgs/os-specific/linux/kernel/linux-5.7.nix index 8583b3b1628..4f721d8b0e4 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.7.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.7.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.7.17"; + version = "5.7.19"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "09ajavdyvr0025rwvwfp9yv2z8q779nan1i6dck2kkdxr48kd36c"; + sha256 = "1rwzp51ddlkdzanj6i8jqj5yh0njpzn7ly4r8nnzwkdfp5465721"; }; } // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-5.8.nix b/pkgs/os-specific/linux/kernel/linux-5.8.nix new file mode 100644 index 00000000000..59acda122aa --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -0,0 +1,18 @@ +{ stdenv, buildPackages, fetchurl, perl, buildLinux, modDirVersionArg ? null, ... } @ args: + +with stdenv.lib; + +buildLinux (args // rec { + version = "5.8.5"; + + # modDirVersion needs to be x.y.z, will automatically add .0 if needed + modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; + + # branchVersion needs to be x.y + extraMeta.branch = versions.majorMinor version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; + sha256 = "0zwl0nk3x6fxwsbnmpx1drh7v0116yhgamisb1pghd472mmw6klx"; + }; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix new file mode 100644 index 00000000000..b59a367c4ad --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -0,0 +1,41 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "5.4.61-rt37"; # updated by ./update-rt.sh + branch = lib.versions.majorMinor version; + kversion = builtins.elemAt (lib.splitString "-" version) 0; +in buildLinux (args // { + inherit version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; + sha256 = "197y2yb60m1k8i7mig4pa9wsrklfxq81ba3zfahwb2b31w2kvwc6"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "1qgd55x62pczgmxcxbigkg6f622ma5a6mz4gi55a8mlbxzh2pddj"; + }; + }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + + structuredExtraConfig = with lib.kernel; { + PREEMPT_RT = yes; + # Fix error: unused option: PREEMPT_RT. + EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) + # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). + PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. + # Fix error: unused option: RT_GROUP_SCHED. + RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. + } // structuredExtraConfig; + + extraMeta = extraMeta // { + inherit branch; + }; +} // argsOverride) diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix new file mode 100644 index 00000000000..7c77454040d --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-rt-5.6.nix @@ -0,0 +1,41 @@ +{ lib, buildLinux, fetchurl +, kernelPatches ? [ ] +, structuredExtraConfig ? {} +, extraMeta ? {} +, argsOverride ? {} +, ... } @ args: + +let + version = "5.6.19-rt12"; # updated by ./update-rt.sh + branch = lib.versions.majorMinor version; + kversion = builtins.elemAt (lib.splitString "-" version) 0; +in buildLinux (args // { + inherit version; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; + sha256 = "1s0yc1138sglbm4vyizl4r7hnc1l7nykdjp4063ad67yayr2ylv2"; + }; + + kernelPatches = let rt-patch = { + name = "rt"; + patch = fetchurl { + url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; + sha256 = "0ia8rx0615x0z2s4ppw1244crg7c5ak07c9n3wbnz7y8bk8hyxws"; + }; + }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; + + structuredExtraConfig = with lib.kernel; { + PREEMPT_RT = yes; + # Fix error: unused option: PREEMPT_RT. + EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt) + # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n'). + PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it. + # Fix error: unused option: RT_GROUP_SCHED. + RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch. + } // structuredExtraConfig; + + extraMeta = extraMeta // { + inherit branch; + }; +} // argsOverride) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 6cd63e0be6b..a78d853bb7f 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9-rc1"; + version = "5.9-rc3"; extraMeta.branch = "5.9"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "08x6s4wydbrr4rqq3zfxq6qmnha4ikn7m9rmdqd42hmxl2ynqxla"; + sha256 = "1byckdxy0y5i3lgw3f3n7b4r3v1xb4g1z3ffiq3hp4ga4nf5xzw3"; }; # Should the testing kernels ever be built on Hydra? diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh new file mode 100755 index 00000000000..bcfa494d7e7 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/update-rt.sh @@ -0,0 +1,77 @@ +#!/usr/bin/env bash +set -euo pipefail + +# To update all rt kernels run: ./update-rt.sh + +# To update just one ./linux-rt-5.X.nix run: ./update-rt.sh ./linux-rt-5.X.nix + +# To add a new kernel branch 5.Y run: ./update-rt.sh ./linux-rt-5.Y.nix +# (with nonexistent .nix file) and update all-packages.nix. + +# To commit run with: env COMMIT=1 + +mirror=https://kernel.org/pub/linux/kernel + +main() { + if [ $# -ge 1 ]; then + update-if-needed "$1" + else + update-all-if-needed + fi +} + +update-all-if-needed() { + for f in "$(dirname "$0")"/linux-rt-*.nix; do + update-if-needed "$f" + done +} + +file-version() { + file="$1" # e.g. ./linux-rt-5.4.nix + if [ -e "$file" ]; then + grep ' version = ' "$file" | grep -o '[0-9].[^"]*' + fi +} + +latest-rt-version() { + branch="$1" # e.g. 5.4 + curl -sL "$mirror/projects/rt/$branch/sha256sums.asc" | + sed -ne '/.patch.xz/ { s/.*patch-\(.*\).patch.xz/\1/; p; q }' +} + +update-if-needed() { + file="$1" # e.g. ./linux-rt-5.4.nix (created if does not exist) + branch=$(basename "$file" .nix) # e.g. linux-rt-5.4 + branch=${branch#linux-rt-} # e.g. 5.4 + cur=$(file-version "$file") # e.g. 5.4.59-rt36 or empty + new=$(latest-rt-version "$branch") # e.g. 5.4.61-rt37 + kversion=${new%-*} # e.g. 5.4.61 + major=${branch%.*} # e.g 5 + nixattr="linux-rt_${branch/./_}" + if [ "$new" = "$cur" ]; then + echo "$nixattr: $cur (up-to-date)" + return + fi + khash=$(nix-prefetch-url "$mirror/v${major}.x/linux-${kversion}.tar.xz") + phash=$(nix-prefetch-url "$mirror/projects/rt/${branch}/older/patch-${new}.patch.xz") + if [ "$cur" ]; then + msg="$nixattr: $cur -> $new" + else + msg="$nixattr: init at $new" + prev=$(ls "$(dirname "$0")"/linux-rt-*.nix | tail -1) + cp "$prev" "$file" + cur=$(file-version "$file") + fi + echo "$msg" + sed -i "$file" \ + -e "s/$cur/$new/" \ + -e "s|kernel/v[0-9]*|kernel/v$major|" \ + -e "1,/.patch.xz/ s/sha256 = .*/sha256 = \"$khash\";/" \ + -e "1,/.patch.xz/! s/sha256 = .*/sha256 = \"$phash\";/" + if [ "${COMMIT:-}" ]; then + git add "$file" + git commit -m "$msg" + fi +} + +return 2>/dev/null || main "$@" diff --git a/pkgs/os-specific/linux/kernel/update.sh b/pkgs/os-specific/linux/kernel/update.sh index 55fdce06c97..560edced36e 100755 --- a/pkgs/os-specific/linux/kernel/update.sh +++ b/pkgs/os-specific/linux/kernel/update.sh @@ -58,6 +58,9 @@ ls $NIXPKGS/pkgs/os-specific/linux/kernel | while read FILE; do echo "Updated $OLDVER -> $V" done +# Update linux-rt +COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-rt.sh + # Update linux-libre COMMIT=1 $NIXPKGS/pkgs/os-specific/linux/kernel/update-libre.sh diff --git a/pkgs/os-specific/linux/klibc/default.nix b/pkgs/os-specific/linux/klibc/default.nix index a92970726dc..55faa216a12 100644 --- a/pkgs/os-specific/linux/klibc/default.nix +++ b/pkgs/os-specific/linux/klibc/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "klibc"; - version = "2.0.7"; + version = "2.0.8"; src = fetchurl { url = "mirror://kernel/linux/libs/klibc/2.0/klibc-${version}.tar.xz"; - sha256 = "08li3aj9bvzabrih98jdxi3m19h85cp53s8cr7cqad42r8vjdvxb"; + sha256 = "0dmlkhnn5q8fc6rkzsisir4chkzmmiq6xkjmvyvf0g7yihwz2j2f"; }; patches = [ ./no-reinstall-kernel-headers.patch ]; diff --git a/pkgs/os-specific/linux/libbpf/default.nix b/pkgs/os-specific/linux/libbpf/default.nix index 0a98475384d..0f2f9aa86f4 100644 --- a/pkgs/os-specific/linux/libbpf/default.nix +++ b/pkgs/os-specific/linux/libbpf/default.nix @@ -6,13 +6,13 @@ with builtins; stdenv.mkDerivation rec { pname = "libbpf"; - version = "0.0.9"; + version = "0.1.0"; src = fetchFromGitHub { - owner = "libbpf"; - repo = "libbpf"; - rev = "v${version}"; - sha256 = "18l0gff7nm841mwhr7bc7x863xcyvwh58zl7mc0amnsjqlbrvqg7"; + owner = "libbpf"; + repo = "libbpf"; + rev = "v${version}"; + sha256 = "1wi3a795jq0smqg1c5ml2ghai47n1m5ijmch017wscybx4jdlynv"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/libfabric/default.nix b/pkgs/os-specific/linux/libfabric/default.nix index 40f92f38d16..52de79e1f2d 100644 --- a/pkgs/os-specific/linux/libfabric/default.nix +++ b/pkgs/os-specific/linux/libfabric/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "libfabric"; - version = "1.10.1"; + version = "1.11.0"; enableParallelBuilding = true; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "ofiwg"; repo = pname; rev = "v${version}"; - sha256 = "0nf5x4v9rhyd67r6f6q3dw4sraaja8jfdkhhg9g8x41czmx4d456"; + sha256 = "1wgn6gsiy64rb76i46dsqlvp687lwqzxwg5lgj1y5y7lyqbq96wp"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ] ; diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 8bfdb37360d..7bbd1768c04 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -16,11 +16,11 @@ assert enableDmeventd -> enableCmdlib; stdenv.mkDerivation rec { pname = "lvm2" + stdenv.lib.optionalString enableDmeventd "with-dmeventd"; - version = "2.03.09"; + version = "2.03.10"; src = fetchurl { url = "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${version}.tgz"; - sha256 = "0xdr9qbqw6kja267wmx6ajnfv1nhw056gpxx9v2qmfh3bj6qnfn0"; + sha256 = "1l0fkn9abrgk5mfn6jfh9qhdr86b59l1c5pk6lp8jh0491d69las"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/os-specific/linux/microcode/amd.nix b/pkgs/os-specific/linux/microcode/amd.nix index a1a37db9dd6..135187c9a10 100644 --- a/pkgs/os-specific/linux/microcode/amd.nix +++ b/pkgs/os-specific/linux/microcode/amd.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { description = "AMD Processor microcode patch"; - homepage = "http://www.amd64.org/support/microcode.html"; + homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git"; license = licenses.unfreeRedistributableFirmware; platforms = platforms.linux; }; diff --git a/pkgs/os-specific/linux/nvidia-x11/generic.nix b/pkgs/os-specific/linux/nvidia-x11/generic.nix index d62ade04e63..63091e9875f 100644 --- a/pkgs/os-specific/linux/nvidia-x11/generic.nix +++ b/pkgs/os-specific/linux/nvidia-x11/generic.nix @@ -19,6 +19,9 @@ # nvidia-settings). Used to support 32-bit binaries on 64-bit # Linux. libsOnly ? false +, # don't include the bundled 32-bit libraries on 64-bit platforms, + # even if it’s in downloaded binary + disable32Bit ? false }: with stdenv.lib; @@ -30,7 +33,7 @@ assert ! versionOlder version "391" -> stdenv.hostPlatform.system == "x86_64-lin let nameSuffix = optionalString (!libsOnly) "-${kernel.version}"; pkgSuffix = optionalString (versionOlder version "304") "-pkg0"; - i686bundled = versionAtLeast version "391"; + i686bundled = versionAtLeast version "391" && !disable32Bit; libPathFor = pkgs: pkgs.lib.makeLibraryPath [ pkgs.libdrm pkgs.xorg.libXext pkgs.xorg.libX11 pkgs.xorg.libXv pkgs.xorg.libXrandr pkgs.xorg.libxcb pkgs.zlib pkgs.stdenv.cc.cc ]; diff --git a/pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix index 0e97a7c3646..3247e8c4eda 100644 --- a/pkgs/applications/virtualization/oci-seccomp-bpf-hook/default.nix +++ b/pkgs/os-specific/linux/oci-seccomp-bpf-hook/default.nix @@ -3,9 +3,9 @@ , fetchFromGitHub , go-md2man , installShellFiles -, libseccomp -, linuxPackages , pkg-config +, bcc +, libseccomp }: buildGoModule rec { @@ -27,8 +27,8 @@ buildGoModule rec { pkg-config ]; buildInputs = [ + bcc libseccomp - linuxPackages.bcc ]; buildPhase = '' diff --git a/pkgs/os-specific/linux/rdma-core/default.nix b/pkgs/os-specific/linux/rdma-core/default.nix index b1770a4d618..59a7125aad6 100644 --- a/pkgs/os-specific/linux/rdma-core/default.nix +++ b/pkgs/os-specific/linux/rdma-core/default.nix @@ -4,7 +4,7 @@ } : let - version = "30.0"; + version = "31.0"; in stdenv.mkDerivation { pname = "rdma-core"; @@ -14,7 +14,7 @@ in stdenv.mkDerivation { owner = "linux-rdma"; repo = "rdma-core"; rev = "v${version}"; - sha256 = "1czfh6s0qz2cv2k7ha7nr9qiwcrj5lvwqnvyrvsds463m8ndpg12"; + sha256 = "0qr8a25ylmkwfgyj519zvl74q16bhf4895xjich2r98rl2yg0qdl"; }; nativeBuildInputs = [ cmake pkgconfig pandoc docutils makeWrapper ]; diff --git a/pkgs/os-specific/linux/rfkill/default.nix b/pkgs/os-specific/linux/rfkill/default.nix deleted file mode 100644 index 10d46a84821..00000000000 --- a/pkgs/os-specific/linux/rfkill/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "rfkill-0.5"; - - src = fetchurl { - url = "mirror://kernel/software/network/rfkill/${name}.tar.bz2"; - sha256 = "01zs7p9kd92pxgcgwl5w46h3iyx4acfg6m1j5fgnflsaa350q5iy"; - }; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = with stdenv.lib; { - homepage = "http://wireless.kernel.org/en/users/Documentation/rfkill"; - description = "A tool to query, enable and disable wireless devices"; - platforms = platforms.linux; - maintainers = [ maintainers.eelco ]; - license = licenses.isc; - }; -} diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 59577eb8d51..bef9231385a 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "sysdig"; - version = "0.26.7"; + version = "0.27.0"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "09m6j2cl70jxb0k4ydsgrida381bipf0v026xz661152cy23r3ff"; + sha256 = "0lpp271g0749sx7qgpwl6myi0kgfpsxk1kc4yp3r9k1pynv8bq1b"; }; nativeBuildInputs = [ cmake perl ]; diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch index ab04ea91644..390e7f9f09b 100644 --- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch +++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch @@ -1,4 +1,4 @@ -From 22f46f55c81d84e83a4614856d84e63c8400165c Mon Sep 17 00:00:00 2001 +From 54fb14592fc41752c3cd26552c974dd1ad4b9e73 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Tue, 8 Jan 2013 15:46:30 +0100 Subject: [PATCH 01/18] Start device units for uninitialised encrypted devices @@ -13,7 +13,7 @@ unit. (However, this ignores the fsck unit, so it's not perfect...) 1 file changed, 4 deletions(-) diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in -index c34b606216..3ab8c1c3fe 100644 +index 1c60eec587..b2486da130 100644 --- a/rules.d/99-systemd.rules.in +++ b/rules.d/99-systemd.rules.in @@ -17,10 +17,6 @@ SUBSYSTEM=="ubi", TAG+="systemd" @@ -28,5 +28,5 @@ index c34b606216..3ab8c1c3fe 100644 SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root" SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks" -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch index c52a13c9a41..9bb69092ca4 100644 --- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch +++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -1,4 +1,4 @@ -From e5b2b1e90d055068936336f6f01639bcde251b96 Mon Sep 17 00:00:00 2001 +From d52880eeae09aaacd308430499f55810157b1a6d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 12 Apr 2013 13:16:57 +0200 Subject: [PATCH 02/18] Don't try to unmount /nix or /nix/store @@ -12,7 +12,7 @@ https://github.com/NixOS/nixos/issues/126 2 files changed, 4 insertions(+) diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c -index b19127be09..f9adca1100 100644 +index 806dda8475..0220741c91 100644 --- a/src/shared/fstab-util.c +++ b/src/shared/fstab-util.c @@ -40,6 +40,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) { @@ -38,5 +38,5 @@ index 8a5e80eeaa..fab35ed6f3 100644 || path_equal(path, "/usr") #endif -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch index e96593a5938..5ee54f39b74 100644 --- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch +++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch @@ -1,4 +1,4 @@ -From ca7f6286c518d7ef3877458bbdf8e01f5518ab0e Mon Sep 17 00:00:00 2001 +From 794073e466a3b6c8e138f0e6d15c8d6465a1a4a9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Wed, 16 Apr 2014 10:59:28 +0200 Subject: [PATCH 03/18] Fix NixOS containers @@ -10,10 +10,10 @@ container, so checking early whether it exists will fail. 1 file changed, 2 insertions(+) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 51d0c2a75b..4d3451ff3b 100644 +index 3b9493f232..0117a9939d 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -5017,6 +5017,7 @@ static int run(int argc, char *argv[]) { +@@ -5122,6 +5122,7 @@ static int run(int argc, char *argv[]) { goto finish; } } else { @@ -21,7 +21,7 @@ index 51d0c2a75b..4d3451ff3b 100644 const char *p, *q; if (arg_pivot_root_new) -@@ -5031,6 +5032,7 @@ static int run(int argc, char *argv[]) { +@@ -5136,6 +5137,7 @@ static int run(int argc, char *argv[]) { r = -EINVAL; goto finish; } @@ -30,5 +30,5 @@ index 51d0c2a75b..4d3451ff3b 100644 } else { -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch index 4b2c059afd5..cdef28ad68e 100644 --- a/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch +++ b/pkgs/os-specific/linux/systemd/0004-Look-for-fsck-in-the-right-place.patch @@ -1,4 +1,4 @@ -From c87cc5b1cf9c37f195e6b362352279e14289554e Mon Sep 17 00:00:00 2001 +From caa8dcfa87cf2e46a7a1cce9c16f929916cf9186 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Thu, 1 May 2014 14:10:10 +0200 Subject: [PATCH 04/18] Look for fsck in the right place @@ -21,5 +21,5 @@ index 80f7107b9d..74e48a385f 100644 cmdline[i++] = "-T"; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch index a8f3f0e21fd..95dd17531ab 100644 --- a/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch +++ b/pkgs/os-specific/linux/systemd/0005-Add-some-NixOS-specific-unit-directories.patch @@ -1,4 +1,4 @@ -From 450c133c1815b473136b2a5540f9213fef5506ee Mon Sep 17 00:00:00 2001 +From e5d73359928b79bd846bda29ce61fe276d8c0b76 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Fri, 19 Dec 2014 14:46:17 +0100 Subject: [PATCH 05/18] Add some NixOS-specific unit directories @@ -10,51 +10,36 @@ persistent, mutable units (used for Dysnomia). Also, remove /usr and /lib as these don't exist on NixOS. --- - src/core/systemd.pc.in | 4 ++-- - src/shared/path-lookup.c | 18 +++++------------- - 2 files changed, 7 insertions(+), 15 deletions(-) + src/basic/path-lookup.c | 20 +++++--------------- + src/core/systemd.pc.in | 5 +++-- + 2 files changed, 8 insertions(+), 17 deletions(-) -diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in -index 8331832c7a..bedb97115d 100644 ---- a/src/core/systemd.pc.in -+++ b/src/core/systemd.pc.in -@@ -17,8 +17,8 @@ systemduserunitdir=${prefix}/lib/systemd/user - systemduserpresetdir=${prefix}/lib/systemd/user-preset - systemdsystemconfdir=${sysconfdir}/systemd/system - systemduserconfdir=${sysconfdir}/systemd/user --systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system --systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user -+systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} -+systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} - systemdsystemgeneratordir=${rootprefix}/lib/systemd/system-generators - systemdusergeneratordir=${prefix}/lib/systemd/user-generators - systemdsystemgeneratorpath=/run/systemd/system-generators:/etc/systemd/system-generators:/usr/local/lib/systemd/system-generators:${systemdsystemgeneratordir} -diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c -index 48e0eec09a..a9d38f16d0 100644 ---- a/src/shared/path-lookup.c -+++ b/src/shared/path-lookup.c -@@ -98,17 +98,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { +diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c +index 52968dee34..bba2eb09b8 100644 +--- a/src/basic/path-lookup.c ++++ b/src/basic/path-lookup.c +@@ -94,17 +94,14 @@ int xdg_user_data_dir(char **ret, const char *suffix) { } static const char* const user_data_unit_paths[] = { - "/usr/local/lib/systemd/user", - "/usr/local/share/systemd/user", - USER_DATA_UNIT_PATH, + USER_DATA_UNIT_DIR, - "/usr/lib/systemd/user", - "/usr/share/systemd/user", NULL }; static const char* const user_config_unit_paths[] = { - USER_CONFIG_UNIT_PATH, + USER_CONFIG_UNIT_DIR, "/etc/systemd/user", + "/etc/systemd-mutable/user", NULL }; -@@ -604,15 +601,14 @@ int lookup_paths_init( +@@ -616,15 +613,14 @@ int lookup_paths_init( persistent_config, - SYSTEM_CONFIG_UNIT_PATH, + SYSTEM_CONFIG_UNIT_DIR, "/etc/systemd/system", + "/etc/systemd-mutable/system", + "/nix/var/nix/profiles/default/lib/systemd/system", @@ -70,9 +55,9 @@ index 48e0eec09a..a9d38f16d0 100644 STRV_IFNOTNULL(generator_late)); break; -@@ -628,14 +624,12 @@ int lookup_paths_init( +@@ -640,14 +636,12 @@ int lookup_paths_init( persistent_config, - USER_CONFIG_UNIT_PATH, + USER_CONFIG_UNIT_DIR, "/etc/systemd/user", + "/etc/systemd-mutable/user", + "/nix/var/nix/profiles/default/lib/systemd/user", @@ -82,26 +67,58 @@ index 48e0eec09a..a9d38f16d0 100644 - "/usr/local/share/systemd/user", - "/usr/share/systemd/user", - "/usr/local/lib/systemd/user", - USER_DATA_UNIT_PATH, + USER_DATA_UNIT_DIR, - "/usr/lib/systemd/user", STRV_IFNOTNULL(generator_late)); break; -@@ -824,14 +818,12 @@ char **generator_binary_paths(UnitFileScope scope) { - case UNIT_FILE_SYSTEM: - return strv_new("/run/systemd/system-generators", - "/etc/systemd/system-generators", -- "/usr/local/lib/systemd/system-generators", - SYSTEM_GENERATOR_PATH); +@@ -797,7 +791,6 @@ char **generator_binary_paths(UnitFileScope scope) { + case UNIT_FILE_SYSTEM: + add = strv_new("/run/systemd/system-generators", + "/etc/systemd/system-generators", +- "/usr/local/lib/systemd/system-generators", + SYSTEM_GENERATOR_DIR); + break; + +@@ -805,7 +798,6 @@ char **generator_binary_paths(UnitFileScope scope) { + case UNIT_FILE_USER: + add = strv_new("/run/systemd/user-generators", + "/etc/systemd/user-generators", +- "/usr/local/lib/systemd/user-generators", + USER_GENERATOR_DIR); + break; + +@@ -844,12 +836,10 @@ char **env_generator_binary_paths(bool is_system) { + if (is_system) + add = strv_new("/run/systemd/system-environment-generators", + "/etc/systemd/system-environment-generators", +- "/usr/local/lib/systemd/system-environment-generators", + SYSTEM_ENV_GENERATOR_DIR); + else + add = strv_new("/run/systemd/user-environment-generators", + "/etc/systemd/user-environment-generators", +- "/usr/local/lib/systemd/user-environment-generators", + USER_ENV_GENERATOR_DIR); + + if (!add) +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index 8424837824..b1c541bc52 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -38,10 +38,11 @@ systemdsystemconfdir=${systemd_system_conf_dir} + systemd_user_conf_dir=${sysconfdir}/systemd/user + systemduserconfdir=${systemd_user_conf_dir} + +-systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemd_system_unit_dir}:/usr/lib/systemd/system:/lib/systemd/system ++systemd_system_unit_path=${systemd_system_conf_dir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/system:${systemdsystemunitdir} + systemdsystemunitpath=${systemd_system_unit_path} - case UNIT_FILE_GLOBAL: - case UNIT_FILE_USER: - return strv_new("/run/systemd/user-generators", - "/etc/systemd/user-generators", -- "/usr/local/lib/systemd/user-generators", - USER_GENERATOR_PATH); +-systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemd_user_unit_dir}:/usr/lib/systemd/user:/usr/share/systemd/user ++systemd_user_unit_path=${systemd_user_conf_dir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/user:${systemduserunitdir} ++ + systemduserunitpath=${systemd_user_unit_path} - default: + systemd_system_generator_dir=${root_prefix}/lib/systemd/system-generators -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch index ac3d3b0bd6f..3e519e7fe73 100644 --- a/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch +++ b/pkgs/os-specific/linux/systemd/0006-Get-rid-of-a-useless-message-in-user-sessions.patch @@ -1,4 +1,4 @@ -From f88a9bb1e6080b539ed0116caa9781e7f6755f54 Mon Sep 17 00:00:00 2001 +From 1a3de021d9b8da060a77af6e26d2b61bafefda74 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra <eelco.dolstra@logicblox.com> Date: Mon, 11 May 2015 15:39:38 +0200 Subject: [PATCH 06/18] Get rid of a useless message in user sessions @@ -13,10 +13,10 @@ in containers. 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/unit.c b/src/core/unit.c -index c306183555..3db39fa435 100644 +index 2c09def06f..c70540e1a3 100644 --- a/src/core/unit.c +++ b/src/core/unit.c -@@ -2043,7 +2043,8 @@ static void unit_check_binds_to(Unit *u) { +@@ -2150,7 +2150,8 @@ static void unit_check_binds_to(Unit *u) { } assert(other); @@ -27,5 +27,5 @@ index c306183555..3db39fa435 100644 /* A unit we need to run is gone. Sniff. Let's stop this. */ r = manager_add_job(u->manager, JOB_STOP, u, JOB_FAIL, NULL, &error, NULL); -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch index cef3280aba8..b63a051ae07 100644 --- a/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch +++ b/pkgs/os-specific/linux/systemd/0007-hostnamed-localed-timedated-disable-methods-that-cha.patch @@ -1,20 +1,20 @@ -From e2b25ce3606d05ff8a387185c41ab32fb2a36161 Mon Sep 17 00:00:00 2001 +From 6c12e0d2afe80563e692fc1f2f545a487c83418c Mon Sep 17 00:00:00 2001 From: Gabriel Ebner <gebner@gebner.org> Date: Sun, 6 Dec 2015 14:26:36 +0100 Subject: [PATCH 07/18] hostnamed, localed, timedated: disable methods that change system settings. --- - src/hostname/hostnamed.c | 9 +++++++++ + src/hostname/hostnamed.c | 6 ++++++ src/locale/localed.c | 9 +++++++++ src/timedate/timedated.c | 10 ++++++++++ - 3 files changed, 28 insertions(+) + 3 files changed, 25 insertions(+) diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c -index 21f6471495..8c5af7619f 100644 +index 7f6607a527..b5a9388916 100644 --- a/src/hostname/hostnamed.c +++ b/src/hostname/hostnamed.c -@@ -478,6 +481,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ +@@ -626,6 +626,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_ if (r < 0) return r; @@ -23,8 +23,8 @@ index 21f6471495..8c5af7619f 100644 + name = empty_to_null(name); - if (streq_ptr(name, c->data[PROP_STATIC_HOSTNAME])) -@@ -535,6 +541,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess + context_read_etc_hostname(c); +@@ -685,6 +688,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess if (r < 0) return r; @@ -33,12 +33,12 @@ index 21f6471495..8c5af7619f 100644 + name = empty_to_null(name); - if (streq_ptr(name, c->data[prop])) + context_read_machine_info(c); diff --git a/src/locale/localed.c b/src/locale/localed.c -index 09f16d25f4..c1cb87cef1 100644 +index 715ce5cac7..014f7dcf6c 100644 --- a/src/locale/localed.c +++ b/src/locale/localed.c -@@ -275,6 +275,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er +@@ -317,6 +317,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er if (r < 0) return r; @@ -46,9 +46,9 @@ index 09f16d25f4..c1cb87cef1 100644 + "Changing system settings via systemd is not supported on NixOS."); + /* If single locale without variable name is provided, then we assume it is LANG=. */ - if (strv_length(l) == 1 && !strchr(*l, '=')) { - if (!locale_is_valid(*l)) -@@ -410,6 +413,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro + if (strv_length(l) == 1 && !strchr(l[0], '=')) { + if (!locale_is_valid(l[0])) +@@ -432,6 +435,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro if (r < 0) return r; @@ -58,7 +58,7 @@ index 09f16d25f4..c1cb87cef1 100644 keymap = empty_to_null(keymap); keymap_toggle = empty_to_null(keymap_toggle); -@@ -586,6 +592,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err +@@ -606,6 +612,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err if (r < 0) return r; @@ -69,10 +69,10 @@ index 09f16d25f4..c1cb87cef1 100644 model = empty_to_null(model); variant = empty_to_null(variant); diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 5e2fb50d83..63865f557c 100644 +index c467b85477..3e78b2f575 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -652,6 +652,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * +@@ -646,6 +646,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error * if (r < 0) return r; @@ -83,7 +83,7 @@ index 5e2fb50d83..63865f557c 100644 if (!timezone_is_valid(z, LOG_DEBUG)) return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z); -@@ -731,6 +735,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error +@@ -725,6 +729,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error if (r < 0) return r; @@ -93,7 +93,7 @@ index 5e2fb50d83..63865f557c 100644 if (lrtc == c->local_rtc) return sd_bus_reply_method_return(m, NULL); -@@ -923,6 +930,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error +@@ -917,6 +924,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error if (r < 0) return r; @@ -104,5 +104,5 @@ index 5e2fb50d83..63865f557c 100644 if (r < 0) return r; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch index 36d82e22f8c..63bd03fcf38 100644 --- a/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch +++ b/pkgs/os-specific/linux/systemd/0008-Fix-hwdb-paths.patch @@ -1,4 +1,4 @@ -From 5a6aad633a7ceffd62b009ce0c4ab6673129f7ff Mon Sep 17 00:00:00 2001 +From 1e40be83eca9a831509ae764081c2252934478c3 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 7 Jul 2016 02:47:13 +0300 Subject: [PATCH 08/18] Fix hwdb paths @@ -28,5 +28,5 @@ index b3febdbb31..eba00a5bc7 100644 _public_ int sd_hwdb_new(sd_hwdb **ret) { _cleanup_(sd_hwdb_unrefp) sd_hwdb *hwdb = NULL; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch index 8b5c807e4a8..dcdc0cd7ea0 100644 --- a/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch +++ b/pkgs/os-specific/linux/systemd/0009-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch @@ -1,4 +1,4 @@ -From b509dbd302a7933ae0002f44b99aac6a1fd5775b Mon Sep 17 00:00:00 2001 +From 5e235e1f720f37fc5581b40c9a13d365368e74a8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Tue, 11 Oct 2016 13:12:08 +0300 Subject: [PATCH 09/18] Change /usr/share/zoneinfo to /etc/zoneinfo @@ -35,10 +35,10 @@ index 0f1652ee2e..71c4f95c2e 100644 <literal>Etc/UTC</literal>. The resulting link should lead to the corresponding binary diff --git a/src/basic/time-util.c b/src/basic/time-util.c -index 105584e2e7..5238f69931 100644 +index 15cc1b8851..d0abde5933 100644 --- a/src/basic/time-util.c +++ b/src/basic/time-util.c -@@ -1217,7 +1217,7 @@ int get_timezones(char ***ret) { +@@ -1259,7 +1259,7 @@ int get_timezones(char ***ret) { n_allocated = 2; n_zones = 1; @@ -47,7 +47,7 @@ index 105584e2e7..5238f69931 100644 if (f) { for (;;) { _cleanup_free_ char *line = NULL; -@@ -1312,7 +1312,7 @@ bool timezone_is_valid(const char *name, int log_level) { +@@ -1354,7 +1354,7 @@ bool timezone_is_valid(const char *name, int log_level) { if (p - name >= PATH_MAX) return false; @@ -56,7 +56,7 @@ index 105584e2e7..5238f69931 100644 fd = open(t, O_RDONLY|O_CLOEXEC); if (fd < 0) { -@@ -1410,7 +1410,7 @@ int get_timezone(char **ret) { +@@ -1452,7 +1452,7 @@ int get_timezone(char **ret) { if (r < 0) return r; /* returns EINVAL if not a symlink */ @@ -66,10 +66,10 @@ index 105584e2e7..5238f69931 100644 return -EINVAL; diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index 901fbf0815..b57bdd8fbe 100644 +index a3f442518e..feff49e280 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c -@@ -431,7 +431,7 @@ static int process_timezone(void) { +@@ -459,7 +459,7 @@ static int process_timezone(void) { if (isempty(arg_timezone)) return 0; @@ -79,10 +79,10 @@ index 901fbf0815..b57bdd8fbe 100644 (void) mkdir_parents(etc_localtime, 0755); if (symlink(e, etc_localtime) < 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index 4d3451ff3b..1adb91335c 100644 +index 0117a9939d..d86445b40f 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -1657,8 +1657,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u +@@ -1699,8 +1699,8 @@ static int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t u static const char *timezone_from_path(const char *path) { return PATH_STARTSWITH_SET( path, @@ -94,10 +94,10 @@ index 4d3451ff3b..1adb91335c 100644 static bool etc_writable(void) { diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c -index 63865f557c..8021a8b753 100644 +index 3e78b2f575..de5477a08f 100644 --- a/src/timedate/timedated.c +++ b/src/timedate/timedated.c -@@ -264,7 +264,7 @@ static int context_read_data(Context *c) { +@@ -269,7 +269,7 @@ static int context_read_data(Context *c) { r = get_timezone(&t); if (r == -EINVAL) @@ -106,7 +106,7 @@ index 63865f557c..8021a8b753 100644 else if (r < 0) log_warning_errno(r, "Failed to get target of /etc/localtime: %m"); -@@ -288,7 +288,7 @@ static int context_write_data_timezone(Context *c) { +@@ -293,7 +293,7 @@ static int context_write_data_timezone(Context *c) { if (isempty(c->zone) || streq(c->zone, "UTC")) { @@ -115,7 +115,7 @@ index 63865f557c..8021a8b753 100644 if (unlink("/etc/localtime") < 0 && errno != ENOENT) return -errno; -@@ -296,9 +296,9 @@ static int context_write_data_timezone(Context *c) { +@@ -301,9 +301,9 @@ static int context_write_data_timezone(Context *c) { return 0; } @@ -128,5 +128,5 @@ index 63865f557c..8021a8b753 100644 return -ENOMEM; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch index b18ffb40166..50c2a1174df 100644 --- a/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch +++ b/pkgs/os-specific/linux/systemd/0010-localectl-use-etc-X11-xkb-for-list-x11.patch @@ -1,4 +1,4 @@ -From b5665ef8b9266c662c3a137df1ef1721cdff346e Mon Sep 17 00:00:00 2001 +From 141d1d7acf5f018df86f0a5f7fbe49a8e928fd73 Mon Sep 17 00:00:00 2001 From: Imuli <i@imu.li> Date: Wed, 19 Oct 2016 08:46:47 -0400 Subject: [PATCH 10/18] localectl: use /etc/X11/xkb for list-x11-* @@ -10,10 +10,10 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 6f2d37d222..7aa2310d48 100644 +index e0664de826..c521f33a2a 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c -@@ -286,7 +286,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { +@@ -277,7 +277,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { } state = NONE, look_for; int r; @@ -23,5 +23,5 @@ index 6f2d37d222..7aa2310d48 100644 return log_error_errno(errno, "Failed to open keyboard mapping list. %m"); -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch index bc9efaed23e..8ad310984ed 100644 --- a/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch +++ b/pkgs/os-specific/linux/systemd/0011-build-don-t-create-statedir-and-don-t-touch-prefixdi.patch @@ -1,4 +1,4 @@ -From be6b5c37779302384079b22b7fd767daad878fa9 Mon Sep 17 00:00:00 2001 +From db3946f465c0066fb1775a92c1fcc6450134904d Mon Sep 17 00:00:00 2001 From: Franz Pletz <fpletz@fnordicwalking.de> Date: Sun, 11 Feb 2018 04:37:44 +0100 Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir @@ -8,10 +8,10 @@ Subject: [PATCH 11/18] build: don't create statedir and don't touch prefixdir 1 file changed, 3 deletions(-) diff --git a/meson.build b/meson.build -index c09115e06a..62eba4186c 100644 +index dbbddb68e2..bbeb23223d 100644 --- a/meson.build +++ b/meson.build -@@ -3184,9 +3184,6 @@ install_data('LICENSE.GPL2', +@@ -3369,9 +3369,6 @@ install_data('LICENSE.GPL2', 'src/libsystemd/sd-bus/GVARIANT-SERIALIZATION', install_dir : docdir) @@ -20,7 +20,7 @@ index c09115e06a..62eba4186c 100644 - ############################################################ - meson_check_help = find_program('tools/meson-check-help.sh') + check_help = find_program('tools/check-help.sh') -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch index 5d67ce0ca31..0844f85763b 100644 --- a/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch +++ b/pkgs/os-specific/linux/systemd/0012-Install-default-configuration-into-out-share-factory.patch @@ -1,4 +1,4 @@ -From 9262f52b0e30cf8c39d9f7684a8c0e8fd4887cd5 Mon Sep 17 00:00:00 2001 +From 245af064c4d315d868cc12201b3663f61702cce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io> Date: Mon, 26 Feb 2018 14:25:57 +0000 Subject: [PATCH 12/18] Install default configuration into $out/share/factory @@ -31,10 +31,10 @@ store again, while having executables looking up files in /etc. 17 files changed, 29 insertions(+), 26 deletions(-) diff --git a/hwdb.d/meson.build b/hwdb.d/meson.build -index 4df6dabf89..02d8d69095 100644 +index 5c77387a26..6404bc01ba 100644 --- a/hwdb.d/meson.build +++ b/hwdb.d/meson.build -@@ -27,7 +27,7 @@ if conf.get('ENABLE_HWDB') == 1 +@@ -43,7 +43,7 @@ if conf.get('ENABLE_HWDB') == 1 install_dir : udevhwdbdir) meson.add_install_script('sh', '-c', @@ -44,10 +44,10 @@ index 4df6dabf89..02d8d69095 100644 meson.add_install_script('sh', '-c', 'test -n "$DESTDIR" || @0@/systemd-hwdb update' diff --git a/meson.build b/meson.build -index 62eba4186c..b0b2edbb5a 100644 +index bbeb23223d..1a9c56fad2 100644 --- a/meson.build +++ b/meson.build -@@ -154,6 +154,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') +@@ -163,6 +163,9 @@ udevhwdbdir = join_paths(udevlibexecdir, 'hwdb.d') catalogdir = join_paths(prefixdir, 'lib/systemd/catalog') kernelinstalldir = join_paths(prefixdir, 'lib/kernel/install.d') factorydir = join_paths(datadir, 'factory') @@ -57,7 +57,7 @@ index 62eba4186c..b0b2edbb5a 100644 bootlibdir = join_paths(prefixdir, 'lib/systemd/boot/efi') testsdir = join_paths(prefixdir, 'lib/systemd/tests') systemdstatedir = join_paths(localstatedir, 'lib/systemd') -@@ -2511,7 +2514,7 @@ if conf.get('ENABLE_BINFMT') == 1 +@@ -2651,7 +2654,7 @@ if conf.get('ENABLE_BINFMT') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(binfmtdir)) meson.add_install_script('sh', '-c', @@ -66,16 +66,16 @@ index 62eba4186c..b0b2edbb5a 100644 endif if conf.get('ENABLE_REPART') == 1 -@@ -2612,7 +2615,7 @@ executable('systemd-sleep', - install_dir : rootlibexecdir) +@@ -2767,7 +2770,7 @@ executable( + install_dir : rootlibexecdir) install_data('src/sleep/sleep.conf', - install_dir : pkgsysconfdir) + install_dir : factorypkgconfdir) - exe = executable('systemd-sysctl', - 'src/sysctl/sysctl.c', -@@ -2924,7 +2927,7 @@ if conf.get('HAVE_KMOD') == 1 + public_programs += executable( + 'systemd-sysctl', +@@ -3101,7 +3104,7 @@ if conf.get('HAVE_KMOD') == 1 meson.add_install_script('sh', '-c', mkdir_p.format(modulesloaddir)) meson.add_install_script('sh', '-c', @@ -83,8 +83,8 @@ index 62eba4186c..b0b2edbb5a 100644 + mkdir_p.format(join_paths(factoryconfdir, 'modules-load.d'))) endif - exe = executable('systemd-nspawn', -@@ -3167,7 +3170,7 @@ install_subdir('factory/etc', + public_programs += executable( +@@ -3352,7 +3355,7 @@ install_subdir('factory/etc', install_dir : factorydir) install_data('xorg/50-systemd-user.sh', @@ -94,10 +94,10 @@ index 62eba4186c..b0b2edbb5a 100644 install_dir : modprobedir) install_data('LICENSE.GPL2', diff --git a/network/meson.build b/network/meson.build -index 544dcf4387..1828c50863 100644 +index 99a650eac3..8105a4e48d 100644 --- a/network/meson.build +++ b/network/meson.build -@@ -10,7 +10,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -11,7 +11,7 @@ if conf.get('ENABLE_NETWORKD') == 1 install_dir : networkdir) meson.add_install_script('sh', '-c', @@ -107,10 +107,10 @@ index 544dcf4387..1828c50863 100644 install_data('99-default.link', diff --git a/src/core/meson.build b/src/core/meson.build -index 3586838f59..02ddf1a123 100644 +index fa95108523..60ee0e31c1 100644 --- a/src/core/meson.build +++ b/src/core/meson.build -@@ -179,8 +179,8 @@ libcore = static_library( +@@ -183,8 +183,8 @@ libcore = static_library( systemd_sources = files('main.c') in_files = [['macros.systemd', rpmmacrosdir], @@ -121,7 +121,7 @@ index 3586838f59..02ddf1a123 100644 ['systemd.pc', pkgconfigdatadir], ['triggers.systemd', '']] -@@ -212,6 +212,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) +@@ -216,6 +216,6 @@ meson.add_install_script('sh', '-c', mkdir_p.format(systemsleepdir)) meson.add_install_script('sh', '-c', mkdir_p.format(systemgeneratordir)) meson.add_install_script('sh', '-c', mkdir_p.format(usergeneratordir)) @@ -180,15 +180,16 @@ index 5796f77cac..75d975c260 100644 if get_option('create-log-dirs') meson.add_install_script( diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build -index 261c3aaae4..dbc5e23513 100644 +index 9ae342dfba..65df666337 100644 --- a/src/kernel-install/meson.build +++ b/src/kernel-install/meson.build -@@ -11,4 +11,4 @@ install_data('00-entry-directory.install', - install_dir : kernelinstalldir) +@@ -14,5 +14,5 @@ if want_kernel_install + install_dir : kernelinstalldir) - meson.add_install_script('sh', '-c', -- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) -+ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) + meson.add_install_script('sh', '-c', +- mkdir_p.format(join_paths(sysconfdir, 'kernel/install.d'))) ++ mkdir_p.format(join_paths(factoryconfdir, 'kernel/install.d'))) + endif diff --git a/src/login/meson.build b/src/login/meson.build index 0a7d3d5440..ff90149c1c 100644 --- a/src/login/meson.build @@ -203,10 +204,10 @@ index 0a7d3d5440..ff90149c1c 100644 install_data('org.freedesktop.login1.conf', install_dir : dbuspolicydir) diff --git a/src/network/meson.build b/src/network/meson.build -index c1c02cfda1..1bfa79a03b 100644 +index b3a88d9910..be56d1e9d7 100644 --- a/src/network/meson.build +++ b/src/network/meson.build -@@ -201,7 +201,7 @@ if conf.get('ENABLE_NETWORKD') == 1 +@@ -229,7 +229,7 @@ if conf.get('ENABLE_NETWORKD') == 1 endif install_data('networkd.conf', @@ -227,10 +228,10 @@ index adbac24b54..e9dc88dfa2 100644 + install_dir : factorypkgconfdir) endif diff --git a/src/resolve/meson.build b/src/resolve/meson.build -index c4d8d4e5d9..f550c289a5 100644 +index 92b67b6333..ac5b9a0b0a 100644 --- a/src/resolve/meson.build +++ b/src/resolve/meson.build -@@ -170,7 +170,7 @@ if conf.get('ENABLE_RESOLVE') == 1 +@@ -168,7 +168,7 @@ if conf.get('ENABLE_RESOLVE') == 1 output : 'resolved.conf', configuration : substs) install_data(resolved_conf, @@ -253,10 +254,10 @@ index e5c118c8db..19235df9ca 100644 install_dir : dbuspolicydir) install_data('org.freedesktop.timesync1.service', diff --git a/src/udev/meson.build b/src/udev/meson.build -index 173b10be50..82638cf5a9 100644 +index aa23b07090..ad004d803a 100644 --- a/src/udev/meson.build +++ b/src/udev/meson.build -@@ -187,7 +187,7 @@ foreach prog : [['ata_id/ata_id.c'], +@@ -186,7 +186,7 @@ foreach prog : [['ata_id/ata_id.c'], endforeach install_data('udev.conf', @@ -265,7 +266,7 @@ index 173b10be50..82638cf5a9 100644 configure_file( input : 'udev.pc.in', -@@ -196,7 +196,7 @@ configure_file( +@@ -195,7 +195,7 @@ configure_file( install_dir : pkgconfigdatadir == 'no' ? '' : pkgconfigdatadir) meson.add_install_script('sh', '-c', @@ -285,10 +286,10 @@ index 3f072e3db7..bd9f843eba 100644 - mkdir_p.format(join_paths(sysconfdir, 'sysctl.d'))) + mkdir_p.format(join_paths(factoryconfdir, 'sysctl.d'))) diff --git a/tmpfiles.d/meson.build b/tmpfiles.d/meson.build -index e77f46d06b..04d2ef621d 100644 +index 0a9582d8b9..3c56ca7d83 100644 --- a/tmpfiles.d/meson.build +++ b/tmpfiles.d/meson.build -@@ -57,5 +57,5 @@ endforeach +@@ -58,5 +58,5 @@ endforeach if enable_tmpfiles meson.add_install_script( 'sh', '-c', @@ -296,7 +297,7 @@ index e77f46d06b..04d2ef621d 100644 + mkdir_p.format(join_paths(factoryconfdir, 'tmpfiles.d'))) endif diff --git a/units/meson.build b/units/meson.build -index ea91f0cc9e..8622054ca5 100644 +index aa2ed115ea..12e2925226 100644 --- a/units/meson.build +++ b/units/meson.build @@ -323,7 +323,7 @@ install_data('user-.slice.d/10-defaults.conf', @@ -309,5 +310,5 @@ index ea91f0cc9e..8622054ca5 100644 join_paths(dbussystemservicedir, 'org.freedesktop.systemd1.service'), join_paths(dbussessionservicedir, 'org.freedesktop.systemd1.service')) -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch index 11d2dc26e38..a15220fd3f9 100644 --- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch +++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch @@ -1,4 +1,4 @@ -From 05c2761f6a981c8576fc47a3dd8beb5a2af3ef09 Mon Sep 17 00:00:00 2001 +From bfaa53731ffe984c93c5321099d1341b5059f029 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Fri, 2 Nov 2018 21:15:42 +0100 Subject: [PATCH 13/18] inherit systemd environment when calling generators. @@ -16,10 +16,10 @@ executables that are being called from managers. 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c -index 4412e7a849..b799eeca95 100644 +index 41e0d73736..d02de06f09 100644 --- a/src/core/manager.c +++ b/src/core/manager.c -@@ -3901,9 +3901,14 @@ static int manager_run_generators(Manager *m) { +@@ -4095,9 +4095,14 @@ static int manager_run_generators(Manager *m) { argv[4] = NULL; RUN_WITH_UMASK(0022) @@ -38,5 +38,5 @@ index 4412e7a849..b799eeca95 100644 finish: -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch index 06b00b82cb9..dca7b5591d2 100644 --- a/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch +++ b/pkgs/os-specific/linux/systemd/0014-add-rootprefix-to-lookup-dir-paths.patch @@ -1,4 +1,4 @@ -From c70029539d0aec5df0c1e4203359335a3841a1e5 Mon Sep 17 00:00:00 2001 +From d8b93ef32f3b95a6ce6548a8ad1504a485ffbe81 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold <andreas@rammhold.de> Date: Thu, 9 May 2019 11:15:22 +0200 Subject: [PATCH 14/18] add rootprefix to lookup dir paths @@ -34,5 +34,5 @@ index 970654a1ad..bb261040f8 100644 #define CONF_PATHS(n) \ CONF_PATHS_USR(n) \ -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch index 6431b56ea3e..1bd9e23d25c 100644 --- a/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch +++ b/pkgs/os-specific/linux/systemd/0015-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch @@ -1,4 +1,4 @@ -From 98580b4aa34f3d2e7401f54d6561c5af27ea3437 Mon Sep 17 00:00:00 2001 +From b3bc0aa899c51d19edfb53af2b00dde64123ab06 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 25 Jul 2019 20:45:55 +0300 Subject: [PATCH 15/18] systemd-shutdown: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c -index 523040b57c..561d91c94c 100644 +index 06c9710c6e..dadcc3117d 100644 --- a/src/shutdown/shutdown.c +++ b/src/shutdown/shutdown.c -@@ -299,7 +299,7 @@ int main(int argc, char *argv[]) { +@@ -312,7 +312,7 @@ int main(int argc, char *argv[]) { _cleanup_free_ char *cgroup = NULL; char *arguments[3], *watchdog_device; int cmd, r, umount_log_level = LOG_INFO; @@ -23,5 +23,5 @@ index 523040b57c..561d91c94c 100644 /* The log target defaults to console, but the original systemd process will pass its log target in through a * command line argument, which will override this default. Also, ensure we'll never log to the journal or -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch index c27d1a10d58..d99c7ecc96c 100644 --- a/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch +++ b/pkgs/os-specific/linux/systemd/0016-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch @@ -1,4 +1,4 @@ -From 3821e20966ee20f74986041f33c4934ad20385b2 Mon Sep 17 00:00:00 2001 +From 2679210f4ce804713bf1d244ac0fb8ac7b9b1e5f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov <ab@fmap.me> Date: Thu, 25 Jul 2019 20:46:58 +0300 Subject: [PATCH 16/18] systemd-sleep: execute scripts in @@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable. 1 file changed, 1 insertion(+) diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c -index fbfddc0262..d2530b9421 100644 +index 7029352ca5..6d9c636872 100644 --- a/src/sleep/sleep.c +++ b/src/sleep/sleep.c -@@ -178,6 +178,7 @@ static int execute(char **modes, char **states) { +@@ -182,6 +182,7 @@ static int execute(char **modes, char **states) { }; static const char* const dirs[] = { SYSTEM_SLEEP_PATH, @@ -22,5 +22,5 @@ index fbfddc0262..d2530b9421 100644 }; -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch index 9fae2d5767c..f45e4edd8e8 100644 --- a/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch +++ b/pkgs/os-specific/linux/systemd/0017-kmod-static-nodes.service-Update-ConditionFileNotEmp.patch @@ -1,4 +1,4 @@ -From b07defe819e0f66d08563690b3a5abea5da08620 Mon Sep 17 00:00:00 2001 +From 561b0cc9a1faed5729d6f701304a65c2968394ec Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Sat, 7 Mar 2020 22:40:27 +0100 Subject: [PATCH 17/18] kmod-static-nodes.service: Update ConditionFileNotEmpty @@ -23,5 +23,5 @@ index 0971edf9ec..87105a87b9 100644 [Service] Type=oneshot -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch index 321817dad6f..a964aeede76 100644 --- a/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch +++ b/pkgs/os-specific/linux/systemd/0018-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch @@ -1,4 +1,4 @@ -From 9c1ac48a7d95c09bef5a924bb5db6908596403b4 Mon Sep 17 00:00:00 2001 +From 0d9d7c03054babdbd1fa5f6f266b56e8c96e9ba5 Mon Sep 17 00:00:00 2001 From: Florian Klink <flokli@flokli.de> Date: Sun, 8 Mar 2020 01:05:54 +0100 Subject: [PATCH 18/18] path-util.h: add placeholder for DEFAULT_PATH_NORMAL @@ -29,5 +29,5 @@ index 30031fca8e..d97145539a 100644 #if HAVE_SPLIT_USR # define DEFAULT_PATH DEFAULT_PATH_SPLIT_USR -- -2.26.2 +2.27.0 diff --git a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix b/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix deleted file mode 100644 index 3fd8ff07f42..00000000000 --- a/pkgs/os-specific/linux/systemd/cryptsetup-generator.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ systemd, cryptsetup }: - -systemd.overrideAttrs (p: { - version = p.version; - name = "systemd-cryptsetup-generator-${p.version}"; - - buildInputs = p.buildInputs ++ [ cryptsetup ]; - outputs = [ "out" ]; - - buildPhase = '' - ninja systemd-cryptsetup systemd-cryptsetup-generator - ''; - - # As ninja install is not used here, the rpath needs to be manually fixed. - # Otherwise the resulting binary doesn't properly link against systemd-shared.so - postFixup = '' - for prog in `find $out -type f -executable`; do - (patchelf --print-needed $prog | grep 'libsystemd-shared-.*\.so' > /dev/null) && ( - patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog - ) || true - done - # test it's OK - "$out"/lib/systemd/systemd-cryptsetup - ''; - - installPhase = '' - mkdir -p $out/lib/systemd/ - cp systemd-cryptsetup $out/lib/systemd/systemd-cryptsetup - cp src/shared/*.so $out/lib/systemd/ - - mkdir -p $out/lib/systemd/system-generators/ - cp systemd-cryptsetup-generator $out/lib/systemd/system-generators/systemd-cryptsetup-generator - ''; -}) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index a76156a985c..54060b156f2 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, pkgconfig, intltool, gperf, libcap -, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, utillinux, libffi +{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap +, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, e2fsprogs, utillinux, libffi , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor , audit, lz4, bzip2, pcre2 , linuxHeaders ? stdenv.cc.libc.linuxHeaders @@ -9,6 +9,7 @@ , patchelf , substituteAll , getent +, cryptsetup, lvm2 , buildPackages , perl , withSelinux ? false, libselinux @@ -16,33 +17,24 @@ , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools }: -let gnupg-minimal = gnupg.override { - enableMinimal = true; - guiSupport = false; - pcsclite = null; - sqlite = null; - pinentry = null; - adns = null; - gnutls = null; - libusb1 = null; - openldap = null; - readline = null; - zlib = null; - bzip2 = null; -}; +let + version = "246"; in stdenv.mkDerivation { - version = "245.6"; + inherit version; pname = "systemd"; - # When updating, use https://github.com/systemd/systemd-stable tree, not the development one! - # Also fresh patches should be cherry-picked from that tree to our current one. + # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly + # This has proven to be less error-prone than the previous systemd fork. src = fetchFromGitHub { owner = "systemd"; repo = "systemd-stable"; - rev = "aa0cb635f1f6a4d9b50ed2cca7782f3f751be933"; - sha256 = "191f0r1g946bsqxky00z78wygsxi9pld11y2q4374bshnpsff2ll"; + rev = "v${version}"; + sha256 = "0zrkyxrh5rm45f2l1rnjyv229bcyzawfw7c63jqxwix75px60dyw"; }; + # If these need to be regenerated, `git am path/to/00*.patch` them into a + # systemd worktree, rebase to the more recent systemd version, and export the + # patches again via `git format-patch v${version}`. patches = [ ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch @@ -75,7 +67,7 @@ in stdenv.mkDerivation { "find_program('${stdenv.cc.bintools.targetPrefix}objcopy'" ''; - outputs = [ "out" "lib" "man" "dev" ]; + outputs = [ "out" "man" "dev" ]; nativeBuildInputs = [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 @@ -89,7 +81,7 @@ in stdenv.mkDerivation { ]; buildInputs = [ linuxHeaders libcap curl.dev kmod xz pam acl - /* cryptsetup */ libuuid glib libgcrypt libgpgerror libidn2 + cryptsetup libuuid glib libgcrypt libgpgerror libidn2 pcre2 ] ++ stdenv.lib.optional withKexectools kexectools ++ stdenv.lib.optional withLibseccomp libseccomp ++ @@ -105,7 +97,6 @@ in stdenv.mkDerivation { "-Ddbussystemservicedir=${placeholder "out"}/share/dbus-1/system-services" "-Dpamconfdir=${placeholder "out"}/etc/pam.d" "-Drootprefix=${placeholder "out"}" - "-Drootlibdir=${placeholder "lib"}/lib" "-Dpkgconfiglibdir=${placeholder "dev"}/lib/pkgconfig" "-Dpkgconfigdatadir=${placeholder "dev"}/share/pkgconfig" "-Dloadkeys-path=${kbd}/bin/loadkeys" @@ -176,12 +167,28 @@ in stdenv.mkDerivation { export LC_ALL="en_US.UTF-8"; # FIXME: patch this in systemd properly (and send upstream). # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/shutdown/shutdown.c src/nspawn/nspawn.c src/shared/generator.c units/systemd-logind.service.in units/systemd-nspawn@.service.in; do + for i in \ + src/core/mount.c \ + src/core/swap.c \ + src/cryptsetup/cryptsetup-generator.c \ + src/fsck/fsck.c \ + src/journal/cat.c \ + src/nspawn/nspawn.c \ + src/remount-fs/remount-fs.c \ + src/shared/generator.c \ + src/shutdown/shutdown.c \ + units/emergency.service.in \ + units/rescue.service.in \ + units/systemd-logind.service.in \ + units/systemd-nspawn@.service.in; \ + do test -e $i substituteInPlace $i \ --replace /usr/bin/getent ${getent}/bin/getent \ + --replace /sbin/mkswap ${lib.getBin utillinux}/sbin/mkswap \ --replace /sbin/swapon ${lib.getBin utillinux}/sbin/swapon \ --replace /sbin/swapoff ${lib.getBin utillinux}/sbin/swapoff \ + --replace /sbin/mke2fs ${lib.getBin e2fsprogs}/sbin/mke2fs \ --replace /sbin/fsck ${lib.getBin utillinux}/sbin/fsck \ --replace /bin/echo ${coreutils}/bin/echo \ --replace /bin/cat ${coreutils}/bin/cat \ @@ -197,7 +204,7 @@ in stdenv.mkDerivation { # absolute paths to gpg & tar substituteInPlace src/import/pull-common.c \ - --replace '"gpg"' '"${gnupg-minimal}/bin/gpg"' + --replace '"gpg"' '"${gnupg}/bin/gpg"' for file in src/import/{{export,import,pull}-tar,import-common}.c; do substituteInPlace $file \ --replace '"tar"' '"${gnutar}/bin/tar"' @@ -258,38 +265,10 @@ in stdenv.mkDerivation { # "kernel-install" shouldn't be used on NixOS. find $out -name "*kernel-install*" -exec rm {} \; - - # Keep only libudev and libsystemd in the lib output. - mkdir -p $out/lib - mv $lib/lib/security $lib/lib/libnss* $out/lib/ ''; # */ enableParallelBuilding = true; - # On aarch64 we "leak" a reference to $out/lib/systemd/catalog in the lib - # output. The result of that is a dependency cycle between $out and $lib. - # Thus nix (rightfully) marks the build as failed. That reference originates - # from an array of strings (catalog_file_dirs) in systemd - # (src/src/journal/catalog.{c,h}). The only consumer (as of v242) of the - # symbol is the main function of journalctl. Still libsystemd.so contains - # the VALUE but not the symbol. Systemd seems to be properly using function - # & data sections together with the linker flags to garbage collect unused - # sections (-Wl,--gc-sections). For unknown reasons those flags do not - # eliminate the unused string constants, in this case on aarch64-linux. The - # hacky way is to just remove the reference after we finished compiling. - # Since it can not be used (there is no symbol to actually refer to it) there - # should not be any harm. It is a bit odd and I really do not like starting - # these kind of hacks but there doesn't seem to be a straight forward way at - # this point in time. - # The reference will be replaced by the same reference the usual nukeRefs - # tooling uses. The standard tooling can not / should not be uesd since it - # is a bit too excessive and could potentially do us some (more) harm. - postFixup = '' - nukedRef=$(echo $out | sed -e "s,$NIX_STORE/[^-]*-\(.*\),$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-\1,") - cat $lib/lib/libsystemd.so | perl -pe "s|$out/lib/systemd/catalog|$nukedRef/lib/systemd/catalog|" > $lib/lib/libsystemd.so.tmp - mv $lib/lib/libsystemd.so.tmp $(readlink -f $lib/lib/libsystemd.so) - ''; - # The interface version prevents NixOS from switching to an # incompatible systemd at runtime. (Switching across reboots is # fine, of course.) It should be increased whenever systemd changes diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index fafa8fe6e83..ac6ad8a4bb7 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "util-linux"; - version = "2.35.2"; + version = "2.36"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "12mm5qvkq1vpllfv99gq93lkxlvysp1yxgh1392dkg7nh8g47dr1"; + sha256 = "1cg0m4psswg71v6wrqc2bngcw20fsp01vbijxdzvdf8kxdkiqjwy"; }; patches = [ diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 56b36d4f368..27e26b13a53 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -42,25 +42,27 @@ let inherit rev sha256; }; - patches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ] ++ extraPatches; + patches = extraPatches; postPatch = optionalString buildKernel '' patchShebangs scripts # The arrays must remain the same length, so we repeat a flag that is # already part of the command and therefore has no effect. - substituteInPlace ./module/zfs/zfs_ctldir.c --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ - --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' + substituteInPlace ./module/${optionalString isUnstable "os/linux/"}zfs/zfs_ctldir.c \ + --replace '"/usr/bin/env", "umount"' '"${utillinux}/bin/umount", "-n"' \ + --replace '"/usr/bin/env", "mount"' '"${utillinux}/bin/mount", "-n"' '' + optionalString buildUser '' substituteInPlace ./lib/libzfs/libzfs_mount.c --replace "/bin/umount" "${utillinux}/bin/umount" \ --replace "/bin/mount" "${utillinux}/bin/mount" - substituteInPlace ./lib/libshare/nfs.c --replace "/usr/sbin/exportfs" "${ + substituteInPlace ./lib/libshare/${optionalString isUnstable "os/linux/"}nfs.c --replace "/usr/sbin/exportfs" "${ # We don't *need* python support, but we set it like this to minimize closure size: # If it's disabled by default, no need to enable it, even if we have python enabled # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; }) }/bin/exportfs" substituteInPlace ./config/user-systemd.m4 --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d" - substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" + substituteInPlace ./config/zfs-build.m4 --replace "\$sysconfdir/init.d" "$out/etc/init.d" \ + --replace "/etc/default" "$out/etc/default" substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)" "$out/etc" substituteInPlace ./cmd/zed/Makefile.am --replace "\$(sysconfdir)" "$out/etc" @@ -79,6 +81,13 @@ let substituteInPlace ./etc/systemd/system/Makefile.am \ --replace '$(DESTDIR)$(systemdunitdir)' "$out"'$(DESTDIR)$(systemdunitdir)' + ${optionalString isUnstable '' + substituteInPlace ./contrib/initramfs/conf.d/Makefile.am \ + --replace "/usr/share/initramfs-tools/conf.d" "$out/usr/share/initramfs-tools/conf.d" + substituteInPlace ./contrib/initramfs/conf-hooks.d/Makefile.am \ + --replace "/usr/share/initramfs-tools/conf-hooks.d" "$out/usr/share/initramfs-tools/conf-hooks.d" + ''} + substituteInPlace ./etc/systemd/system/zfs-share.service.in \ --replace "/bin/rm " "${coreutils}/bin/rm " @@ -190,6 +199,7 @@ in { version = "0.8.4"; sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; + extraPatches = [ ./BACKPORT-Linux-5.8-compat-__vmalloc.patch ]; }; zfsUnstable = common { @@ -197,9 +207,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "0.8.4"; + version = "2.0.0-rc1"; - sha256 = "1hl4n900d24gl4vd65qdzq4m62b7bpvckldazcbd1xqcn8xhi6wp"; + sha256 = "0d1m5zwgqzfwbscvb60zvzkjgl5nkbvas22vjsyci3xygz0qwjsb"; isUnstable = true; }; } diff --git a/pkgs/servers/atlassian/confluence.nix b/pkgs/servers/atlassian/confluence.nix index 116b8b935b1..ab5c2da5edd 100644 --- a/pkgs/servers/atlassian/confluence.nix +++ b/pkgs/servers/atlassian/confluence.nix @@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null); stdenvNoCC.mkDerivation rec { pname = "atlassian-confluence"; - version = "7.6.1"; + version = "7.7.2"; src = fetchurl { url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz"; - sha256 = "0ipkr0d4mwsah698fg320h9g5il9xcnwlifbfvfnsijs60y9ps8x"; + sha256 = "12ay2y7ixaxzj12pw66k65743ic3iccicn49cnjmas51c5ww09h1"; }; buildPhase = '' diff --git a/pkgs/servers/bazarr/default.nix b/pkgs/servers/bazarr/default.nix index 075b5e58447..08b05084e9e 100644 --- a/pkgs/servers/bazarr/default.nix +++ b/pkgs/servers/bazarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bazarr"; - version = "0.8.4.4"; + version = "0.9"; src = fetchurl { url = "https://github.com/morpheus65535/bazarr/archive/v${version}.tar.gz"; - sha256 = "09qpy5fyyidi45968qg37cighfh3rgwsi8pfz4fk5fp2v1xq23yg"; + sha256 = "106f0gagq81rwykppyfjc7q8ibq3j89lp08hqgbmcv26hxb89rbj"; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { cp -r * $out/src mkdir -p $out/bin - makeWrapper "${(python3.withPackages (ps: [ps.lxml])).interpreter}" \ + makeWrapper "${(python3.withPackages (ps: [ps.lxml ps.numpy])).interpreter}" \ $out/bin/bazarr \ --add-flags "$out/src/bazarr.py" \ ''; diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix index 6a602883b35..d546b07148b 100644 --- a/pkgs/servers/dns/knot-dns/default.nix +++ b/pkgs/servers/dns/knot-dns/default.nix @@ -5,14 +5,13 @@ let inherit (stdenv.lib) optional optionals; in -# Note: ATM only the libraries have been tested in nixpkgs. stdenv.mkDerivation rec { pname = "knot-dns"; - version = "2.9.5"; + version = "2.9.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz"; - sha256 = "1109a8ba212ff8ddfdbaf44a6f8fc13a2b880a98a9e54c19112ba72a1aacbf76"; + sha256 = "bf742883c6825b54f19f2dadca2c94fec1ff8bdcf0a52388e2e167937594b2e7"; }; outputs = [ "bin" "out" "dev" ]; diff --git a/pkgs/servers/etcd/3.4.nix b/pkgs/servers/etcd/3.4.nix index db7bb5c939b..be52b1bf1a5 100644 --- a/pkgs/servers/etcd/3.4.nix +++ b/pkgs/servers/etcd/3.4.nix @@ -2,21 +2,18 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.10"; + version = "3.4.13"; - #vendorSha256 = null; revert to `null` for > 3.4.10 - - vendorSha256 = "1fhrycl8m8ddb7mwasbyfiwrl4d9lfdk7zd3mxb7ahkipdp2c94z"; + deleteVendor = true; + vendorSha256 = "0jlnh4789xa2dhbyp33k9r278kc588ykggamnnfqivb27s2646bc"; doCheck = false; - deleteVendor = true; - src = fetchFromGitHub { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "07kzgh2rm7kzprlpnay6fq8lziiyhiqyikf1qjx8gjjsdsjy180f"; + sha256 = "0bvky593241i60qf6793sxzsxwfl3f56cgscnva9f2jfhk157wmy"; }; buildPhase = '' diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 4c0df659f3e..53ad0d6ed24 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "etcd"; - version = "3.3.22"; + version = "3.3.25"; goPackagePath = "github.com/coreos/etcd"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "1rd390qfx9k20j9gh1wp1g9ygc571f2kv1dg2wvqij3kwydhymcj"; + sha256 = "10cyy6jr2xzmla5yyn850cv323ixrk70fjpk8lxjjjvy0ffmb6hj"; }; buildPhase = '' @@ -24,10 +24,7 @@ buildGoPackage rec { install -Dm755 bin/* bin/functional/cmd/* -t $out/bin ''; - passthru.tests = with nixosTests; { - etcd = etcd; - etcd-cluster = etcd-cluster; - }; + passthru.tests = { inherit (nixosTests) etcd etcd-cluster; }; meta = with lib; { description = "Distributed reliable key-value store for the most critical data of a distributed system"; diff --git a/pkgs/servers/gonic/default.nix b/pkgs/servers/gonic/default.nix new file mode 100644 index 00000000000..343b3d2b19d --- /dev/null +++ b/pkgs/servers/gonic/default.nix @@ -0,0 +1,59 @@ +{ lib, buildGoPackage, fetchFromGitHub +, pkg-config, taglib, alsaLib + +# Disable on-the-fly transcoding, +# removing the dependency on ffmpeg. +# The server will (as of 0.11.0) gracefully fall back +# to the original file, but if transcoding is configured +# that takes a while. So best to disable all transcoding +# in the configuration if you disable transcodingSupport. +, transcodingSupport ? true, ffmpeg + +# udpater +, writers, vgo2nix }: + +assert transcodingSupport -> ffmpeg != null; + +let + # update these, then run `updateScript` to update dependencies + version = "0.11.0"; + rev = "056fb54a703ef5b5194ce112cbbdd8fb53dbb1ea"; + sha256 = "0hd794wrz29nh89lfnq67w1rc23sg085rqf1agwlgpqycns2djl9"; + + src = fetchFromGitHub { + owner = "sentriz"; + repo = "gonic"; + inherit rev sha256; + }; + +in +buildGoPackage { + pname = "gonic-${version}"; + inherit version src; + goPackagePath = "go.senan.xyz/gonic"; + goDeps = ./deps.nix; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ taglib alsaLib ]; + + postPatch = lib.optionalString transcodingSupport '' + substituteInPlace \ + server/encode/encode.go \ + --replace \ + 'ffmpegPath = "/usr/bin/ffmpeg"' \ + 'ffmpegPath = "${ffmpeg}/bin/ffmpeg"' \ + ''; + + passthru.updateScript = writers.writeDash "update-gonic" '' + ${vgo2nix}/bin/vgo2nix \ + -dir ${src} \ + -outfile ${lib.escapeShellArg (toString ./deps.nix)} + ''; + + meta = { + homepage = "https://github.com/sentriz/gonic"; + description = "Music streaming server / subsonic server API implementation"; + license = lib.licenses.gpl3; + maintainers = with lib.maintainers; [ Profpatsch ]; + }; +} diff --git a/pkgs/servers/gonic/deps.nix b/pkgs/servers/gonic/deps.nix new file mode 100644 index 00000000000..71b2f83a0e0 --- /dev/null +++ b/pkgs/servers/gonic/deps.nix @@ -0,0 +1,795 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) +[ + { + goPackagePath = "cloud.google.com/go"; + fetch = { + type = "git"; + url = "https://github.com/googleapis/google-cloud-go"; + rev = "v0.33.1"; + sha256 = "1xs487sqajpvnhlwp130sfaajyinhxxq2yvmv2533mwf0zhcpz6v"; + }; + } + { + goPackagePath = "dmitri.shuralyov.com/gpu/mtl"; + fetch = { + type = "git"; + url = "https://dmitri.shuralyov.com/gpu/mtl"; + rev = "666a987793e9"; + sha256 = "1isd03hgiwcf2ld1rlp0plrnfz7r4i7c5q4kb6hkcd22axnmrv0z"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + { + goPackagePath = "github.com/BurntSushi/xgb"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/xgb"; + rev = "27f122750802"; + sha256 = "18lp2x8f5bljvlz0r7xn744f0c9rywjsb9ifiszqqdcpwhsa0kvj"; + }; + } + { + goPackagePath = "github.com/Masterminds/goutils"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/goutils"; + rev = "v1.1.0"; + sha256 = "180px47gj936qyk5bkv5mbbgiil9abdjq6kwkf7sq70vyi9mcfiq"; + }; + } + { + goPackagePath = "github.com/Masterminds/semver"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/semver"; + rev = "v1.5.0"; + sha256 = "1i169xscsxsh8lsw8bz2apnsqixld37xdnfh36i30xy5wnf0iwfx"; + }; + } + { + goPackagePath = "github.com/Masterminds/sprig"; + fetch = { + type = "git"; + url = "https://github.com/Masterminds/sprig"; + rev = "v2.22.0"; + sha256 = "09dzwhj4zh3p6f1jhyic16n4qdnvpamz7hyk9fycpm4b1jfq63gd"; + }; + } + { + goPackagePath = "github.com/OneOfOne/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/OneOfOne/xxhash"; + rev = "v1.2.2"; + sha256 = "1mjfhrwhvxa48rycjnqpqzm521i38h1hdyz6pdwmhd7xb8j6gwi6"; + }; + } + { + goPackagePath = "github.com/cespare/xxhash"; + fetch = { + type = "git"; + url = "https://github.com/cespare/xxhash"; + rev = "v1.1.0"; + sha256 = "1qyzlcdcayavfazvi03izx83fvip8h36kis44zr2sg7xf6sx6l4x"; + }; + } + { + goPackagePath = "github.com/d4l3k/messagediff"; + fetch = { + type = "git"; + url = "https://github.com/d4l3k/messagediff"; + rev = "7e0a312ae40b"; + sha256 = "1ab2gm7ys33rs84fjzqcb7b4jy2rr1a0w5a9kakfaf80wd0rjrah"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + { + goPackagePath = "github.com/denisenkom/go-mssqldb"; + fetch = { + type = "git"; + url = "https://github.com/denisenkom/go-mssqldb"; + rev = "732737034ffd"; + sha256 = "0k1inn33lbfj97d5ir3k5gffjcpb39kairq91jfrz6pnbq0w3zlf"; + }; + } + { + goPackagePath = "github.com/disintegration/imaging"; + fetch = { + type = "git"; + url = "https://github.com/disintegration/imaging"; + rev = "v1.6.2"; + sha256 = "1sl201nmk601h0aii4234sycn4v2b0rjxf8yhrnik4yjzd68q9x5"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "v1.0.0"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/erikstmartin/go-testdb"; + fetch = { + type = "git"; + url = "https://github.com/erikstmartin/go-testdb"; + rev = "8d10e4a1bae5"; + sha256 = "1fhrqcpv8x74qwxx9gpnhgqbz5wkp2bnsq92w418l1fnrgh4ppmq"; + }; + } + { + goPackagePath = "github.com/faiface/beep"; + fetch = { + type = "git"; + url = "https://github.com/faiface/beep"; + rev = "v1.0.2"; + sha256 = "07j0k0ynw1q8f7fzsan4kvfmdlda11583sck66hxfsk9zbp8vpxv"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "v1.0.0"; + sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "v1.1.1"; + sha256 = "0il2nnxp2cqiy73m49215dnf9in3vd25ji8qxbmq87c5qy7i1q9d"; + }; + } + { + goPackagePath = "github.com/go-audio/audio"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/audio"; + rev = "v1.0.0"; + sha256 = "05ai13yc8wwk2zlk9br62lh4z9hs1q685l7ij618bknf449vjsf3"; + }; + } + { + goPackagePath = "github.com/go-audio/riff"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/riff"; + rev = "v1.0.0"; + sha256 = "0wg3p3gsad1rql7bzx7pwwsyd00a5gdb8f1h7zfr7hlqja5skwb4"; + }; + } + { + goPackagePath = "github.com/go-audio/wav"; + fetch = { + type = "git"; + url = "https://github.com/go-audio/wav"; + rev = "v1.0.0"; + sha256 = "058mgc5ahjibnsqayk3k75l04gg9mv27bpmj79jyrya3kaczpamk"; + }; + } + { + goPackagePath = "github.com/go-gl/glfw"; + fetch = { + type = "git"; + url = "https://github.com/go-gl/glfw"; + rev = "6f7a984d4dc4"; + sha256 = "1nyv7h08qf4dp8w9pmcnrc6vv9bkwj8fil6pz0mkbss5hf4i8xcq"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + fetch = { + type = "git"; + url = "https://github.com/go-sql-driver/mysql"; + rev = "v1.5.0"; + sha256 = "11x0m9yf3kdnf6981182r824psgxwfaqhn3x3in4yiidp0w0hk3v"; + }; + } + { + goPackagePath = "github.com/gofrs/uuid"; + fetch = { + type = "git"; + url = "https://github.com/gofrs/uuid"; + rev = "v3.2.0"; + sha256 = "1q63mp7bznhfgyw133c0wc0hpcj1cq9bcf7w1f8r6inkcrils1fz"; + }; + } + { + goPackagePath = "github.com/golang-sql/civil"; + fetch = { + type = "git"; + url = "https://github.com/golang-sql/civil"; + rev = "cb61b32ac6fe"; + sha256 = "0yadfbvi0w06lg3sxw0daji02jxd3vv2in26yfmwpl4vd4vm9zay"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + { + goPackagePath = "github.com/google/go-cmp"; + fetch = { + type = "git"; + url = "https://github.com/google/go-cmp"; + rev = "v0.2.0"; + sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds"; + }; + } + { + goPackagePath = "github.com/google/uuid"; + fetch = { + type = "git"; + url = "https://github.com/google/uuid"; + rev = "v1.1.1"; + sha256 = "0hfxcf9frkb57k6q0rdkrmnfs78ms21r1qfk9fhlqga2yh5xg8zb"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherjs"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherjs"; + rev = "0210a2f0f73c"; + sha256 = "1n80xjfc1dkxs8h8mkpw83n89wi5n7hzc3rxhwjs76rkxpq3rc9j"; + }; + } + { + goPackagePath = "github.com/gopherjs/gopherwasm"; + fetch = { + type = "git"; + url = "https://github.com/gopherjs/gopherwasm"; + rev = "v1.0.0"; + sha256 = "0q20il68gqnrc0s8jndc8mw1ynln60a4xy1lrqakzmp8whyilwri"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/context"; + rev = "v1.1.1"; + sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.7.4"; + sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh"; + }; + } + { + goPackagePath = "github.com/gorilla/securecookie"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/securecookie"; + rev = "v1.1.1"; + sha256 = "16bqimpxs9vj5n59vm04y04v665l7jh0sddxn787pfafyxcmh410"; + }; + } + { + goPackagePath = "github.com/gorilla/sessions"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/sessions"; + rev = "v1.2.0"; + sha256 = "1kz6ydgp7vamhl2ak02hvzp2yv1dbfbwzsdxn6271lyzzdvz4pp1"; + }; + } + { + goPackagePath = "github.com/hajimehoshi/go-mp3"; + fetch = { + type = "git"; + url = "https://github.com/hajimehoshi/go-mp3"; + rev = "v0.2.1"; + sha256 = "0dxqpyj4xbq570if25g5wqbbp6frhq733h2ny3b2z3z8hw4q7vgg"; + }; + } + { + goPackagePath = "github.com/hajimehoshi/oto"; + fetch = { + type = "git"; + url = "https://github.com/hajimehoshi/oto"; + rev = "v0.6.1"; + sha256 = "1k3c0y8gdxn2c8fqc8rbjrn7nbbbhii3krma267jg01qq2zpsm8h"; + }; + } + { + goPackagePath = "github.com/huandu/xstrings"; + fetch = { + type = "git"; + url = "https://github.com/huandu/xstrings"; + rev = "v1.3.1"; + sha256 = "0j5vsyjxclk7g7vfr3mfybbimywf3khr8yx07dsdcm1zjwb092iy"; + }; + } + { + goPackagePath = "github.com/icza/bitio"; + fetch = { + type = "git"; + url = "https://github.com/icza/bitio"; + rev = "v1.0.0"; + sha256 = "1c4ps4a9khx2bqp6v0p7b7l0s0gly3vj8rkh816vznj4mdlgk76w"; + }; + } + { + goPackagePath = "github.com/icza/mighty"; + fetch = { + type = "git"; + url = "https://github.com/icza/mighty"; + rev = "cfd07d671de6"; + sha256 = "09prb460wqg72s753g3a9rm0ph60hp83najj0lx9ifp1lixnfb3d"; + }; + } + { + goPackagePath = "github.com/imdario/mergo"; + fetch = { + type = "git"; + url = "https://github.com/imdario/mergo"; + rev = "v0.3.9"; + sha256 = "042v7bzx575isa4pr868hrlv085qxpg8qi4m04jnkh5vbq4hvs90"; + }; + } + { + goPackagePath = "github.com/jfreymuth/oggvorbis"; + fetch = { + type = "git"; + url = "https://github.com/jfreymuth/oggvorbis"; + rev = "v1.0.0"; + sha256 = "0c0r63sp4q8bl8vvgayr98m0fsscl1f65cd2h7i4cr1awg6r6l6a"; + }; + } + { + goPackagePath = "github.com/jfreymuth/vorbis"; + fetch = { + type = "git"; + url = "https://github.com/jfreymuth/vorbis"; + rev = "v1.0.0"; + sha256 = "16gl1lwagiqw6ib48zsl4zpv1dmykz7fzhxc65vpcdipx2byhi7a"; + }; + } + { + goPackagePath = "github.com/jinzhu/gorm"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/gorm"; + rev = "v1.9.12"; + sha256 = "06d25jvrqvp1bd4k7mh9gsk414d2vhpr049qvj46yx21hyv9d6v3"; + }; + } + { + goPackagePath = "github.com/jinzhu/inflection"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/inflection"; + rev = "v1.0.0"; + sha256 = "165i20d11s03771gi43skl66salxj36212r25fbs0cgr4qgfj7fy"; + }; + } + { + goPackagePath = "github.com/jinzhu/now"; + fetch = { + type = "git"; + url = "https://github.com/jinzhu/now"; + rev = "v1.0.1"; + sha256 = "1b4gyw01b3rq3js43n0wqb1k2iymb2mnpdv7vapjs0lsbm4g5q1p"; + }; + } + { + goPackagePath = "github.com/joho/godotenv"; + fetch = { + type = "git"; + url = "https://github.com/joho/godotenv"; + rev = "v1.3.0"; + sha256 = "0ri8if0pc3x6jg4c3i8wr58xyfpxkwmcjk3rp8gb398a1aa3gpjm"; + }; + } + { + goPackagePath = "github.com/josephburnett/jd"; + fetch = { + type = "git"; + url = "https://github.com/josephburnett/jd"; + rev = "aa1a7c66b42f"; + sha256 = "0yjdnifwxhdgzcw4jkal3f69sgcjrdiscd5wg45d83zfrsqbb34c"; + }; + } + { + goPackagePath = "github.com/karrick/godirwalk"; + fetch = { + type = "git"; + url = "https://github.com/karrick/godirwalk"; + rev = "v1.15.6"; + sha256 = "0i8202kcihz2hvqp7zzbla5p9x2ljpbjg5zy5dy3x0capz0ina3c"; + }; + } + { + goPackagePath = "github.com/kr/pretty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pretty"; + rev = "v0.1.0"; + sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + fetch = { + type = "git"; + url = "https://github.com/kr/pty"; + rev = "v1.1.1"; + sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6"; + }; + } + { + goPackagePath = "github.com/kr/text"; + fetch = { + type = "git"; + url = "https://github.com/kr/text"; + rev = "v0.1.0"; + sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1"; + }; + } + { + goPackagePath = "github.com/lib/pq"; + fetch = { + type = "git"; + url = "https://github.com/lib/pq"; + rev = "v1.3.0"; + sha256 = "0bfravwqyj7z6v4lhsibbmgp7lajdydy4ij6c81g8hv0067x2mqw"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "12d3b2882a08"; + sha256 = "1w95axfn1a6rz31xrks77ingr9mdkqyr7mh0glv664kz1wg2h0gw"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-runewidth"; + rev = "v0.0.4"; + sha256 = "00b3ssm7wiqln3k54z2wcnxr3k3c7m1ybyhb9h8ixzbzspld0qzs"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-sqlite3"; + rev = "v2.0.3"; + sha256 = "0gn4dgvwmbf8gmhn5nzpwixc39g8mkp3n8lhyjgvhvsl72llcdzv"; + }; + } + { + goPackagePath = "github.com/mewkiz/flac"; + fetch = { + type = "git"; + url = "https://github.com/mewkiz/flac"; + rev = "v1.0.6"; + sha256 = "19083pfc6wxkb45s61di9a542jslcgkzif5z3qjymy085w4aizzx"; + }; + } + { + goPackagePath = "github.com/mewkiz/pkg"; + fetch = { + type = "git"; + url = "https://github.com/mewkiz/pkg"; + rev = "f6b5e26764c3"; + sha256 = "0djxw953sp2cwqybjxsfrsfma5yjn8n1l19g8yrd629cb6r1ghq2"; + }; + } + { + goPackagePath = "github.com/mitchellh/copystructure"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/copystructure"; + rev = "v1.0.0"; + sha256 = "05njg92w1088v4yl0js0zdrpfq6k37i9j14mxkr3p90p5yd9rrrr"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-wordwrap"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-wordwrap"; + rev = "v1.0.0"; + sha256 = "1jffbwcr3nnq6c12c5856bwzv2nxjzqk3jwgvxkwi1xhpd2by0bf"; + }; + } + { + goPackagePath = "github.com/mitchellh/reflectwalk"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/reflectwalk"; + rev = "v1.0.1"; + sha256 = "0pa6a3nhzwv5s5yqcmsmsfhdp5ggxsg2wa86f3akawxrhrkjarnx"; + }; + } + { + goPackagePath = "github.com/nicksellen/audiotags"; + fetch = { + type = "git"; + url = "https://github.com/nicksellen/audiotags"; + rev = "94015fa599bd"; + sha256 = "1817vw2j1lnk4y3925cszmkvwzsdcmgccrcdqyq39jqpwawl2c0j"; + }; + } + { + goPackagePath = "github.com/oklog/run"; + fetch = { + type = "git"; + url = "https://github.com/oklog/run"; + rev = "v1.1.0"; + sha256 = "0r55p3kgdkgw55i33lqvvvl60mjp92mhd1170m980sw98z9150jk"; + }; + } + { + goPackagePath = "github.com/oxtoacart/bpool"; + fetch = { + type = "git"; + url = "https://github.com/oxtoacart/bpool"; + rev = "03653db5a59c"; + sha256 = "1crdgm5w6kvcnvdglrrnrfkh5h60ldafwvrv00q97lz3790kgb15"; + }; + } + { + goPackagePath = "github.com/pelletier/go-toml"; + fetch = { + type = "git"; + url = "https://github.com/pelletier/go-toml"; + rev = "v1.6.0"; + sha256 = "0l2830pi64fg0bdsyd5afkbw0p7879pppzdqqk3c7vjrjfmi5xbq"; + }; + } + { + goPackagePath = "github.com/peterbourgon/ff"; + fetch = { + type = "git"; + url = "https://github.com/peterbourgon/ff"; + rev = "v1.7.0"; + sha256 = "17msscfi4pfdih1w3sq0wsw6246a30fckga9kvjpzwva6jni0466"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.9.1"; + sha256 = "1761pybhc2kqr6v5fm8faj08x9bql8427yqg6vnfv6nhrasx1mwq"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + { + goPackagePath = "github.com/rainycape/unidecode"; + fetch = { + type = "git"; + url = "https://github.com/rainycape/unidecode"; + rev = "cb7f23ec59be"; + sha256 = "1wvzdijd640blwkgmw6h09frkfa04kcpdq87n2zh2ymj1dzla5v5"; + }; + } + { + goPackagePath = "github.com/spaolacci/murmur3"; + fetch = { + type = "git"; + url = "https://github.com/spaolacci/murmur3"; + rev = "f09979ecbc72"; + sha256 = "1lv3zyz3jy2d76bhvvs8svygx66606iygdvwy5cwc0p5z8yghq25"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.0"; + sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.3.0"; + sha256 = "0wjchp2c8xbgcbbq32w3kvblk6q6yn533g78nxl6iskq6y95lxsy"; + }; + } + { + goPackagePath = "github.com/wader/gormstore"; + fetch = { + type = "git"; + url = "https://github.com/wader/gormstore"; + rev = "65a111a20c23"; + sha256 = "0dnylv4gdqsizll7b07nivv6chanqm0014yhqg6gcjccns6bl9bm"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "06a226fb4e37"; + sha256 = "0fdig6jx81g7a44dnxggibl909wchsj4nakmmhhz7db36sl0d7m5"; + }; + } + { + goPackagePath = "golang.org/x/exp"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/exp"; + rev = "00229845015e"; + sha256 = "0b0f05vbxzbgaaawxqns2m9qbvkfam1ylq8c8yhv7h6jnk2afaff"; + }; + } + { + goPackagePath = "golang.org/x/image"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/image"; + rev = "33d19683fad8"; + sha256 = "16qw6s9qlv84x98s9dib90y97x8bli3msaqw8kz498dbnbyx59zk"; + }; + } + { + goPackagePath = "golang.org/x/mobile"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mobile"; + rev = "4c31acba0007"; + sha256 = "0k42pn6fq886k9hn85wbgg4h4y1myj7niw0746sn50zfbrmy3s2c"; + }; + } + { + goPackagePath = "golang.org/x/mod"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/mod"; + rev = "331c550502dd"; + sha256 = "0942gzs6mlsjal4drjmm8gr54pj1cdhsl9mnj3ygm200mf3fj6pi"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "3b0461eec859"; + sha256 = "0l00c8l0a8xnv6qdpwfzxxsr58jggacgzdrwiprrfx2xqm37b6d5"; + }; + } + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "112230192c58"; + sha256 = "05i2k43j2d0llq768hg5pf3hb2yhfzp9la1w5wp0rsnnzblr0lfn"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "fe76b779f299"; + sha256 = "0g6j3n9fdv1a2lp2i8wbaaya85yrbfx3ns6iq1s7l2ayhxxmgh6b"; + }; + } + { + goPackagePath = "golang.org/x/text"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "v0.3.0"; + sha256 = "0r6x6zjzhr8ksqlpiwm5gdd7s209kwk5p4lw54xjvz10cs3qlq19"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "b753a1ba74fa"; + sha256 = "1xyzswbz9cx0bns2n75fw9pbm82dk9dj2il9iknmryyxvci9n5zv"; + }; + } + { + goPackagePath = "golang.org/x/xerrors"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/xerrors"; + rev = "1b5146add898"; + sha256 = "0w2akj91krxjag0xdhsg78470888nicc5ismc2ap9jqpss6v1zih"; + }; + } + { + goPackagePath = "google.golang.org/appengine"; + fetch = { + type = "git"; + url = "https://github.com/golang/appengine"; + rev = "v1.4.0"; + sha256 = "06zl7w4sxgdq2pl94wy9ncii6h0z3szl4xpqds0sv3b3wbdlhbnn"; + }; + } + { + goPackagePath = "gopkg.in/DATA-DOG/go-sqlmock.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/DATA-DOG/go-sqlmock.v1"; + rev = "v1.3.0"; + sha256 = "1684d6ima6638xwvr743kd7j5mpqq0vspcw9ai67bnb7m722qqqv"; + }; + } + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "788fd7840127"; + sha256 = "0v3bim0j375z81zrpr5qv42knqs0y2qv2vkjiqi5axvb78slki1a"; + }; + } + { + goPackagePath = "gopkg.in/gormigrate.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/gormigrate.v1"; + rev = "v1.6.0"; + sha256 = "03304vh58i5gxchrxy2v91bjdfgp7849jarmlanz3gaa2r574fmf"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.4"; + sha256 = "11bwj757wi8kdrcnlgfqb8vv2d2xdhlghmyagd19i62khrkchsg2"; + }; + } +] diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 922755db1fb..4a6989989ae 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,11 +2,11 @@ # Do not edit! { - version = "0.114.3"; + version = "0.114.4"; components = { "abode" = ps: with ps; [ ]; # missing inputs: abodepy "accuweather" = ps: with ps; [ ]; # missing inputs: accuweather - "acer_projector" = ps: with ps; [ pyserial]; + "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ ]; # missing inputs: aiopulse "actiontec" = ps: with ps; [ ]; "adguard" = ps: with ps; [ ]; # missing inputs: adguardhome @@ -15,39 +15,39 @@ "agent_dvr" = ps: with ps; [ ]; # missing inputs: agent-py "air_quality" = ps: with ps; [ ]; "airly" = ps: with ps; [ ]; # missing inputs: airly - "airvisual" = ps: with ps; [ pyairvisual]; + "airvisual" = ps: with ps; [ pyairvisual ]; "aladdin_connect" = ps: with ps; [ ]; # missing inputs: aladdin_connect "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ ]; # missing inputs: adext "alert" = ps: with ps; [ ]; - "alexa" = ps: with ps; [ aiohttp-cors]; - "almond" = ps: with ps; [ aiohttp-cors]; # missing inputs: pyalmond + "alexa" = ps: with ps; [ aiohttp-cors ]; + "almond" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyalmond "alpha_vantage" = ps: with ps; [ ]; # missing inputs: alpha_vantage - "amazon_polly" = ps: with ps; [ boto3]; - "ambiclimate" = ps: with ps; [ aiohttp-cors]; # missing inputs: ambiclimate + "amazon_polly" = ps: with ps; [ boto3 ]; + "ambiclimate" = ps: with ps; [ aiohttp-cors ]; # missing inputs: ambiclimate "ambient_station" = ps: with ps; [ ]; # missing inputs: aioambient - "amcrest" = ps: with ps; [ ha-ffmpeg]; # missing inputs: amcrest + "amcrest" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: amcrest "ampio" = ps: with ps; [ ]; # missing inputs: asmog "android_ip_webcam" = ps: with ps; [ ]; # missing inputs: pydroid-ipcam "androidtv" = ps: with ps; [ ]; # missing inputs: adb-shell[async] androidtv[async] pure-python-adb "anel_pwrctrl" = ps: with ps; [ ]; # missing inputs: anel_pwrctrl-homeassistant "anthemav" = ps: with ps; [ ]; # missing inputs: anthemav - "apache_kafka" = ps: with ps; [ aiokafka]; + "apache_kafka" = ps: with ps; [ aiokafka ]; "apcupsd" = ps: with ps; [ ]; # missing inputs: apcaccess - "api" = ps: with ps; [ aiohttp-cors]; + "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf]; - "apprise" = ps: with ps; [ apprise]; + "apple_tv" = ps: with ps; [ aiohttp-cors netdisco pyatv zeroconf ]; + "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ ]; # missing inputs: aprslib geopy "aqualogic" = ps: with ps; [ ]; # missing inputs: aqualogic "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ ]; # missing inputs: arcam-fmj "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; - "arlo" = ps: with ps; [ ha-ffmpeg]; # missing inputs: pyarlo + "arlo" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: pyarlo "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg - "aruba" = ps: with ps; [ pexpect]; - "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "aruba" = ps: with ps; [ pexpect ]; + "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ ]; # missing inputs: aioasuswrt @@ -57,17 +57,17 @@ "august" = ps: with ps; [ ]; # missing inputs: py-august "aurora" = ps: with ps; [ ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy - "auth" = ps: with ps; [ aiohttp-cors]; - "automation" = ps: with ps; [ aiohttp-cors]; + "auth" = ps: with ps; [ aiohttp-cors ]; + "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ ]; # missing inputs: avea "avion" = ps: with ps; [ ]; # missing inputs: avion - "avri" = ps: with ps; [ pycountry]; # missing inputs: avri-api + "avri" = ps: with ps; [ pycountry ]; # missing inputs: avri-api "awair" = ps: with ps; [ ]; # missing inputs: python_awair "aws" = ps: with ps; [ ]; # missing inputs: aiobotocore - "axis" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: axis + "axis" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: axis "azure_devops" = ps: with ps; [ ]; # missing inputs: aioazuredevops "azure_event_hub" = ps: with ps; [ ]; # missing inputs: azure-eventhub - "azure_service_bus" = ps: with ps; [ azure-servicebus]; + "azure_service_bus" = ps: with ps; [ azure-servicebus ]; "baidu" = ps: with ps; [ ]; # missing inputs: baidu-aip "bayesian" = ps: with ps; [ ]; "bbb_gpio" = ps: with ps; [ ]; # missing inputs: Adafruit_BBIO @@ -80,22 +80,22 @@ "blackbird" = ps: with ps; [ ]; # missing inputs: pyblackbird "blebox" = ps: with ps; [ ]; # missing inputs: blebox_uniapi "blink" = ps: with ps; [ ]; # missing inputs: blinkpy - "blinksticklight" = ps: with ps; [ BlinkStick]; + "blinksticklight" = ps: with ps; [ BlinkStick ]; "blinkt" = ps: with ps; [ ]; # missing inputs: blinkt "blockchain" = ps: with ps; [ ]; # missing inputs: python-blockchain-api "bloomsky" = ps: with ps; [ ]; - "bluesound" = ps: with ps; [ xmltodict]; + "bluesound" = ps: with ps; [ xmltodict ]; "bluetooth_le_tracker" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] - "bluetooth_tracker" = ps: with ps; [ bt_proximity]; # missing inputs: pybluez + "bluetooth_tracker" = ps: with ps; [ bt_proximity ]; # missing inputs: pybluez "bme280" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi "bme680" = ps: with ps; [ ]; # missing inputs: bme680 smbus-cffi "bmp280" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-bmp280 "bmw_connected_drive" = ps: with ps; [ ]; # missing inputs: bimmer_connected "bom" = ps: with ps; [ ]; # missing inputs: bomradarloop "bond" = ps: with ps; [ ]; # missing inputs: bond-api - "braviatv" = ps: with ps; [ bravia-tv]; - "broadlink" = ps: with ps; [ broadlink]; - "brother" = ps: with ps; [ brother]; + "braviatv" = ps: with ps; [ bravia-tv ]; + "broadlink" = ps: with ps; [ broadlink ]; + "brother" = ps: with ps; [ brother ]; "brottsplatskartan" = ps: with ps; [ ]; # missing inputs: brottsplatskartan "browser" = ps: with ps; [ ]; "brunt" = ps: with ps; [ ]; # missing inputs: brunt @@ -103,15 +103,15 @@ "bt_home_hub_5" = ps: with ps; [ ]; # missing inputs: bthomehub5-devicelist "bt_smarthub" = ps: with ps; [ ]; # missing inputs: btsmarthub_devicelist "buienradar" = ps: with ps; [ ]; # missing inputs: buienradar - "caldav" = ps: with ps; [ caldav]; - "calendar" = ps: with ps; [ aiohttp-cors]; - "camera" = ps: with ps; [ aiohttp-cors]; - "canary" = ps: with ps; [ ha-ffmpeg]; # missing inputs: py-canary - "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf]; + "caldav" = ps: with ps; [ caldav ]; + "calendar" = ps: with ps; [ aiohttp-cors ]; + "camera" = ps: with ps; [ aiohttp-cors ]; + "canary" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: py-canary + "cast" = ps: with ps; [ aiohttp-cors hass-nabucasa PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ ]; # missing inputs: pychannels "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook - "cisco_ios" = ps: with ps; [ pexpect]; + "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ]; # missing inputs: ciscomobilityexpress "cisco_webex_teams" = ps: with ps; [ ]; # missing inputs: webexteamssdk "citybikes" = ps: with ps; [ ]; @@ -120,44 +120,44 @@ "clicksend" = ps: with ps; [ ]; "clicksend_tts" = ps: with ps; [ ]; "climate" = ps: with ps; [ ]; - "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa]; + "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; "cloudflare" = ps: with ps; [ ]; # missing inputs: pycfdns "cmus" = ps: with ps; [ ]; # missing inputs: pycmus "co2signal" = ps: with ps; [ ]; # missing inputs: co2signal "coinbase" = ps: with ps; [ ]; # missing inputs: coinbase - "coinmarketcap" = ps: with ps; [ coinmarketcap]; + "coinmarketcap" = ps: with ps; [ coinmarketcap ]; "comed_hourly_pricing" = ps: with ps; [ ]; "comfoconnect" = ps: with ps; [ ]; # missing inputs: pycomfoconnect "command_line" = ps: with ps; [ ]; "concord232" = ps: with ps; [ ]; # missing inputs: concord232 - "config" = ps: with ps; [ aiohttp-cors]; + "config" = ps: with ps; [ aiohttp-cors ]; "configurator" = ps: with ps; [ ]; "control4" = ps: with ps; [ ]; # missing inputs: pyControl4 - "conversation" = ps: with ps; [ aiohttp-cors]; + "conversation" = ps: with ps; [ aiohttp-cors ]; "coolmaster" = ps: with ps; [ ]; # missing inputs: pycoolmasternet "coronavirus" = ps: with ps; [ ]; # missing inputs: coronavirus "counter" = ps: with ps; [ ]; "cover" = ps: with ps; [ ]; "cppm_tracker" = ps: with ps; [ ]; # missing inputs: clearpasspy - "cpuspeed" = ps: with ps; [ py-cpuinfo]; + "cpuspeed" = ps: with ps; [ py-cpuinfo ]; "crimereports" = ps: with ps; [ ]; # missing inputs: crimereports - "cups" = ps: with ps; [ pycups]; + "cups" = ps: with ps; [ pycups ]; "currencylayer" = ps: with ps; [ ]; "daikin" = ps: with ps; [ ]; # missing inputs: pydaikin "danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair - "darksky" = ps: with ps; [ python-forecastio]; - "datadog" = ps: with ps; [ datadog]; + "darksky" = ps: with ps; [ python-forecastio ]; + "datadog" = ps: with ps; [ datadog ]; "ddwrt" = ps: with ps; [ ]; - "debugpy" = ps: with ps; [ debugpy]; + "debugpy" = ps: with ps; [ debugpy ]; "deconz" = ps: with ps; [ ]; # missing inputs: pydeconz - "decora" = ps: with ps; [ bluepy]; # missing inputs: decora + "decora" = ps: with ps; [ bluepy ]; # missing inputs: decora "decora_wifi" = ps: with ps; [ ]; # missing inputs: decora_wifi - "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf]; # missing inputs: home-assistant-frontend + "default_config" = ps: with ps; [ pynacl aiohttp-cors defusedxml distro emoji hass-nabucasa netdisco sqlalchemy zeroconf ]; # missing inputs: home-assistant-frontend "delijn" = ps: with ps; [ ]; # missing inputs: pydelijn - "deluge" = ps: with ps; [ deluge-client]; - "demo" = ps: with ps; [ aiohttp-cors]; + "deluge" = ps: with ps; [ deluge-client ]; + "demo" = ps: with ps; [ aiohttp-cors ]; "denon" = ps: with ps; [ ]; - "denonavr" = ps: with ps; [ denonavr getmac]; + "denonavr" = ps: with ps; [ denonavr getmac ]; "derivative" = ps: with ps; [ ]; "deutsche_bahn" = ps: with ps; [ ]; # missing inputs: schiene "device_automation" = ps: with ps; [ ]; @@ -166,40 +166,40 @@ "devolo_home_control" = ps: with ps; [ ]; # missing inputs: devolo-home-control-api "dexcom" = ps: with ps; [ ]; # missing inputs: pydexcom "dht" = ps: with ps; [ ]; # missing inputs: Adafruit-DHT - "dialogflow" = ps: with ps; [ aiohttp-cors]; - "digital_ocean" = ps: with ps; [ digital-ocean]; + "dialogflow" = ps: with ps; [ aiohttp-cors ]; + "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower "directv" = ps: with ps; [ ]; # missing inputs: directv - "discogs" = ps: with ps; [ discogs_client]; - "discord" = ps: with ps; [ discordpy]; - "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; - "dlib_face_detect" = ps: with ps; [ face_recognition]; - "dlib_face_identify" = ps: with ps; [ face_recognition]; + "discogs" = ps: with ps; [ discogs_client ]; + "discord" = ps: with ps; [ discordpy ]; + "discovery" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; + "dlib_face_detect" = ps: with ps; [ face_recognition ]; + "dlib_face_identify" = ps: with ps; [ face_recognition ]; "dlink" = ps: with ps; [ ]; # missing inputs: pyW215 - "dlna_dmr" = ps: with ps; [ async-upnp-client]; - "dnsip" = ps: with ps; [ aiodns]; - "dominos" = ps: with ps; [ aiohttp-cors]; # missing inputs: pizzapi - "doods" = ps: with ps; [ pillow]; # missing inputs: pydoods - "doorbird" = ps: with ps; [ aiohttp-cors]; # missing inputs: doorbirdpy + "dlna_dmr" = ps: with ps; [ async-upnp-client ]; + "dnsip" = ps: with ps; [ aiodns ]; + "dominos" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pizzapi + "doods" = ps: with ps; [ pillow ]; # missing inputs: pydoods + "doorbird" = ps: with ps; [ aiohttp-cors ]; # missing inputs: doorbirdpy "dovado" = ps: with ps; [ ]; # missing inputs: dovado "downloader" = ps: with ps; [ ]; "dsmr" = ps: with ps; [ ]; # missing inputs: dsmr_parser - "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "dsmr_reader" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "dte_energy_bridge" = ps: with ps; [ ]; "dublin_bus_transport" = ps: with ps; [ ]; "duckdns" = ps: with ps; [ ]; "dunehd" = ps: with ps; [ ]; # missing inputs: pdunehd - "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict]; + "dwd_weather_warnings" = ps: with ps; [ jsonpath xmltodict ]; "dweet" = ps: with ps; [ ]; # missing inputs: dweepy "dynalite" = ps: with ps; [ ]; # missing inputs: dynalite_devices - "dyson" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: libpurecool + "dyson" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: libpurecool "ebox" = ps: with ps; [ ]; # missing inputs: pyebox "ebusd" = ps: with ps; [ ]; # missing inputs: ebusdpy "ecoal_boiler" = ps: with ps; [ ]; # missing inputs: ecoaliface "ecobee" = ps: with ps; [ ]; # missing inputs: python-ecobee-api "econet" = ps: with ps; [ ]; # missing inputs: pyeconet "ecovacs" = ps: with ps; [ ]; # missing inputs: sucks - "eddystone_temperature" = ps: with ps; [ construct]; # missing inputs: beacontools[scan] + "eddystone_temperature" = ps: with ps; [ construct ]; # missing inputs: beacontools[scan] "edimax" = ps: with ps; [ ]; # missing inputs: pyedimax "edl21" = ps: with ps; [ ]; # missing inputs: pysml "ee_brightbox" = ps: with ps; [ ]; # missing inputs: eebrightbox @@ -213,9 +213,9 @@ "emby" = ps: with ps; [ ]; # missing inputs: pyemby "emoncms" = ps: with ps; [ ]; "emoncms_history" = ps: with ps; [ ]; - "emulated_hue" = ps: with ps; [ aiohttp-cors]; + "emulated_hue" = ps: with ps; [ aiohttp-cors ]; "emulated_roku" = ps: with ps; [ ]; # missing inputs: emulated_roku - "enigma2" = ps: with ps; [ openwebifpy]; + "enigma2" = ps: with ps; [ openwebifpy ]; "enocean" = ps: with ps; [ ]; # missing inputs: enocean "enphase_envoy" = ps: with ps; [ ]; # missing inputs: envoy_reader "entur_public_transport" = ps: with ps; [ ]; # missing inputs: enturclient @@ -225,8 +225,8 @@ "ephember" = ps: with ps; [ ]; # missing inputs: pyephember "epson" = ps: with ps; [ ]; # missing inputs: epson-projector "epsonworkforce" = ps: with ps; [ ]; # missing inputs: epsonprinter - "eq3btsmart" = ps: with ps; [ construct]; # missing inputs: python-eq3bt - "esphome" = ps: with ps; [ aioesphomeapi]; + "eq3btsmart" = ps: with ps; [ construct ]; # missing inputs: python-eq3bt + "esphome" = ps: with ps; [ aioesphomeapi ]; "essent" = ps: with ps; [ ]; # missing inputs: PyEssent "etherscan" = ps: with ps; [ ]; # missing inputs: python-etherscan-api "eufy" = ps: with ps; [ ]; # missing inputs: lakeside @@ -240,17 +240,17 @@ "fan" = ps: with ps; [ ]; "fastdotcom" = ps: with ps; [ ]; # missing inputs: fastdotcom "feedreader" = ps: with ps; [ ]; # missing inputs: feedparser-homeassistant - "ffmpeg" = ps: with ps; [ ha-ffmpeg]; - "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg]; - "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg]; + "ffmpeg" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_motion" = ps: with ps; [ ha-ffmpeg ]; + "ffmpeg_noise" = ps: with ps; [ ha-ffmpeg ]; "fibaro" = ps: with ps; [ ]; # missing inputs: fiblary3 "fido" = ps: with ps; [ ]; # missing inputs: pyfido "file" = ps: with ps; [ ]; "filesize" = ps: with ps; [ ]; - "filter" = ps: with ps; [ aiohttp-cors sqlalchemy]; - "fints" = ps: with ps; [ fints]; + "filter" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "fints" = ps: with ps; [ fints ]; "firmata" = ps: with ps; [ ]; # missing inputs: pymata-express - "fitbit" = ps: with ps; [ aiohttp-cors fitbit]; + "fitbit" = ps: with ps; [ aiohttp-cors fitbit ]; "fixer" = ps: with ps; [ ]; # missing inputs: fixerio "fleetgo" = ps: with ps; [ ]; # missing inputs: ritassist "flexit" = ps: with ps; [ ]; # missing inputs: pyflexit pymodbus @@ -260,23 +260,23 @@ "flume" = ps: with ps; [ ]; # missing inputs: pyflume "flunearyou" = ps: with ps; [ ]; # missing inputs: pyflunearyou "flux" = ps: with ps; [ ]; - "flux_led" = ps: with ps; [ flux-led]; + "flux_led" = ps: with ps; [ flux-led ]; "folder" = ps: with ps; [ ]; - "folder_watcher" = ps: with ps; [ watchdog]; + "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ ]; # missing inputs: foobot_async "forked_daapd" = ps: with ps; [ ]; # missing inputs: pyforked-daapd pylibrespot-java "fortios" = ps: with ps; [ ]; # missing inputs: fortiosapi "foscam" = ps: with ps; [ ]; # missing inputs: libpyfoscam - "foursquare" = ps: with ps; [ aiohttp-cors]; + "foursquare" = ps: with ps; [ aiohttp-cors ]; "free_mobile" = ps: with ps; [ ]; # missing inputs: freesms - "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: aiofreepybox + "freebox" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: aiofreepybox "freedns" = ps: with ps; [ ]; - "fritz" = ps: with ps; [ fritzconnection]; - "fritzbox" = ps: with ps; [ pyfritzhome]; - "fritzbox_callmonitor" = ps: with ps; [ fritzconnection]; - "fritzbox_netmonitor" = ps: with ps; [ fritzconnection]; + "fritz" = ps: with ps; [ fritzconnection ]; + "fritzbox" = ps: with ps; [ pyfritzhome ]; + "fritzbox_callmonitor" = ps: with ps; [ fritzconnection ]; + "fritzbox_netmonitor" = ps: with ps; [ fritzconnection ]; "fronius" = ps: with ps; [ ]; # missing inputs: pyfronius - "frontend" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "frontend" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "frontier_silicon" = ps: with ps; [ ]; # missing inputs: afsapi "futurenow" = ps: with ps; [ ]; # missing inputs: pyfnip "garadget" = ps: with ps; [ ]; @@ -290,29 +290,29 @@ "geo_json_events" = ps: with ps; [ ]; # missing inputs: geojson_client "geo_location" = ps: with ps; [ ]; "geo_rss_events" = ps: with ps; [ ]; # missing inputs: georss_generic_client - "geofency" = ps: with ps; [ aiohttp-cors]; + "geofency" = ps: with ps; [ aiohttp-cors ]; "geonetnz_quakes" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_quakes "geonetnz_volcano" = ps: with ps; [ ]; # missing inputs: aio_geojson_geonetnz_volcano "gios" = ps: with ps; [ ]; # missing inputs: gios - "github" = ps: with ps; [ PyGithub]; - "gitlab_ci" = ps: with ps; [ python-gitlab]; + "github" = ps: with ps; [ PyGithub ]; + "gitlab_ci" = ps: with ps; [ python-gitlab ]; "gitter" = ps: with ps; [ ]; # missing inputs: gitterpy "glances" = ps: with ps; [ ]; # missing inputs: glances_api "gntp" = ps: with ps; [ ]; # missing inputs: gntp "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "gogogate2" = ps: with ps; [ ]; # missing inputs: gogogate2-api - "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client]; - "google_assistant" = ps: with ps; [ aiohttp-cors]; - "google_cloud" = ps: with ps; [ google_cloud_texttospeech]; + "google" = ps: with ps; [ google_api_python_client httplib2 oauth2client ]; + "google_assistant" = ps: with ps; [ aiohttp-cors ]; + "google_cloud" = ps: with ps; [ google_cloud_texttospeech ]; "google_domains" = ps: with ps; [ ]; "google_maps" = ps: with ps; [ ]; # missing inputs: locationsharinglib - "google_pubsub" = ps: with ps; [ google_cloud_pubsub]; - "google_translate" = ps: with ps; [ gtts-token]; + "google_pubsub" = ps: with ps; [ google_cloud_pubsub ]; + "google_translate" = ps: with ps; [ gtts-token ]; "google_travel_time" = ps: with ps; [ ]; # missing inputs: googlemaps "google_wifi" = ps: with ps; [ ]; - "gpmdp" = ps: with ps; [ websocket_client]; + "gpmdp" = ps: with ps; [ websocket_client ]; "gpsd" = ps: with ps; [ ]; # missing inputs: gps3 - "gpslogger" = ps: with ps; [ aiohttp-cors]; + "gpslogger" = ps: with ps; [ aiohttp-cors ]; "graphite" = ps: with ps; [ ]; "greeneye_monitor" = ps: with ps; [ ]; # missing inputs: greeneye_monitor "greenwave" = ps: with ps; [ ]; # missing inputs: greenwavereality @@ -325,8 +325,8 @@ "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups "harman_kardon_avr" = ps: with ps; [ ]; # missing inputs: hkavr - "harmony" = ps: with ps; [ aioharmony]; - "hassio" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "harmony" = ps: with ps; [ aioharmony ]; + "hassio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "haveibeenpwned" = ps: with ps; [ ]; "hddtemp" = ps: with ps; [ ]; "hdmi_cec" = ps: with ps; [ ]; # missing inputs: pyCEC @@ -336,27 +336,27 @@ "hikvision" = ps: with ps; [ ]; # missing inputs: pyhik "hikvisioncam" = ps: with ps; [ ]; # missing inputs: hikvision "hisense_aehw4a1" = ps: with ps; [ ]; # missing inputs: pyaehw4a1 - "history" = ps: with ps; [ aiohttp-cors sqlalchemy]; - "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy]; + "history" = ps: with ps; [ aiohttp-cors sqlalchemy ]; + "history_stats" = ps: with ps; [ aiohttp-cors sqlalchemy ]; "hitron_coda" = ps: with ps; [ ]; "hive" = ps: with ps; [ ]; # missing inputs: pyhiveapi "hlk_sw16" = ps: with ps; [ ]; # missing inputs: hlk-sw16 - "home_connect" = ps: with ps; [ aiohttp-cors]; # missing inputs: homeconnect + "home_connect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: homeconnect "homeassistant" = ps: with ps; [ ]; - "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf]; # missing inputs: PyTurboJPEG base36 fnvhash - "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf]; # missing inputs: aiohomekit[IP] - "homematic" = ps: with ps; [ pyhomematic]; + "homekit" = ps: with ps; [ HAP-python pyqrcode aiohttp-cors ha-ffmpeg zeroconf ]; # missing inputs: PyTurboJPEG base36 fnvhash + "homekit_controller" = ps: with ps; [ aiohttp-cors zeroconf ]; # missing inputs: aiohomekit[IP] + "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ ]; # missing inputs: homematicip "homeworks" = ps: with ps; [ ]; # missing inputs: pyhomeworks "honeywell" = ps: with ps; [ ]; # missing inputs: somecomfort "horizon" = ps: with ps; [ ]; # missing inputs: horimote "hp_ilo" = ps: with ps; [ ]; # missing inputs: python-hpilo - "html5" = ps: with ps; [ aiohttp-cors pywebpush]; - "http" = ps: with ps; [ aiohttp-cors]; + "html5" = ps: with ps; [ aiohttp-cors pywebpush ]; + "http" = ps: with ps; [ aiohttp-cors ]; "htu21d" = ps: with ps; [ ]; # missing inputs: i2csense smbus-cffi - "huawei_lte" = ps: with ps; [ getmac stringcase]; # missing inputs: huawei-lte-api url-normalize + "huawei_lte" = ps: with ps; [ getmac stringcase ]; # missing inputs: huawei-lte-api url-normalize "huawei_router" = ps: with ps; [ ]; - "hue" = ps: with ps; [ aiohue]; + "hue" = ps: with ps; [ aiohue ]; "humidifier" = ps: with ps; [ ]; "hunterdouglas_powerview" = ps: with ps; [ ]; # missing inputs: aiopvapi "hvv_departures" = ps: with ps; [ ]; # missing inputs: pygti @@ -365,17 +365,17 @@ "ialarm" = ps: with ps; [ ]; # missing inputs: pyialarm "iammeter" = ps: with ps; [ ]; # missing inputs: iammeter "iaqualink" = ps: with ps; [ ]; # missing inputs: iaqualink - "icloud" = ps: with ps; [ pyicloud]; + "icloud" = ps: with ps; [ pyicloud ]; "idteck_prox" = ps: with ps; [ ]; # missing inputs: rfk101py - "ifttt" = ps: with ps; [ aiohttp-cors pyfttt]; + "ifttt" = ps: with ps; [ aiohttp-cors pyfttt ]; "iglo" = ps: with ps; [ ]; # missing inputs: iglo "ign_sismologia" = ps: with ps; [ ]; # missing inputs: georss_ign_sismologia_client - "ihc" = ps: with ps; [ defusedxml]; # missing inputs: ihcsdk - "image_processing" = ps: with ps; [ aiohttp-cors]; + "ihc" = ps: with ps; [ defusedxml ]; # missing inputs: ihcsdk + "image_processing" = ps: with ps; [ aiohttp-cors ]; "imap" = ps: with ps; [ ]; # missing inputs: aioimaplib "imap_email_content" = ps: with ps; [ ]; "incomfort" = ps: with ps; [ ]; # missing inputs: incomfort-client - "influxdb" = ps: with ps; [ influxdb-client influxdb]; + "influxdb" = ps: with ps; [ influxdb-client influxdb ]; "input_boolean" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; "input_number" = ps: with ps; [ ]; @@ -383,15 +383,15 @@ "input_text" = ps: with ps; [ ]; "insteon" = ps: with ps; [ ]; # missing inputs: pyinsteon "integration" = ps: with ps; [ ]; - "intent" = ps: with ps; [ aiohttp-cors]; + "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ ]; # missing inputs: pyintesishome - "ios" = ps: with ps; [ aiohttp-cors zeroconf]; + "ios" = ps: with ps; [ aiohttp-cors zeroconf ]; "iota" = ps: with ps; [ ]; # missing inputs: pyota "iperf3" = ps: with ps; [ ]; # missing inputs: iperf3 "ipma" = ps: with ps; [ ]; # missing inputs: pyipma - "ipp" = ps: with ps; [ pyipp]; - "iqvia" = ps: with ps; [ numpy]; # missing inputs: pyiqvia + "ipp" = ps: with ps; [ pyipp ]; + "iqvia" = ps: with ps; [ numpy ]; # missing inputs: pyiqvia "irish_rail_transport" = ps: with ps; [ ]; # missing inputs: pyirishrail "islamic_prayer_times" = ps: with ps; [ ]; # missing inputs: prayer_times_calculator "iss" = ps: with ps; [ ]; # missing inputs: pyiss @@ -406,92 +406,92 @@ "kankun" = ps: with ps; [ ]; "keba" = ps: with ps; [ ]; # missing inputs: keba-kecontact "keenetic_ndms2" = ps: with ps; [ ]; # missing inputs: ndms2_client - "kef" = ps: with ps; [ getmac]; # missing inputs: aiokef + "kef" = ps: with ps; [ getmac ]; # missing inputs: aiokef "keyboard" = ps: with ps; [ ]; # missing inputs: pyuserinput - "keyboard_remote" = ps: with ps; [ evdev]; # missing inputs: aionotify + "keyboard_remote" = ps: with ps; [ evdev ]; # missing inputs: aionotify "kira" = ps: with ps; [ ]; # missing inputs: pykira "kiwi" = ps: with ps; [ ]; # missing inputs: kiwiki-client "knx" = ps: with ps; [ ]; # missing inputs: xknx - "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket]; - "konnected" = ps: with ps; [ aiohttp-cors]; # missing inputs: konnected + "kodi" = ps: with ps; [ jsonrpc-async jsonrpc-websocket ]; + "konnected" = ps: with ps; [ aiohttp-cors ]; # missing inputs: konnected "kwb" = ps: with ps; [ ]; # missing inputs: pykwb "lacrosse" = ps: with ps; [ ]; # missing inputs: pylacrosse "lametric" = ps: with ps; [ ]; # missing inputs: lmnotify "lannouncer" = ps: with ps; [ ]; - "lastfm" = ps: with ps; [ pylast]; + "lastfm" = ps: with ps; [ pylast ]; "launch_library" = ps: with ps; [ ]; # missing inputs: pylaunches "lcn" = ps: with ps; [ ]; # missing inputs: pypck "lg_netcast" = ps: with ps; [ ]; # missing inputs: pylgnetcast-homeassistant "lg_soundbar" = ps: with ps; [ ]; # missing inputs: temescal "life360" = ps: with ps; [ ]; # missing inputs: life360 - "lifx" = ps: with ps; [ aiolifx aiolifx-effects]; + "lifx" = ps: with ps; [ aiolifx aiolifx-effects ]; "lifx_cloud" = ps: with ps; [ ]; "lifx_legacy" = ps: with ps; [ ]; # missing inputs: liffylights "light" = ps: with ps; [ ]; "lightwave" = ps: with ps; [ ]; # missing inputs: lightwave - "limitlessled" = ps: with ps; [ limitlessled]; + "limitlessled" = ps: with ps; [ limitlessled ]; "linksys_smart" = ps: with ps; [ ]; - "linode" = ps: with ps; [ linode-api]; - "linux_battery" = ps: with ps; [ batinfo]; + "linode" = ps: with ps; [ linode-api ]; + "linux_battery" = ps: with ps; [ batinfo ]; "lirc" = ps: with ps; [ ]; # missing inputs: python-lirc "litejet" = ps: with ps; [ ]; # missing inputs: pylitejet "llamalab_automate" = ps: with ps; [ ]; "local_file" = ps: with ps; [ ]; "local_ip" = ps: with ps; [ ]; - "locative" = ps: with ps; [ aiohttp-cors]; + "locative" = ps: with ps; [ aiohttp-cors ]; "lock" = ps: with ps; [ ]; - "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy]; # missing inputs: home-assistant-frontend + "logbook" = ps: with ps; [ aiohttp-cors sqlalchemy ]; # missing inputs: home-assistant-frontend "logentries" = ps: with ps; [ ]; "logger" = ps: with ps; [ ]; - "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg]; # missing inputs: logi_circle + "logi_circle" = ps: with ps; [ aiohttp-cors ha-ffmpeg ]; # missing inputs: logi_circle "london_air" = ps: with ps; [ ]; "london_underground" = ps: with ps; [ ]; # missing inputs: london-tube-status "loopenergy" = ps: with ps; [ ]; # missing inputs: pyloopenergy "lovelace" = ps: with ps; [ ]; - "luci" = ps: with ps; [ openwrt-luci-rpc]; - "luftdaten" = ps: with ps; [ luftdaten]; + "luci" = ps: with ps; [ openwrt-luci-rpc ]; + "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ ]; # missing inputs: lupupy "lutron" = ps: with ps; [ ]; # missing inputs: pylutron "lutron_caseta" = ps: with ps; [ ]; # missing inputs: pylutron-caseta "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyft" = ps: with ps; [ ]; # missing inputs: lyft_rides "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed - "mailbox" = ps: with ps; [ aiohttp-cors]; - "mailgun" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymailgunner + "mailbox" = ps: with ps; [ aiohttp-cors ]; + "mailgun" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymailgunner "manual" = ps: with ps; [ ]; - "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "map" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "manual_mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "map" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "marytts" = ps: with ps; [ ]; # missing inputs: speak2mary "mastodon" = ps: with ps; [ ]; # missing inputs: Mastodon.py - "matrix" = ps: with ps; [ matrix-client]; + "matrix" = ps: with ps; [ matrix-client ]; "maxcube" = ps: with ps; [ ]; # missing inputs: maxcube-api "mcp23017" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-blinka adafruit-circuitpython-mcp230xx - "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light]; - "media_player" = ps: with ps; [ aiohttp-cors]; + "media_extractor" = ps: with ps; [ aiohttp-cors youtube-dl-light ]; + "media_player" = ps: with ps; [ aiohttp-cors ]; "mediaroom" = ps: with ps; [ ]; # missing inputs: pymediaroom "melcloud" = ps: with ps; [ ]; # missing inputs: pymelcloud "melissa" = ps: with ps; [ ]; # missing inputs: py-melissa-climate - "meraki" = ps: with ps; [ aiohttp-cors]; + "meraki" = ps: with ps; [ aiohttp-cors ]; "message_bird" = ps: with ps; [ ]; # missing inputs: messagebird - "met" = ps: with ps; [ pymetno]; + "met" = ps: with ps; [ pymetno ]; "meteo_france" = ps: with ps; [ ]; # missing inputs: meteofrance-api "meteoalarm" = ps: with ps; [ ]; # missing inputs: meteoalertapi "metoffice" = ps: with ps; [ ]; # missing inputs: datapoint "mfi" = ps: with ps; [ ]; # missing inputs: mficlient "mhz19" = ps: with ps; [ ]; # missing inputs: pmsensor "microsoft" = ps: with ps; [ ]; # missing inputs: pycsspeechtts - "microsoft_face" = ps: with ps; [ aiohttp-cors]; - "microsoft_face_detect" = ps: with ps; [ aiohttp-cors]; - "microsoft_face_identify" = ps: with ps; [ aiohttp-cors]; - "miflora" = ps: with ps; [ bluepy]; # missing inputs: miflora + "microsoft_face" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_detect" = ps: with ps; [ aiohttp-cors ]; + "microsoft_face_identify" = ps: with ps; [ aiohttp-cors ]; + "miflora" = ps: with ps; [ bluepy ]; # missing inputs: miflora "mikrotik" = ps: with ps; [ ]; # missing inputs: librouteros "mill" = ps: with ps; [ ]; # missing inputs: millheater "min_max" = ps: with ps; [ ]; - "minecraft_server" = ps: with ps; [ aiodns getmac]; # missing inputs: mcstatus - "minio" = ps: with ps; [ minio]; + "minecraft_server" = ps: with ps; [ aiodns getmac ]; # missing inputs: mcstatus + "minio" = ps: with ps; [ minio ]; "mitemp_bt" = ps: with ps; [ ]; # missing inputs: mitemp_bt "mjpeg" = ps: with ps; [ ]; - "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa]; + "mobile_app" = ps: with ps; [ pynacl aiohttp-cors emoji hass-nabucasa ]; "mochad" = ps: with ps; [ ]; # missing inputs: pymochad "modbus" = ps: with ps; [ ]; # missing inputs: pymodbus "modem_callerid" = ps: with ps; [ ]; # missing inputs: basicmodem @@ -499,34 +499,34 @@ "monoprice" = ps: with ps; [ ]; # missing inputs: pymonoprice "moon" = ps: with ps; [ ]; "mpchc" = ps: with ps; [ ]; - "mpd" = ps: with ps; [ mpd2]; - "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt]; + "mpd" = ps: with ps; [ mpd2 ]; + "mqtt" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_eventstream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_json" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_room" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "mqtt_statestream" = ps: with ps; [ aiohttp-cors paho-mqtt ]; "msteams" = ps: with ps; [ ]; # missing inputs: pymsteams - "mvglive" = ps: with ps; [ PyMVGLive]; + "mvglive" = ps: with ps; [ PyMVGLive ]; "mychevy" = ps: with ps; [ ]; # missing inputs: mychevy "mycroft" = ps: with ps; [ ]; # missing inputs: mycroftapi "myq" = ps: with ps; [ ]; # missing inputs: pymyq - "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: pymysensors - "mystrom" = ps: with ps; [ aiohttp-cors]; # missing inputs: python-mystrom + "mysensors" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: pymysensors + "mystrom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: python-mystrom "mythicbeastsdns" = ps: with ps; [ ]; # missing inputs: mbddns "n26" = ps: with ps; [ ]; # missing inputs: n26 "nad" = ps: with ps; [ ]; # missing inputs: nad_receiver - "namecheapdns" = ps: with ps; [ defusedxml]; - "nanoleaf" = ps: with ps; [ pynanoleaf]; - "neato" = ps: with ps; [ pybotvac]; + "namecheapdns" = ps: with ps; [ defusedxml ]; + "nanoleaf" = ps: with ps; [ pynanoleaf ]; + "neato" = ps: with ps; [ pybotvac ]; "nederlandse_spoorwegen" = ps: with ps; [ ]; # missing inputs: nsapi "nello" = ps: with ps; [ ]; # missing inputs: pynello "ness_alarm" = ps: with ps; [ ]; # missing inputs: nessclient "nest" = ps: with ps; [ ]; # missing inputs: python-nest - "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo]; + "netatmo" = ps: with ps; [ aiohttp-cors hass-nabucasa pyatmo ]; "netdata" = ps: with ps; [ ]; # missing inputs: netdata "netgear" = ps: with ps; [ ]; # missing inputs: pynetgear "netgear_lte" = ps: with ps; [ ]; # missing inputs: eternalegypt - "netio" = ps: with ps; [ aiohttp-cors]; # missing inputs: pynetio + "netio" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pynetio "neurio_energy" = ps: with ps; [ ]; # missing inputs: neurio "nexia" = ps: with ps; [ ]; # missing inputs: nexia "nextbus" = ps: with ps; [ ]; # missing inputs: py_nextbusnext @@ -535,11 +535,11 @@ "niko_home_control" = ps: with ps; [ ]; # missing inputs: niko-home-control "nilu" = ps: with ps; [ ]; # missing inputs: niluclient "nissan_leaf" = ps: with ps; [ ]; # missing inputs: pycarwings2 - "nmap_tracker" = ps: with ps; [ getmac]; # missing inputs: python-nmap + "nmap_tracker" = ps: with ps; [ getmac ]; # missing inputs: python-nmap "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail "no_ip" = ps: with ps; [ ]; "noaa_tides" = ps: with ps; [ ]; # missing inputs: py_noaa - "norway_air" = ps: with ps; [ pymetno]; + "norway_air" = ps: with ps; [ pymetno ]; "notify" = ps: with ps; [ ]; "notify_events" = ps: with ps; [ ]; # missing inputs: notify-events "notion" = ps: with ps; [ ]; # missing inputs: aionotion @@ -555,17 +555,17 @@ "nzbget" = ps: with ps; [ ]; # missing inputs: pynzbgetapi "oasa_telematics" = ps: with ps; [ ]; # missing inputs: oasatelematics "obihai" = ps: with ps; [ ]; # missing inputs: pyobihai - "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; + "octoprint" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; "oem" = ps: with ps; [ ]; # missing inputs: oemthermostat - "ohmconnect" = ps: with ps; [ defusedxml]; + "ohmconnect" = ps: with ps; [ defusedxml ]; "ombi" = ps: with ps; [ ]; # missing inputs: pyombi - "onboarding" = ps: with ps; [ aiohttp-cors]; + "onboarding" = ps: with ps; [ aiohttp-cors ]; "onewire" = ps: with ps; [ ]; # missing inputs: pyownet - "onkyo" = ps: with ps; [ onkyo-eiscp]; - "onvif" = ps: with ps; [ ha-ffmpeg]; # missing inputs: WSDiscovery onvif-zeep-async + "onkyo" = ps: with ps; [ onkyo-eiscp ]; + "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; - "opencv" = ps: with ps; [ numpy]; # missing inputs: opencv-python-headless + "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless "openerz" = ps: with ps; [ ]; # missing inputs: openerz-api "openevse" = ps: with ps; [ ]; # missing inputs: openevsewifi "openexchangerates" = ps: with ps; [ ]; @@ -576,22 +576,22 @@ "opensky" = ps: with ps; [ ]; "opentherm_gw" = ps: with ps; [ ]; # missing inputs: pyotgw "openuv" = ps: with ps; [ ]; # missing inputs: pyopenuv - "openweathermap" = ps: with ps; [ pyowm]; + "openweathermap" = ps: with ps; [ pyowm ]; "opnsense" = ps: with ps; [ ]; # missing inputs: pyopnsense "opple" = ps: with ps; [ ]; # missing inputs: pyoppleio "orangepi_gpio" = ps: with ps; [ ]; # missing inputs: OPi.GPIO "oru" = ps: with ps; [ ]; # missing inputs: oru "orvibo" = ps: with ps; [ ]; # missing inputs: orvibo "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify - "otp" = ps: with ps; [ pyotp]; + "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy - "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt]; - "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt]; # missing inputs: python-openzwave-mqtt + "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; + "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt ]; # missing inputs: python-openzwave-mqtt "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera - "pandora" = ps: with ps; [ pexpect]; - "panel_custom" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend - "panel_iframe" = ps: with ps; [ aiohttp-cors]; # missing inputs: home-assistant-frontend + "pandora" = ps: with ps; [ pexpect ]; + "panel_custom" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend + "panel_iframe" = ps: with ps; [ aiohttp-cors ]; # missing inputs: home-assistant-frontend "pcal9535a" = ps: with ps; [ ]; # missing inputs: pcal9535a "pencom" = ps: with ps; [ ]; # missing inputs: pencompy "persistent_notification" = ps: with ps; [ ]; @@ -605,41 +605,41 @@ "ping" = ps: with ps; [ ]; "pioneer" = ps: with ps; [ ]; "pjlink" = ps: with ps; [ ]; # missing inputs: pypjlink2 - "plaato" = ps: with ps; [ aiohttp-cors]; - "plant" = ps: with ps; [ sqlalchemy]; - "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos]; + "plaato" = ps: with ps; [ aiohttp-cors ]; + "plant" = ps: with ps; [ sqlalchemy ]; + "plex" = ps: with ps; [ aiohttp-cors plexapi plexauth plexwebsocket pysonos ]; "plugwise" = ps: with ps; [ ]; # missing inputs: Plugwise_Smile "plum_lightpad" = ps: with ps; [ ]; # missing inputs: plumlightpad "pocketcasts" = ps: with ps; [ ]; # missing inputs: pocketcasts - "point" = ps: with ps; [ aiohttp-cors]; # missing inputs: pypoint + "point" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pypoint "poolsense" = ps: with ps; [ ]; # missing inputs: poolsense "powerwall" = ps: with ps; [ ]; # missing inputs: tesla-powerwall "prezzibenzina" = ps: with ps; [ ]; # missing inputs: prezzibenzina-py "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix - "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client]; + "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; "proxmoxve" = ps: with ps; [ ]; # missing inputs: proxmoxer - "proxy" = ps: with ps; [ pillow]; + "proxy" = ps: with ps; [ pillow ]; "ps4" = ps: with ps; [ ]; # missing inputs: pyps4-2ndscreen "ptvsd" = ps: with ps; [ ]; # missing inputs: ptvsd - "pulseaudio_loopback" = ps: with ps; [ pulsectl]; - "push" = ps: with ps; [ aiohttp-cors]; - "pushbullet" = ps: with ps; [ pushbullet]; - "pushover" = ps: with ps; [ pushover-complete]; + "pulseaudio_loopback" = ps: with ps; [ pulsectl ]; + "push" = ps: with ps; [ aiohttp-cors ]; + "pushbullet" = ps: with ps; [ pushbullet ]; + "pushover" = ps: with ps; [ pushover-complete ]; "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ jsonpath xmltodict]; + "pvoutput" = ps: with ps; [ jsonpath xmltodict ]; "pvpc_hourly_pricing" = ps: with ps; [ ]; # missing inputs: aiopvpc "pyload" = ps: with ps; [ ]; - "python_script" = ps: with ps; [ restrictedpython]; + "python_script" = ps: with ps; [ restrictedpython ]; "qbittorrent" = ps: with ps; [ ]; # missing inputs: python-qbittorrent "qld_bushfire" = ps: with ps; [ ]; # missing inputs: georss_qld_bushfire_alert_client "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats - "qrcode" = ps: with ps; [ pillow]; # missing inputs: pyzbar + "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar "quantum_gateway" = ps: with ps; [ ]; # missing inputs: quantum-gateway "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch - "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: rachiopy + "rachio" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: rachiopy "radarr" = ps: with ps; [ ]; "radiotherm" = ps: with ps; [ ]; # missing inputs: radiotherm "rainbird" = ps: with ps; [ ]; # missing inputs: pyrainbird @@ -650,66 +650,66 @@ "raspihats" = ps: with ps; [ ]; # missing inputs: raspihats smbus-cffi "raspyrfm" = ps: with ps; [ ]; # missing inputs: raspyrfm-client "recollect_waste" = ps: with ps; [ ]; # missing inputs: recollect-waste - "recorder" = ps: with ps; [ sqlalchemy]; + "recorder" = ps: with ps; [ sqlalchemy ]; "recswitch" = ps: with ps; [ ]; # missing inputs: pyrecswitch - "reddit" = ps: with ps; [ praw]; + "reddit" = ps: with ps; [ praw ]; "rejseplanen" = ps: with ps; [ ]; # missing inputs: rjpl - "remember_the_milk" = ps: with ps; [ httplib2]; # missing inputs: RtmAPI + "remember_the_milk" = ps: with ps; [ httplib2 ]; # missing inputs: RtmAPI "remote" = ps: with ps; [ ]; "remote_rpi_gpio" = ps: with ps; [ ]; # missing inputs: gpiozero "repetier" = ps: with ps; [ ]; # missing inputs: pyrepetier - "rest" = ps: with ps; [ jsonpath xmltodict]; + "rest" = ps: with ps; [ jsonpath xmltodict ]; "rest_command" = ps: with ps; [ ]; "rflink" = ps: with ps; [ ]; # missing inputs: rflink "rfxtrx" = ps: with ps; [ ]; # missing inputs: pyRFXtrx - "ring" = ps: with ps; [ ha-ffmpeg]; # missing inputs: ring_doorbell + "ring" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: ring_doorbell "ripple" = ps: with ps; [ ]; # missing inputs: python-ripple-api - "rmvtransport" = ps: with ps; [ PyRMVtransport]; + "rmvtransport" = ps: with ps; [ PyRMVtransport ]; "rocketchat" = ps: with ps; [ ]; # missing inputs: rocketchat-API "roku" = ps: with ps; [ ]; # missing inputs: rokuecp "roomba" = ps: with ps; [ ]; # missing inputs: roombapy - "route53" = ps: with ps; [ boto3]; + "route53" = ps: with ps; [ boto3 ]; "rova" = ps: with ps; [ ]; # missing inputs: rova "rpi_camera" = ps: with ps; [ ]; "rpi_gpio" = ps: with ps; [ ]; # missing inputs: RPi.GPIO "rpi_gpio_pwm" = ps: with ps; [ ]; # missing inputs: pwmled "rpi_pfio" = ps: with ps; [ ]; # missing inputs: pifacecommon pifacedigitalio "rpi_rf" = ps: with ps; [ ]; # missing inputs: rpi-rf - "rss_feed_template" = ps: with ps; [ aiohttp-cors]; + "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound - "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: pysabnzbd - "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: home-assistant-frontend + "sabnzbd" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: pysabnzbd + "safe_mode" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: home-assistant-frontend "saj" = ps: with ps; [ ]; # missing inputs: pysaj "salt" = ps: with ps; [ ]; # missing inputs: saltbox - "samsungtv" = ps: with ps; [ ]; # missing inputs: samsungctl[websocket] samsungtvws[websocket] + "samsungtv" = ps: with ps; [ samsungctl samsungtvws ]; "satel_integra" = ps: with ps; [ ]; # missing inputs: satel_integra "scene" = ps: with ps; [ ]; "schluter" = ps: with ps; [ ]; # missing inputs: py-schluter - "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict]; + "scrape" = ps: with ps; [ beautifulsoup4 jsonpath xmltodict ]; "script" = ps: with ps; [ ]; "scsgate" = ps: with ps; [ ]; # missing inputs: scsgate - "search" = ps: with ps; [ aiohttp-cors]; - "season" = ps: with ps; [ ephem]; + "search" = ps: with ps; [ aiohttp-cors ]; + "season" = ps: with ps; [ ephem ]; "sendgrid" = ps: with ps; [ ]; # missing inputs: sendgrid "sense" = ps: with ps; [ ]; # missing inputs: sense_energy "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo "sensor" = ps: with ps; [ ]; - "sentry" = ps: with ps; [ sentry-sdk]; - "serial" = ps: with ps; [ pyserial-asyncio]; + "sentry" = ps: with ps; [ sentry-sdk ]; + "serial" = ps: with ps; [ pyserial-asyncio ]; "serial_pm" = ps: with ps; [ ]; # missing inputs: pmsensor "sesame" = ps: with ps; [ ]; # missing inputs: pysesame2 - "seven_segments" = ps: with ps; [ pillow]; + "seven_segments" = ps: with ps; [ pillow ]; "seventeentrack" = ps: with ps; [ ]; # missing inputs: py17track "shell_command" = ps: with ps; [ ]; - "shiftr" = ps: with ps; [ paho-mqtt]; - "shodan" = ps: with ps; [ shodan]; - "shopping_list" = ps: with ps; [ aiohttp-cors]; + "shiftr" = ps: with ps; [ paho-mqtt ]; + "shodan" = ps: with ps; [ shodan ]; + "shopping_list" = ps: with ps; [ aiohttp-cors ]; "sht31" = ps: with ps; [ ]; # missing inputs: Adafruit-GPIO Adafruit-SHT31 "sigfox" = ps: with ps; [ ]; - "sighthound" = ps: with ps; [ pillow]; # missing inputs: simplehound + "sighthound" = ps: with ps; [ pillow ]; # missing inputs: simplehound "signal_messenger" = ps: with ps; [ ]; # missing inputs: pysignalclirestapi "simplepush" = ps: with ps; [ ]; # missing inputs: simplepush "simplisafe" = ps: with ps; [ ]; # missing inputs: simplisafe-python @@ -723,51 +723,51 @@ "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ ]; # missing inputs: pysma - "smappee" = ps: with ps; [ aiohttp-cors]; # missing inputs: pysmappee + "smappee" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pysmappee "smarthab" = ps: with ps; [ ]; # missing inputs: smarthab - "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: pysmartapp pysmartthings + "smartthings" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: pysmartapp pysmartthings "smarty" = ps: with ps; [ ]; # missing inputs: pysmarty "smhi" = ps: with ps; [ ]; # missing inputs: smhi-pkg "sms" = ps: with ps; [ ]; # missing inputs: python-gammu "smtp" = ps: with ps; [ ]; - "snapcast" = ps: with ps; [ snapcast]; - "snips" = ps: with ps; [ aiohttp-cors paho-mqtt]; - "snmp" = ps: with ps; [ pysnmp]; + "snapcast" = ps: with ps; [ snapcast ]; + "snips" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "snmp" = ps: with ps; [ pysnmp ]; "sochain" = ps: with ps; [ ]; # missing inputs: python-sochain-api "socialblade" = ps: with ps; [ ]; # missing inputs: socialbladeclient - "solaredge" = ps: with ps; [ stringcase]; # missing inputs: solaredge + "solaredge" = ps: with ps; [ stringcase ]; # missing inputs: solaredge "solaredge_local" = ps: with ps; [ ]; # missing inputs: solaredge-local "solarlog" = ps: with ps; [ ]; # missing inputs: sunwatcher "solax" = ps: with ps; [ ]; # missing inputs: solax "soma" = ps: with ps; [ ]; # missing inputs: pysoma - "somfy" = ps: with ps; [ aiohttp-cors]; # missing inputs: pymfy + "somfy" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pymfy "somfy_mylink" = ps: with ps; [ ]; # missing inputs: somfy-mylink-synergy "sonarr" = ps: with ps; [ ]; # missing inputs: sonarr "songpal" = ps: with ps; [ ]; # missing inputs: python-songpal - "sonos" = ps: with ps; [ pysonos]; + "sonos" = ps: with ps; [ pysonos ]; "sony_projector" = ps: with ps; [ ]; # missing inputs: pysdcp - "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf]; - "spaceapi" = ps: with ps; [ aiohttp-cors]; + "soundtouch" = ps: with ps; [ aiohttp-cors libsoundtouch zeroconf ]; + "spaceapi" = ps: with ps; [ aiohttp-cors ]; "spc" = ps: with ps; [ ]; # missing inputs: pyspcwebgw - "speedtestdotnet" = ps: with ps; [ speedtest-cli]; + "speedtestdotnet" = ps: with ps; [ speedtest-cli ]; "spider" = ps: with ps; [ ]; # missing inputs: spiderpy "splunk" = ps: with ps; [ ]; "spotcrime" = ps: with ps; [ ]; # missing inputs: spotcrime - "spotify" = ps: with ps; [ aiohttp-cors spotipy]; - "sql" = ps: with ps; [ sqlalchemy]; + "spotify" = ps: with ps; [ aiohttp-cors spotipy ]; + "sql" = ps: with ps; [ sqlalchemy ]; "squeezebox" = ps: with ps; [ ]; # missing inputs: pysqueezebox - "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf]; + "ssdp" = ps: with ps; [ aiohttp-cors defusedxml netdisco zeroconf ]; "starline" = ps: with ps; [ ]; # missing inputs: starline "starlingbank" = ps: with ps; [ ]; # missing inputs: starlingbank - "startca" = ps: with ps; [ xmltodict]; - "statistics" = ps: with ps; [ sqlalchemy]; - "statsd" = ps: with ps; [ statsd]; + "startca" = ps: with ps; [ xmltodict ]; + "statistics" = ps: with ps; [ sqlalchemy ]; + "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd "stiebel_eltron" = ps: with ps; [ ]; # missing inputs: pymodbus pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert - "stream" = ps: with ps; [ aiohttp-cors av]; + "stream" = ps: with ps; [ aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ ]; # missing inputs: streamlabswater - "stt" = ps: with ps; [ aiohttp-cors]; + "stt" = ps: with ps; [ aiohttp-cors ]; "suez_water" = ps: with ps; [ ]; # missing inputs: pysuez "sun" = ps: with ps; [ ]; "supervisord" = ps: with ps; [ ]; @@ -786,9 +786,9 @@ "synology_dsm" = ps: with ps; [ ]; # missing inputs: python-synology "synology_srm" = ps: with ps; [ ]; # missing inputs: synology-srm "syslog" = ps: with ps; [ ]; - "system_health" = ps: with ps; [ aiohttp-cors]; - "system_log" = ps: with ps; [ aiohttp-cors]; - "systemmonitor" = ps: with ps; [ psutil]; + "system_health" = ps: with ps; [ aiohttp-cors ]; + "system_log" = ps: with ps; [ aiohttp-cors ]; + "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ ]; # missing inputs: python-tado "tahoma" = ps: with ps; [ ]; # missing inputs: tahoma-api "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility @@ -796,19 +796,19 @@ "tapsaff" = ps: with ps; [ ]; # missing inputs: tapsaff "tautulli" = ps: with ps; [ ]; # missing inputs: pytautulli "tcp" = ps: with ps; [ ]; - "ted5000" = ps: with ps; [ xmltodict]; + "ted5000" = ps: with ps; [ xmltodict ]; "teksavvy" = ps: with ps; [ ]; - "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; - "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot]; + "telegram" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; + "telegram_bot" = ps: with ps; [ pysocks aiohttp-cors python-telegram-bot ]; "tellduslive" = ps: with ps; [ ]; # missing inputs: tellduslive "tellstick" = ps: with ps; [ ]; # missing inputs: tellcore-net tellcore-py "telnet" = ps: with ps; [ ]; "temper" = ps: with ps; [ ]; # missing inputs: temperusb "template" = ps: with ps; [ ]; - "tensorflow" = ps: with ps; [ numpy pillow protobuf]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim + "tensorflow" = ps: with ps; [ numpy pillow protobuf ]; # missing inputs: pycocotools tensorflow tf-models-official tf-slim "tesla" = ps: with ps; [ ]; # missing inputs: teslajsonpy "tfiac" = ps: with ps; [ ]; # missing inputs: pytfiac - "thermoworks_smoke" = ps: with ps; [ stringcase]; # missing inputs: thermoworks_smoke + "thermoworks_smoke" = ps: with ps; [ stringcase ]; # missing inputs: thermoworks_smoke "thethingsnetwork" = ps: with ps; [ ]; "thingspeak" = ps: with ps; [ ]; # missing inputs: thingspeak "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner @@ -821,51 +821,51 @@ "timer" = ps: with ps; [ ]; "tmb" = ps: with ps; [ ]; # missing inputs: tmb "tod" = ps: with ps; [ ]; - "todoist" = ps: with ps; [ todoist]; + "todoist" = ps: with ps; [ todoist ]; "tof" = ps: with ps; [ ]; # missing inputs: RPi.GPIO VL53L1X2 "tomato" = ps: with ps; [ ]; - "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa]; # missing inputs: toonapi - "torque" = ps: with ps; [ aiohttp-cors]; + "toon" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; # missing inputs: toonapi + "torque" = ps: with ps; [ aiohttp-cors ]; "totalconnect" = ps: with ps; [ ]; # missing inputs: total_connect_client "touchline" = ps: with ps; [ ]; # missing inputs: pytouchline - "tplink" = ps: with ps; [ pyhs100]; + "tplink" = ps: with ps; [ pyhs100 ]; "tplink_lte" = ps: with ps; [ ]; # missing inputs: tp-connected - "traccar" = ps: with ps; [ aiohttp-cors stringcase]; # missing inputs: pytraccar + "traccar" = ps: with ps; [ aiohttp-cors stringcase ]; # missing inputs: pytraccar "trackr" = ps: with ps; [ ]; # missing inputs: pytrackr "tradfri" = ps: with ps; [ ]; # missing inputs: pytradfri[async] "trafikverket_train" = ps: with ps; [ ]; # missing inputs: pytrafikverket "trafikverket_weatherstation" = ps: with ps; [ ]; # missing inputs: pytrafikverket - "transmission" = ps: with ps; [ transmissionrpc]; + "transmission" = ps: with ps; [ transmissionrpc ]; "transport_nsw" = ps: with ps; [ ]; # missing inputs: PyTransportNSW "travisci" = ps: with ps; [ ]; # missing inputs: TravisPy - "trend" = ps: with ps; [ numpy]; - "tts" = ps: with ps; [ aiohttp-cors mutagen]; + "trend" = ps: with ps; [ numpy ]; + "tts" = ps: with ps; [ aiohttp-cors mutagen ]; "tuya" = ps: with ps; [ ]; # missing inputs: tuyaha "twentemilieu" = ps: with ps; [ ]; # missing inputs: twentemilieu - "twilio" = ps: with ps; [ aiohttp-cors twilio]; - "twilio_call" = ps: with ps; [ aiohttp-cors twilio]; - "twilio_sms" = ps: with ps; [ aiohttp-cors twilio]; + "twilio" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; + "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; "twitch" = ps: with ps; [ ]; # missing inputs: python-twitch-client "twitter" = ps: with ps; [ ]; # missing inputs: TwitterAPI "ubee" = ps: with ps; [ ]; # missing inputs: pyubee "ubus" = ps: with ps; [ ]; "ue_smart_radio" = ps: with ps; [ ]; "uk_transport" = ps: with ps; [ ]; - "unifi" = ps: with ps; [ aiounifi]; - "unifi_direct" = ps: with ps; [ pexpect]; + "unifi" = ps: with ps; [ aiounifi ]; + "unifi_direct" = ps: with ps; [ pexpect ]; "unifiled" = ps: with ps; [ ]; # missing inputs: unifiled "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ ]; # missing inputs: upb_lib "upc_connect" = ps: with ps; [ ]; # missing inputs: connect-box "upcloud" = ps: with ps; [ ]; # missing inputs: upcloud-api - "updater" = ps: with ps; [ distro]; - "upnp" = ps: with ps; [ async-upnp-client]; + "updater" = ps: with ps; [ distro ]; + "upnp" = ps: with ps; [ async-upnp-client ]; "uptime" = ps: with ps; [ ]; "uptimerobot" = ps: with ps; [ ]; # missing inputs: pyuptimerobot "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ ]; # missing inputs: geojson_client "utility_meter" = ps: with ps; [ ]; - "uvc" = ps: with ps; [ uvcclient]; + "uvc" = ps: with ps; [ uvcclient ]; "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp @@ -873,43 +873,43 @@ "velux" = ps: with ps; [ ]; # missing inputs: pyvlx "venstar" = ps: with ps; [ ]; # missing inputs: venstarcolortouch "vera" = ps: with ps; [ ]; # missing inputs: pyvera - "verisure" = ps: with ps; [ jsonpath]; # missing inputs: vsure + "verisure" = ps: with ps; [ jsonpath ]; # missing inputs: vsure "versasense" = ps: with ps; [ ]; # missing inputs: pyversasense - "version" = ps: with ps; [ pyhaversion]; + "version" = ps: with ps; [ pyhaversion ]; "vesync" = ps: with ps; [ ]; # missing inputs: pyvesync "viaggiatreno" = ps: with ps; [ ]; "vicare" = ps: with ps; [ ]; # missing inputs: PyViCare "vilfo" = ps: with ps; [ ]; # missing inputs: vilfo-api-client "vivotek" = ps: with ps; [ ]; # missing inputs: libpyvivotek "vizio" = ps: with ps; [ ]; # missing inputs: pyvizio - "vlc" = ps: with ps; [ python-vlc]; + "vlc" = ps: with ps; [ python-vlc ]; "vlc_telnet" = ps: with ps; [ ]; # missing inputs: python-telnet-vlc "voicerss" = ps: with ps; [ ]; "volkszaehler" = ps: with ps; [ ]; # missing inputs: volkszaehler "volumio" = ps: with ps; [ ]; # missing inputs: pyvolumio "volvooncall" = ps: with ps; [ ]; # missing inputs: volvooncall - "vultr" = ps: with ps; [ vultr]; + "vultr" = ps: with ps; [ vultr ]; "w800rf32" = ps: with ps; [ ]; # missing inputs: pyW800rf32 - "wake_on_lan" = ps: with ps; [ wakeonlan]; + "wake_on_lan" = ps: with ps; [ wakeonlan ]; "waqi" = ps: with ps; [ ]; # missing inputs: waqiasync "water_heater" = ps: with ps; [ ]; "waterfurnace" = ps: with ps; [ ]; # missing inputs: waterfurnace "watson_iot" = ps: with ps; [ ]; # missing inputs: ibmiotf "watson_tts" = ps: with ps; [ ]; # missing inputs: ibm-watson - "waze_travel_time" = ps: with ps; [ WazeRouteCalculator]; + "waze_travel_time" = ps: with ps; [ WazeRouteCalculator ]; "weather" = ps: with ps; [ ]; - "webhook" = ps: with ps; [ aiohttp-cors]; + "webhook" = ps: with ps; [ aiohttp-cors ]; "webostv" = ps: with ps; [ ]; # missing inputs: aiopylgtv - "websocket_api" = ps: with ps; [ aiohttp-cors]; + "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ ]; # missing inputs: pywemo "whois" = ps: with ps; [ ]; # missing inputs: python-whois "wiffi" = ps: with ps; [ ]; # missing inputs: wiffi - "wink" = ps: with ps; [ aiohttp-cors]; # missing inputs: pubnubsub-handler python-wink + "wink" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pubnubsub-handler python-wink "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy - "withings" = ps: with ps; [ aiohttp-cors]; # missing inputs: withings-api + "withings" = ps: with ps; [ aiohttp-cors ]; # missing inputs: withings-api "wled" = ps: with ps; [ ]; # missing inputs: wled "wolflink" = ps: with ps; [ ]; # missing inputs: wolf_smartset - "workday" = ps: with ps; [ holidays]; + "workday" = ps: with ps; [ holidays ]; "worldclock" = ps: with ps; [ ]; "worldtidesinfo" = ps: with ps; [ ]; "worxlandroid" = ps: with ps; [ ]; @@ -920,33 +920,33 @@ "xbox_live" = ps: with ps; [ ]; # missing inputs: xboxapi "xeoma" = ps: with ps; [ ]; # missing inputs: pyxeoma "xfinity" = ps: with ps; [ ]; # missing inputs: xfinity-gateway - "xiaomi" = ps: with ps; [ ha-ffmpeg]; - "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: PyXiaomiGateway - "xiaomi_miio" = ps: with ps; [ construct python-miio]; + "xiaomi" = ps: with ps; [ ha-ffmpeg ]; + "xiaomi_aqara" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: PyXiaomiGateway + "xiaomi_miio" = ps: with ps; [ construct python-miio ]; "xiaomi_tv" = ps: with ps; [ ]; # missing inputs: pymitv - "xmpp" = ps: with ps; [ slixmpp]; + "xmpp" = ps: with ps; [ slixmpp ]; "xs1" = ps: with ps; [ ]; # missing inputs: xs1-api-client "yale_smart_alarm" = ps: with ps; [ ]; # missing inputs: yalesmartalarmclient - "yamaha" = ps: with ps; [ rxv]; + "yamaha" = ps: with ps; [ rxv ]; "yamaha_musiccast" = ps: with ps; [ ]; # missing inputs: pymusiccast "yandex_transport" = ps: with ps; [ ]; # missing inputs: aioymaps "yandextts" = ps: with ps; [ ]; - "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf]; # missing inputs: yeelight + "yeelight" = ps: with ps; [ aiohttp-cors netdisco zeroconf ]; # missing inputs: yeelight "yeelightsunflower" = ps: with ps; [ ]; # missing inputs: yeelightsunflower "yessssms" = ps: with ps; [ ]; # missing inputs: YesssSMS - "yi" = ps: with ps; [ aioftp ha-ffmpeg]; - "yr" = ps: with ps; [ xmltodict]; + "yi" = ps: with ps; [ aioftp ha-ffmpeg ]; + "yr" = ps: with ps; [ xmltodict ]; "zabbix" = ps: with ps; [ ]; # missing inputs: pyzabbix "zamg" = ps: with ps; [ ]; "zengge" = ps: with ps; [ ]; # missing inputs: zengge - "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf]; + "zeroconf" = ps: with ps; [ aiohttp-cors zeroconf ]; "zerproc" = ps: with ps; [ ]; # missing inputs: pyzerproc - "zestimate" = ps: with ps; [ xmltodict]; - "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy]; + "zestimate" = ps: with ps; [ xmltodict ]; + "zha" = ps: with ps; [ bellows pyserial zha-quirks zigpy-cc zigpy-deconz zigpy-xbee zigpy-zigate zigpy ]; "zhong_hong" = ps: with ps; [ ]; # missing inputs: zhong_hong_hvac "ziggo_mediabox_xl" = ps: with ps; [ ]; # missing inputs: ziggo-mediabox-xl "zone" = ps: with ps; [ ]; - "zoneminder" = ps: with ps; [ zm-py]; - "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher]; + "zoneminder" = ps: with ps; [ zm-py ]; + "zwave" = ps: with ps; [ homeassistant-pyozw pydispatcher ]; }; } diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 4fe1e79105e..8f4d65066d0 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -32,6 +32,9 @@ let (mkOverride "pyowm" "2.10.0" "1xvcv3sbcn9na8cwz21nnjlixysfk5lymnf65d1nqkbgacc1mm4g") + (mkOverride "bcrypt" "3.1.7" + "0hhywhxx301cxivgxrpslrangbfpccc8y83qbwn1f57cab3nj00b") + # required by aioesphomeapi (self: super: { protobuf = super.protobuf.override { @@ -72,7 +75,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.114.3"; + hassVersion = "0.114.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -91,9 +94,14 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1fn93vac9vi1wcbq8z9pc2cdvfdkkxpam2qhv5ni14wrmnjc4305"; + sha256 = "0k9px4ny0b72d9ysr3x72idprgfgjab1z91ildr87629826bb4n7"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "yarl==1.4.2" "yarl~=1.4" + ''; + propagatedBuildInputs = [ # From setup.py aiohttp astral async-timeout attrs bcrypt certifi importlib-metadata jinja2 @@ -114,9 +122,14 @@ in with py.pkgs; buildPythonApplication rec { # - components' dependencies are not included, so they cannot be tested # - test_merge_id_schema requires pyqwikswitch # - test_loader.py tries to load not-packaged dependencies + # - test_notify pyotp doesn't like the short mock keys # - unclear why test_merge fails: assert merge_log_err.call_count != 0 # - test_setup_safe_mode_if_no_frontend: requires dependencies for components we have not packaged - py.test --ignore tests/components --ignore tests/test_loader.py -k "not test_setup_safe_mode_if_no_frontend and not test_merge_id_schema and not test_merge" + py.test \ + --ignore tests/components \ + --ignore tests/test_loader.py \ + --ignore tests/auth/mfa_modules/test_notify.py \ + -k "not test_setup_safe_mode_if_no_frontend and not test_merge_id_schema and not test_merge" # Some basic components should be tested however py.test \ diff --git a/pkgs/servers/home-assistant/parse-requirements.py b/pkgs/servers/home-assistant/parse-requirements.py index 3c6d0c4bcab..4fa4b8a48ee 100755 --- a/pkgs/servers/home-assistant/parse-requirements.py +++ b/pkgs/servers/home-assistant/parse-requirements.py @@ -113,6 +113,10 @@ def name_to_attr_path(req: str, packages: Dict[str, Dict[str, str]]) -> Optional # instead of python-3.6-python-mpd2 inside Nixpkgs if req.startswith("python-") or req.startswith("python_"): names.append(req[len("python-") :]) + # Add name variant without extra_require, e.g. samsungctl + # instead of samsungctl[websocket] + if req.endswith("]"): + names.append(req[:req.find("[")]) for name in names: # treat "-" and "_" equally name = re.sub("[-_]", "[-_]", name) @@ -173,9 +177,10 @@ def main() -> None: f.write(" components = {\n") for component, deps in build_inputs.items(): available, missing = deps - f.write(f' "{component}" = ps: with ps; [ ') - f.write(" ".join(available)) - f.write("];") + f.write(f' "{component}" = ps: with ps; [') + if available: + f.write(" " + " ".join(available)) + f.write(" ];") if len(missing) > 0: f.write(f" # missing inputs: {' '.join(missing)}") f.write("\n") diff --git a/pkgs/servers/http/nginx/mainline.nix b/pkgs/servers/http/nginx/mainline.nix index c67606785e5..de74a72e788 100644 --- a/pkgs/servers/http/nginx/mainline.nix +++ b/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.0"; - sha256 = "1j1n3rlvan6l9j3vw8axbbdm96w7s0x6ygmgqvbplzfd3wbid9j4"; + version = "1.19.2"; + sha256 = "0wr4ss4gld7x717m4j3a6l6f7ijblrrd55y563lkwhvr7sqpn7vw"; } diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 9fcb3305f0a..983e0f41ee9 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -4,10 +4,11 @@ let http_proxy_connect_module_generic = patchName: rec { src = fetchFromGitHub { + name = "http_proxy_connect_module_generic"; owner = "chobits"; repo = "ngx_http_proxy_connect_module"; - rev = "002f8f9ef15562dc3691b977134518ad216d7a90"; - sha256 = "163wg0xb7w5mwh6wrfarzcgaf6c7gb5qydgpi2wk35k551f7286s"; + rev = "96ae4e06381f821218f368ad0ba964f87cbe0266"; + sha256 = "1nc7z31i7x9dzp67kzgvs34hs6ps749y26wcpi3wf5mm63i803rh"; }; patches = [ @@ -18,12 +19,26 @@ let in { + fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge"; + ngx_aws_auth = throw "fastcgi-cache-purge was renamed to aws-auth"; + + aws-auth = { + src = fetchFromGitHub { + name = "aws-auth"; + owner = "anomalizer"; + repo = "ngx_aws_auth"; + rev = "2.1.1"; + sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9"; + }; + }; + brotli = { src = let gitsrc = pkgs.fetchFromGitHub { + name = "brotli"; owner = "google"; repo = "ngx_brotli"; - rev = "e505dce68acc190cc5a1e780a3b0275e39f160ca"; - sha256 = "00j48lffki62y1nmjyy81iklw5nlyzvrjy3z04qch4fp3p57hwla"; + rev = "25f86f0bac1101b6512135eac5f93c49c63609e3"; + sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv"; }; in pkgs.runCommandNoCC "ngx_brotli-src" {} '' cp -a ${gitsrc} $out substituteInPlace $out/filter/config \ @@ -32,8 +47,19 @@ in inputs = [ pkgs.brotli ]; }; + cache-purge = { + src = fetchFromGitHub { + name = "cache-purge"; + owner = "nginx-modules"; + repo = "ngx_cache_purge"; + rev = "2.5.1"; + sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd"; + }; + }; + coolkit = { src = fetchFromGitHub { + name = "coolkit"; owner = "FRiCKLE"; repo = "ngx_coolkit"; rev = "0.2"; @@ -43,6 +69,7 @@ in dav = { src = fetchFromGitHub { + name = "dav"; owner = "arut"; repo = "nginx-dav-ext-module"; rev = "v3.0.0"; @@ -53,24 +80,27 @@ in develkit = { src = fetchFromGitHub { - owner = "simpl"; + name = "develkit"; + owner = "vision5"; repo = "ngx_devel_kit"; - rev = "v0.3.1rc1"; - sha256 = "00vqvpx67qra2hr85hkvj1dha4h7x7v9sblw7w1df11nq1gzsdbb"; + rev = "v0.3.1"; + sha256 = "1c5zfpvm0hrd9lp8rasmw79dnr2aabh0i6y11wzb783bp8m3p2sq"; }; }; echo = { src = fetchFromGitHub { + name = "echo"; owner = "openresty"; repo = "echo-nginx-module"; - rev = "v0.61"; - sha256 = "0brjhhphi94ms4gia7za0mfx0png4jbhvq6j0nzjwp537iyiy23k"; + rev = "v0.62"; + sha256 = "0kr1y094yw1a9fyrf4w73ikq18w5ys463wza9n7yfl77xdwirnvl"; }; }; fancyindex = { src = fetchFromGitHub { + name = "fancyindex"; owner = "aperezdc"; repo = "ngx-fancyindex"; rev = "v0.4.4"; @@ -78,17 +108,9 @@ in }; }; - fastcgi-cache-purge = { - src = fetchFromGitHub { - owner = "nginx-modules"; - repo = "ngx_cache_purge"; - rev = "2.5"; - sha256 = "1f4kxagzvz10vqbcjwi57wink6xw3s1h7wlrrlrlpkmhfbf9704y"; - }; - }; - fluentd = { src = fetchFromGitHub { + name = "fluentd"; owner = "fluent"; repo = "nginx-fluentd-module"; rev = "8af234043059c857be27879bc547c141eafd5c13"; @@ -96,12 +118,17 @@ in }; }; - http_proxy_connect_module_v16 = http_proxy_connect_module_generic "proxy_connect_rewrite_101504" // { - supports = with lib.versions; version: major version == "1" && minor version == "16"; + http_proxy_connect_module_v18 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // { + supports = with lib.versions; version: major version == "1" && minor version == "18"; + }; + + http_proxy_connect_module_v19 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // { + supports = with lib.versions; version: major version == "1" && minor version == "19"; }; ipscrub = { src = fetchFromGitHub { + name = "ipscrub"; owner = "masonicboom"; repo = "ipscrub"; rev = "v1.0.1"; @@ -112,6 +139,7 @@ in limit-speed = { src = fetchFromGitHub { + name = "limit-speed"; owner = "yaoweibin"; repo = "nginx_limit_speed_module"; rev = "f77ad4a56fbb134878e75827b40cf801990ed936"; @@ -121,6 +149,7 @@ in live ={ src = fetchFromGitHub { + name = "live"; owner = "arut"; repo = "nginx-live-module"; rev = "5e4a1e3a718e65e5206c24eba00d42b0d1c4b7dd"; @@ -130,6 +159,7 @@ in lua = { src = fetchFromGitHub { + name = "lua"; owner = "openresty"; repo = "lua-nginx-module"; rev = "v0.10.15"; @@ -145,6 +175,7 @@ in lua-upstream = { src = fetchFromGitHub { + name = "lua-upstream"; owner = "openresty"; repo = "lua-upstream-nginx-module"; rev = "v0.07"; @@ -164,16 +195,18 @@ in modsecurity-nginx = { src = fetchFromGitHub { + name = "modsecurity-nginx"; owner = "SpiderLabs"; repo = "ModSecurity-nginx"; - rev = "v1.0.0"; - sha256 = "0zzpdqhbdqqy8kjkszv0mrq6136ah9v3zwr1jbh312j8izmzdyi7"; + rev = "v1.0.1"; + sha256 = "0cbb3g3g4v6q5zc6an212ia5kjjad62bidnkm8b70i4qv1615pzf"; }; inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ]; }; moreheaders = { src = fetchFromGitHub { + name = "moreheaders"; owner = "openresty"; repo = "headers-more-nginx-module"; rev = "v0.33"; @@ -183,6 +216,7 @@ in mpeg-ts ={ src = fetchFromGitHub { + name = "mpeg-ts"; owner = "arut"; repo = "nginx-ts-module"; rev = "v0.1.1"; @@ -192,29 +226,22 @@ in naxsi ={ src = fetchFromGitHub { + name = "naxsi"; owner = "nbs-system"; repo = "naxsi"; - rev = "0.56"; - sha256 = "12kn6wbl8xqc19fi05ffprqps4pplg4a6i1cf01xc0d6brx1fg8v"; + rev = "07a056ccd36bc3c5c40dc17991db226cb8cf6241"; + sha256 = "1kdqy7by6ha2pl9lkkjxh4qrwcsrj2alm8fl129831h5y5xy8qx2"; } + "/naxsi_src"; }; - ngx_aws_auth = { - src = fetchFromGitHub { - owner = "anomalizer"; - repo = "ngx_aws_auth"; - rev = "2.1.1"; - sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9"; - }; - }; - opentracing = { src = let src' = fetchFromGitHub { + name = "opentracing"; owner = "opentracing-contrib"; repo = "nginx-opentracing"; - rev = "v0.7.0"; - sha256 = "16jzxhhsyfjaxb50jy5py9ppscidfx1shvc29ihldp0zs6d8khma"; + rev = "v0.9.0"; + sha256 = "02rf1909grbhvs9mjxrv7pwgbf7b8rpjw7j8rpwxag2rgvlsic3g"; }; in "${src'}/opentracing"; inputs = [ pkgs.opentracing-cpp ]; @@ -225,6 +252,7 @@ in version = pkgs.psol.version; moduleSrc = fetchFromGitHub { + name = "pagespeed"; owner = "pagespeed"; repo = "ngx_pagespeed"; rev = "v${version}-stable"; @@ -253,16 +281,18 @@ in pam = { src = fetchFromGitHub { + name = "pam"; owner = "stogh"; repo = "ngx_http_auth_pam_module"; - rev = "v1.5.1"; - sha256 = "031q006bcv10dzxi3mzamqiyg14p48v0bzd5mrwz073pbf0ba2fl"; + rev = "v1.5.2"; + sha256 = "06nydxk82rc9yrw4408nakb197flxh4z1yv935crg65fn9706rl7"; }; inputs = [ pkgs.pam ]; }; pinba = { src = fetchFromGitHub { + name = "pinba"; owner = "tony2001"; repo = "ngx_http_pinba_module"; rev = "28131255d4797a7e2f82a6a35cf9fc03c4678fe6"; @@ -272,15 +302,17 @@ in push-stream ={ src = fetchFromGitHub { + name = "push-stream"; owner = "wandenberg"; repo = "nginx-push-stream-module"; - rev = "0.5.4"; - sha256 = "0izn7lqrp2zfl738aqa9i8c5lba97wkhcnqg8qbw3ipp5cysb2hr"; + rev = "1cdc01521ed44dc614ebb5c0d19141cf047e1f90"; + sha256 = "0ijka32b37dl07k2jl48db5a32ix43jaczrpjih84cvq8yph0jjr"; }; }; rtmp ={ src = fetchFromGitHub { + name = "rtmp"; owner = "arut"; repo = "nginx-rtmp-module"; rev = "v1.2.1"; @@ -290,6 +322,7 @@ in set-misc = { src = fetchFromGitHub { + name = "set-misc"; owner = "openresty"; repo = "set-misc-nginx-module"; rev = "v0.32"; @@ -299,15 +332,17 @@ in shibboleth = { src = fetchFromGitHub { + name = "shibboleth"; owner = "nginx-shib"; repo = "nginx-http-shibboleth"; - rev = "48b70d87bf7796d7813813a837e52b3a86e6f6f4"; - sha256 = "0k8xcln5sf0m4r0m550dkhl07zhncp285dpysk6r4v6vqzqmhzdc"; + rev = "5eadab80b2f5940d8873398bca000d93d3f0cf27"; + sha256 = "1l0h3ic9mfsci89d0k5q3igkfpzq052ia25xj5hc8fq388yrhpap"; }; }; sla = { src = fetchFromGitHub { + name = "sla"; owner = "goldenclone"; repo = "nginx-sla"; rev = "7778f0125974befbc83751d0e1cadb2dcea57601"; @@ -317,6 +352,7 @@ in slowfs-cache = { src = fetchFromGitHub { + name = "slowfs-cache"; owner = "FRiCKLE"; repo = "ngx_slowfs_cache"; rev = "1.10"; @@ -326,6 +362,7 @@ in sorted-querystring = { src = fetchFromGitHub { + name = "sorted-querystring"; owner = "wandenberg"; repo = "nginx-sorted-querystring-module"; rev = "0.3"; @@ -335,7 +372,8 @@ in statsd = { src = fetchFromGitHub { - owner = "apcera"; + name = "statsd"; + owner = "harvesthq"; repo = "nginx-statsd"; rev = "b970e40467a624ba710c9a5106879a0554413d15"; sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr"; @@ -344,6 +382,7 @@ in stream-sts = { src = fetchFromGitHub { + name = "stream-sts"; owner = "vozlt"; repo = "nginx-module-stream-sts"; rev = "v0.1.1"; @@ -353,6 +392,7 @@ in sts = { src = fetchFromGitHub { + name = "sts"; owner = "vozlt"; repo = "nginx-module-sts"; rev = "v0.1.1"; @@ -362,15 +402,17 @@ in subsFilter = { src = fetchFromGitHub { + name = "subsFilter"; owner = "yaoweibin"; repo = "ngx_http_substitutions_filter_module"; - rev = "bc58cb11844bc42735bbaef7085ea86ace46d05b"; - sha256 = "1q5hr3sqys4f365gzjci549rn9ylhgj4xb29ril04zr5vkhzlnar"; + rev = "b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0"; + sha256 = "027jxzx66q9a6ycn47imjh40xmnqr0z423lz0ds3w4rf1c2x130f"; }; }; sysguard = { src = fetchFromGitHub { + name = "sysguard"; owner = "vozlt"; repo = "nginx-module-sysguard"; rev = "e512897f5aba4f79ccaeeebb51138f1704a58608"; @@ -380,15 +422,17 @@ in upstream-check = { src = fetchFromGitHub { + name = "upstream-check"; owner = "yaoweibin"; repo = "nginx_upstream_check_module"; - rev = "007f76f7adbcbd6abd9352502af1a4ae463def85"; - sha256 = "1qcg7c9rcl70wr1qf188shnn9s2f7cxnlw05s6scbvlgnf6ik6in"; + rev = "e538034b6ad7992080d2403d6d3da56e4f7ac01e"; + sha256 = "06y7k04072xzqyqyb08m0vaaizkp4rfwm0q7i735imbzw2rxb74l"; }; }; upstream-tarantool = { src = fetchFromGitHub { + name = "upstream-tarantool"; owner = "tarantool"; repo = "nginx_upstream_module"; rev = "v2.7.1"; @@ -399,6 +443,7 @@ in url = { src = fetchFromGitHub { + name = "url"; owner = "vozlt"; repo = "nginx-module-url"; rev = "9299816ca6bc395625c3683fbd2aa7b916bfe91e"; @@ -408,6 +453,7 @@ in video-thumbextractor = { src = fetchFromGitHub { + name = "video-thumbextractor"; owner = "wandenberg"; repo = "nginx-video-thumbextractor-module"; rev = "0.9.0"; @@ -418,6 +464,7 @@ in vts = { src = fetchFromGitHub { + name = "vts"; owner = "vozlt"; repo = "nginx-module-vts"; rev = "v0.1.18"; diff --git a/pkgs/servers/irc/robustirc-bridge/default.nix b/pkgs/servers/irc/robustirc-bridge/default.nix new file mode 100644 index 00000000000..84b80203f57 --- /dev/null +++ b/pkgs/servers/irc/robustirc-bridge/default.nix @@ -0,0 +1,29 @@ +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "robustirc-bridge"; + version = "1.8"; + + src = fetchFromGitHub { + owner = "robustirc"; + repo = "bridge"; + rev = "v${version}"; + sha256 = "12jzil97147f978shdgm6whz7699db0shh0c1fzgrjh512dw502c"; + }; + + vendorSha256 = "0lm8j2iz0yysgi0bbh78ca629kb6sxvyy9al3aj2587hpvy79q85"; + + postInstall = '' + install -D robustirc-bridge.1 $out/share/man/man1/robustirc-bridge.1 + ''; + + passthru.tests.robustirc-bridge = nixosTests.robustirc-bridge; + + meta = with stdenv.lib; { + description = "Bridge to robustirc.net-IRC-Network"; + homepage = "https://robustirc.net/"; + license = licenses.bsd3; + maintainers = [ maintainers.hax404 ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/servers/jackett/default.nix b/pkgs/servers/jackett/default.nix index aaa762836bd..0306fb4dfab 100644 --- a/pkgs/servers/jackett/default.nix +++ b/pkgs/servers/jackett/default.nix @@ -1,46 +1,30 @@ -{ lib, stdenv, fetchurl, makeWrapper, curl, icu60, openssl, zlib }: +{ lib, stdenv, fetchurl, mono, makeWrapper, curl, icu60, openssl, zlib }: stdenv.mkDerivation rec { pname = "jackett"; - version = "0.16.175"; + version = "0.16.998"; - src = { - x86_64-linux = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxAMDx64.tar.gz"; - sha512 = "269n84qc8sfrmnidgrjywanbqr65mhkmk24dlqfi17pi0l27wi4fc4qmnjj683xwprz5hqjsmkqf963pbx4k3jaz0rp0jnizan91wij"; - }; - aarch64-linux = fetchurl { - url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.LinuxARM64.tar.gz"; - sha512 = "0dmyhprd2vi2z9q5g79psqgsc3w0zdac4s6k20rngi8jxm5jgphzrzcic4rgdijyryap99my619k447w701a08vh9sfcfk0fjg9pgwb"; - }; - }."${stdenv.targetPlatform.system}" or (throw "Missing hash for host system: ${stdenv.targetPlatform.system}"); + src = fetchurl { + url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; + sha256 = "16f8ipw4sbdxwv79zjhr5ihd3m6biyhj1gj7cqpjr34ad7zqna3c"; + }; - buildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper ]; installPhase = '' - mkdir -p $out/{bin,opt/${pname}-${version}} - cp -r * $out/opt/${pname}-${version} - - makeWrapper "$out/opt/${pname}-${version}/jackett" $out/bin/Jackett \ - --prefix LD_LIBRARY_PATH ':' "${curl.out}/lib:${icu60.out}/lib:${openssl.out}/lib:${zlib.out}/lib" - ''; + mkdir -p $out/{bin,share/${pname}-${version}} + cp -r * $out/share/${pname}-${version} - preFixup = let - libPath = lib.makeLibraryPath [ - stdenv.cc.cc.lib # libstdc++.so.6 - ]; - in '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" \ - $out/opt/${pname}-${version}/jackett + makeWrapper "${mono}/bin/mono" $out/bin/Jackett \ + --add-flags "$out/share/${pname}-${version}/JackettConsole.exe" \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ curl icu60 openssl zlib ]} ''; meta = with stdenv.lib; { description = "API Support for your favorite torrent trackers."; homepage = "https://github.com/Jackett/Jackett/"; license = licenses.gpl2; - maintainers = with maintainers; [ edwtjo nyanloutre ]; - platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ edwtjo nyanloutre purcell ]; + platforms = platforms.all; }; } diff --git a/pkgs/servers/jellyfin/default.nix b/pkgs/servers/jellyfin/default.nix index 5ae355ab8b2..3e0533fc9bd 100644 --- a/pkgs/servers/jellyfin/default.nix +++ b/pkgs/servers/jellyfin/default.nix @@ -56,6 +56,6 @@ in stdenv.mkDerivation rec { description = "The Free Software Media System"; homepage = "https://jellyfin.org/"; license = licenses.gpl2; - maintainers = with maintainers; [ nyanloutre minijackson ]; + maintainers = with maintainers; [ nyanloutre minijackson purcell ]; }; } diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index a321f609df8..f788057e386 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -9,11 +9,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.19.0"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "1fl9p0cb442271hx7zjz8vp111xgvdpn4khk8bk3kl8z9hjs2l1p"; + sha256 = "0ddn3g3q0nkxpmw0xpjhnl0m1g3lrlp89abqbal9k6n689h6kfly"; }; patches = [ diff --git a/pkgs/servers/metabase/default.nix b/pkgs/servers/metabase/default.nix index 6b3bcdf72d1..2298ecc84ce 100644 --- a/pkgs/servers/metabase/default.nix +++ b/pkgs/servers/metabase/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "metabase"; - version = "0.36.2"; + version = "0.36.4"; src = fetchurl { url = "http://downloads.metabase.com/v${version}/metabase.jar"; - sha256 = "1m3wafv6fh3ivxi474bf0in3wryyimv27pqv3920ryvwkawz7gyi"; + sha256 = "1k6f22ii9vga8j9jxipl1r55msxgag0lbkjxw7vf285z1hdhwylq"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 1f4d91c9c87..0bcad77c415 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.1.3"; + version = "7.1.5"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "1acvvqsgwfrkqmbgzdxfa8shwmx7c91agaqv3gsfgpqkqwp3pnmh"; + sha256 = "089z2x6jhiv5cx70vm7f1pyj5avappnaxrwah8jbnlkaz2kisp79"; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "0c72xmazr3rgiccrqcy02w30159vsq9d78dkqf5c2yjqn8zzwf98"; + sha256 = "0l1lw3y5w4s6qfkmclzc6h6hqwxqmxlppnwsq1zpm2hmrndy440j"; }; - vendorSha256 = "11zi7a4mqi80m5z4zcrc6wnzhgk6xnmzisrk2v4vpmfp33s732lz"; + vendorSha256 = "0i0qdfh6cjdjg2mrrabm42427aaxs6a90ydb554ds14k6r4jdf8b"; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix index e6ecf5681f5..4e5c74c2a60 100644 --- a/pkgs/servers/monitoring/loki/default.nix +++ b/pkgs/servers/monitoring/loki/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, systemd }: buildGoPackage rec { version = "1.6.0"; @@ -25,7 +25,7 @@ buildGoPackage rec { preFixup = stdenv.lib.optionalString stdenv.isLinux '' wrapProgram $out/bin/promtail \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix index 506d334a921..c66373e9298 100644 --- a/pkgs/servers/monitoring/prometheus/postfix-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/postfix-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests +{ stdenv, lib, buildGoPackage, fetchFromGitHub, makeWrapper, nixosTests , systemd, withSystemdSupport ? true }: with stdenv.lib; @@ -44,7 +44,7 @@ buildGoPackage rec { postInstall = optionalString withSystemdSupport '' wrapProgram $out/bin/postfix_exporter \ - --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib" + --prefix LD_LIBRARY_PATH : "${lib.getLib systemd}/lib" ''; passthru.tests = { inherit (nixosTests.prometheus-exporters) postfix; }; diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix index f867c819d07..2552964fe88 100644 --- a/pkgs/servers/monitoring/zabbix/versions.nix +++ b/pkgs/servers/monitoring/zabbix/versions.nix @@ -1,12 +1,12 @@ generic: { v50 = generic { - version = "5.0.2"; - sha256 = "1cnns7ixqi7ank3cbvcs7d8rb5zh9qiqbmgivazr83jnz81qg46w"; + version = "5.0.3"; + sha256 = "1dc3fb9pa2cr6mfwgfyy1hpx26pbrws7989wj2kiiilmvimvrz1l"; }; v40 = generic { - version = "4.0.20"; - sha256 = "0h6qx4imrf5inmmczxir81a9xhra8a1dxxv538mqhxhbpqn1yh3w"; + version = "4.0.24"; + sha256 = "01nm0pqsb168qawm1j7b3lixbwkz6hi8hd2052q6dlzqm7s2mi2s"; }; v30 = generic { diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix index 54d5e8484bc..4d5c24c7304 100644 --- a/pkgs/servers/nosql/arangodb/default.nix +++ b/pkgs/servers/nosql/arangodb/default.nix @@ -32,15 +32,9 @@ let # do not set GCC's -march=xxx based on builder's /proc/cpuinfo "-DUSE_OPTIMIZE_FOR_ARCHITECTURE=OFF" # also avoid using builder's /proc/cpuinfo - ] ++ - { westmere = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - sandybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - ivybridge = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - haswell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - broadwell = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - skylake = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - skylake-avx512 = [ "-DHAVE_SSE42=ON" "-DASM_OPTIMIZATIONS=ON" ]; - }.${stdenv.hostPlatform.platform.gcc.arch or ""} or [ "-DHAVE_SSE42=OFF" "-DASM_OPTIMIZATIONS=OFF" ]; + "-DHAVE_SSE42=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + "-DASM_OPTIMIZATIONS=${if stdenv.hostPlatform.sse4_2Support then "ON" else "OFF"}" + ]; enableParallelBuilding = true; diff --git a/pkgs/servers/nosql/victoriametrics/default.nix b/pkgs/servers/nosql/victoriametrics/default.nix index c470dcf1fd0..b41861768d8 100644 --- a/pkgs/servers/nosql/victoriametrics/default.nix +++ b/pkgs/servers/nosql/victoriametrics/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "VictoriaMetrics"; - version = "1.37.4"; + version = "1.40.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "02jr0qz130jz7ncfch1jry0prd00669j53mlmpb6ky0xiz5y2zq1"; + sha256 = "0dnzc7yrd91g67wkx0g1b0gi7918pi1hqv4mjlxi2ccs8phxkk7l"; }; goPackagePath = "github.com/VictoriaMetrics/VictoriaMetrics"; diff --git a/pkgs/servers/pounce/default.nix b/pkgs/servers/pounce/default.nix index 4ab3a4ee167..a418417ce2f 100644 --- a/pkgs/servers/pounce/default.nix +++ b/pkgs/servers/pounce/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pounce"; - version = "1.3p1"; + version = "1.4p2"; src = fetchzip { url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz"; - sha256 = "1ab4pz7gyvlms00hcarcmsljkn0whwqxfck8b343l4riai2rj9xv"; + sha256 = "0fpnj9yvmj4gbbfpya4i0lyin56r782pz19z3pgd8xgs22gd48cc"; }; buildInputs = [ libressl ]; diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index a76c45c1959..e39e0bf7647 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "A Usenet/BitTorrent movie downloader"; homepage = "https://radarr.video/"; license = licenses.gpl3; - maintainers = with maintainers; [ edwtjo ]; + maintainers = with maintainers; [ edwtjo purcell ]; platforms = platforms.all; }; } diff --git a/pkgs/servers/rippled/default.nix b/pkgs/servers/rippled/default.nix index 426b29c4b08..c9095339cc3 100644 --- a/pkgs/servers/rippled/default.nix +++ b/pkgs/servers/rippled/default.nix @@ -31,8 +31,8 @@ let nudb = fetchgit rec { url = "https://github.com/CPPAlliance/NuDB.git"; - rev = "2.0.1"; - sha256 = "10hlp2k7pc0c705f8sk0qw6mjfky0k08cjhh262bbjvp9fbdc7r4"; + rev = "2.0.3"; + sha256 = "0imd9sh6knydwa3pxa5bbvjs3bmb8650dnsvj04qgns6bynwlqh1"; leaveDotGit = true; fetchSubmodules = true; postFetch = "cd $out && git tag ${rev}"; @@ -49,8 +49,8 @@ let lz4 = fetchgit rec { url = "https://github.com/lz4/lz4.git"; - rev = "v1.8.2"; - sha256 = "1niv553q60hwn95yflzmrqkp1046hrid13h0yr36lm4fjza21h9w"; + rev = "v1.9.2"; + sha256 = "0322xy2vfhxkb8akas7vwajjgcigq1q8l9f5fnfmavcsd6kmxmgg"; leaveDotGit = true; fetchSubmodules = false; postFetch = "cd $out && git tag ${rev}"; @@ -58,8 +58,8 @@ let libarchive = fetchgit rec { url = "https://github.com/libarchive/libarchive.git"; - rev = "v3.3.3"; - sha256 = "165imgfmizpi4ffpiwfs8gxysn6lw3y1fxj5rga98filkl7hxs31"; + rev = "v3.4.3"; + sha256 = "00yrzy2129vr4nfhigd91651984sl447dyfjfz26dmzvna5hwzp1"; leaveDotGit = true; fetchSubmodules = false; postFetch = "cd $out && git tag ${rev}"; @@ -116,12 +116,12 @@ let }; in stdenv.mkDerivation rec { pname = "rippled"; - version = "1.5.0"; + version = "1.6.0"; src = fetchgit { url = "https://github.com/ripple/rippled.git"; rev = version; - sha256 = "0nh0x1ygrj3fw558vxbcp0md80qh27yrp3xhdlasrir7h1l2nplv"; + sha256 = "176i3dm98zp5jllslpzfhh52bd2lapq9i8r7m45v8sg9icvsmyz7"; leaveDotGit = true; fetchSubmodules = true; }; @@ -146,6 +146,9 @@ in stdenv.mkDerivation rec { git config --global url."file://${google-test}".insteadOf "${google-test.url}" git config --global url."file://${date}".insteadOf "${date.url}" + substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" + substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "https://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" + substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "http://www2.sqlite.org/2018/sqlite-amalgamation-3260000.zip" "" substituteInPlace Builds/CMake/deps/Sqlite.cmake --replace "URL ${sqlite3.url}" "URL ${sqlite3}" ''; diff --git a/pkgs/servers/sabnzbd/default.nix b/pkgs/servers/sabnzbd/default.nix index 54d327d5fc4..f6b0574fa5c 100644 --- a/pkgs/servers/sabnzbd/default.nix +++ b/pkgs/servers/sabnzbd/default.nix @@ -1,17 +1,33 @@ -{stdenv, fetchFromGitHub, python2, par2cmdline, unzip, unrar, p7zip, makeWrapper}: +{ stdenv +, fetchFromGitHub +, python3 +, par2cmdline +, unzip +, unrar +, p7zip +, makeWrapper +}: let - pythonEnv = python2.withPackages(ps: with ps; [ cryptography cheetah yenc sabyenc ]); + pythonEnv = python3.withPackages(ps: with ps; [ + chardet + cheetah3 + cherrypy + cryptography + configobj + feedparser + sabyenc3 + ]); path = stdenv.lib.makeBinPath [ par2cmdline unrar unzip p7zip ]; in stdenv.mkDerivation rec { - version = "2.3.9"; + version = "3.0.1"; pname = "sabnzbd"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "06ln00rqz4xpsqhq0f495893xq1w5dfjawb8dgfyjjfds8627p16"; + sha256 = "1zp8cxz56qmai1z6xcscnq85gxhv64dv1s5zqsqdn0zpbxyqqdlr"; }; buildInputs = [ pythonEnv makeWrapper ]; diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 88a84dd6191..b5390d1537d 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "solr"; - version = "8.5.2"; + version = "8.6.1"; src = fetchurl { url = "mirror://apache/lucene/${pname}/${version}/${pname}-${version}.tgz"; - sha256 = "1kvd0vfic9h3glhz8dz5c1n8mmb9yv339pz1878wlh9j4k3xcmy4"; + sha256 = "0ds6zjsnwgpcmivzi7d6yqdmyn2mhf3k8g7xp26yfpm7f12gpq4g"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/ser2net/default.nix b/pkgs/servers/ser2net/default.nix index 9f82a76c323..ef592420b11 100644 --- a/pkgs/servers/ser2net/default.nix +++ b/pkgs/servers/ser2net/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "cminyard"; repo = "${pname}"; rev = "v${version}"; - sha256 = "154sc7aa74c2vwfwan41qwqxckp36lw9wf3qydamsyvd9ampjf5x"; + sha256 = "01w82nrgffsfz2c80p4cyppg3bz56d90jm6i6356j0nva3784haw"; }; buildInputs = [ pkgconfig autoreconfHook gensio libyaml ]; diff --git a/pkgs/servers/sonarr/default.nix b/pkgs/servers/sonarr/default.nix index d18e9fb7f58..a1c854b7723 100644 --- a/pkgs/servers/sonarr/default.nix +++ b/pkgs/servers/sonarr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { description = "Smart PVR for newsgroup and bittorrent users"; homepage = "https://sonarr.tv/"; license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.fadenb ]; + maintainers = with stdenv.lib.maintainers; [ fadenb purcell ]; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 852f1ea61dd..a5071efb486 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -14,13 +14,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "20.1.3"; + version = "20.1.4"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "0bg60rcfn2d4awg5al8d5xvk8h7bab986qlbpl9bkv6zpw9wipfb"; + sha256 = "1m82m776axyf7b5f1lzlv5y7zslyhikfxjgagqy7ci5zwn8j4i0n"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; diff --git a/pkgs/servers/sql/dolt/default.nix b/pkgs/servers/sql/dolt/default.nix index af95a8aa8e9..e8f9923a87b 100644 --- a/pkgs/servers/sql/dolt/default.nix +++ b/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "054dy5n9b8ahfwsih4chqg83c5sp8ihc68y79kz4508d42r0zvxz"; + sha256 = "0mgawr3nkyna22sqhskvvk7h9c8ivag959liji2qcdfwgfqp0l6z"; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "1dp1asi4iz9j0m8bqiap7m6ph0qf2bi9j2yn6q53539qspc5gkr2"; + vendorSha256 = "0rqkqyvf8mjl7b62ng7vzi6as6qw3sg3lzj2mcg1aiw3h7ikr6hw"; doCheck = false; diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix index 2b440f78e99..e759a62c2eb 100644 --- a/pkgs/servers/sql/postgresql/default.nix +++ b/pkgs/servers/sql/postgresql/default.nix @@ -182,41 +182,41 @@ let in self: { postgresql_9_5 = self.callPackage generic { - version = "9.5.22"; + version = "9.5.23"; psqlSchema = "9.5"; - sha256 = "03v4d4nr9f86y0i1j5jmvfan5w8y4ga1mar59lhcnj3jl5q58ma8"; + sha256 = "0rl31jc3kg2wq6hazyd297gnmx3cibjvivllbsivii2m6dzgl573"; this = self.postgresql_9_5; inherit self; }; postgresql_9_6 = self.callPackage generic { - version = "9.6.18"; + version = "9.6.19"; psqlSchema = "9.6"; - sha256 = "16crr2a1sl97aiacqzd0bk56yl1abq6blc0c6qpx5rl5ny1c4zji"; + sha256 = "1c2wnl5bbpjs1s1rpzvlnzsqlpb0p823zw7s38nhpgnxrja3myb1"; this = self.postgresql_9_6; inherit self; }; postgresql_10 = self.callPackage generic { - version = "10.13"; + version = "10.14"; psqlSchema = "10.0"; # should be 10, but changing it is invasive - sha256 = "1qal0yp7a90yzya7hl56gsmw5fvacplrdhpn7h9gnbyr1i2iyw2d"; + sha256 = "0fxj30jvwq5pqpbj97vhlxgmn2ah59a78s9jyjr7vxyqj7sdh71q"; this = self.postgresql_10; inherit self; }; postgresql_11 = self.callPackage generic { - version = "11.8"; + version = "11.9"; psqlSchema = "11.1"; # should be 11, but changing it is invasive - sha256 = "1qksqyayxmnccmbapg3ajsw9pjgqva0inxjhx64rqd6ckhrg9wpa"; + sha256 = "0db6pfphc5rp12abnkvv2l9pbl7bdyf3hhiwj8ghjwh35skqlq9m"; this = self.postgresql_11; inherit self; }; postgresql_12 = self.callPackage generic { - version = "12.3"; + version = "12.4"; psqlSchema = "12"; - sha256 = "0hfg3n7rlz96579cj3z1dh2idl15rh3wfvn8jl31jj4h2yk69vcl"; + sha256 = "1k06wryy8p4s1fim9qafcjlak3f58l0wqaqnrccr9x9j5jz3zsdy"; this = self.postgresql_12; inherit self; }; diff --git a/pkgs/servers/sql/postgresql/ext/age.nix b/pkgs/servers/sql/postgresql/ext/age.nix new file mode 100644 index 00000000000..09021317cd1 --- /dev/null +++ b/pkgs/servers/sql/postgresql/ext/age.nix @@ -0,0 +1,65 @@ +{ stdenv, fetchFromGitHub, bison, flex, postgresql }: + +stdenv.mkDerivation rec { + pname = "age"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "bitnine-oss"; + repo = "AgensGraph-Extension"; + rev = "v${version}"; + sha256 = "0way59lj30727jlz2qz6rnw4fsxcd5028xcwgrwk7jxcaqi5fa17"; + }; + + buildInputs = [ postgresql ]; + + makeFlags = [ + "BISON=${bison}/bin/bison" + "FLEX=${flex}/bin/flex" + ]; + + installPhase = '' + install -D -t $out/lib *.so + install -D -t $out/share/postgresql/extension *.sql + install -D -t $out/share/postgresql/extension *.control + ''; + + passthru.tests = stdenv.mkDerivation { + inherit version src; + + pname = "age-regression"; + + dontConfigure = true; + + buildPhase = let + postgresqlAge = postgresql.withPackages (ps: [ ps.age ]); + in '' + # The regression tests need to be run in the order specified in the Makefile. + echo -e "include Makefile\nfiles:\n\t@echo \$(REGRESS)" > Makefile.regress + REGRESS_TESTS=$(make -f Makefile.regress files) + + ${postgresql}/lib/pgxs/src/test/regress/pg_regress \ + --inputdir=./ \ + --bindir='${postgresqlAge}/bin' \ + --encoding=UTF-8 \ + --load-extension=age \ + --inputdir=./regress --outputdir=./regress --temp-instance=./regress/instance \ + --port=61958 --dbname=contrib_regression \ + $REGRESS_TESTS + ''; + + installPhase = '' + touch $out + ''; + }; + + meta = with stdenv.lib; { + 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 ]; + platforms = postgresql.meta.platforms; + license = licenses.asl20; + broken = versionOlder postgresql.version "11.0"; + }; +} diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 79e0e052122..674aa29daec 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.0.2"; + version = "3.1.0"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "10ij3ww0081wc81jzvmkgl8r3qpqp7lcsi9pgn62bqd1c8dw88yg"; + sha256 = "0sdyq0a98snmcq6g6mgmadlz6cgvacivv34943azhnzspa3iy409"; }; installPhase = '' diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix index 4e76fc35689..61564a69232 100644 --- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix +++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "timescaledb"; - version = "1.7.2"; + version = "1.7.3"; nativeBuildInputs = [ cmake ]; buildInputs = [ postgresql openssl ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { owner = "timescale"; repo = "timescaledb"; rev = "refs/tags/${version}"; - sha256 = "0xqyq3a43j2rav5n87lv1d0f66h9kqjnlxq5nq5d54h5g5qbsr3y"; + sha256 = "1y3w1ap1cxmi691wfz078r2h74pcwf38zs8lr985pfmb25w47q0l"; }; cmakeFlags = [ "-DSEND_TELEMETRY_DEFAULT=OFF" "-DREGRESS_CHECKS=OFF" ]; diff --git a/pkgs/servers/sql/postgresql/packages.nix b/pkgs/servers/sql/postgresql/packages.nix index 44e560a5f83..6dbb7a8ed11 100644 --- a/pkgs/servers/sql/postgresql/packages.nix +++ b/pkgs/servers/sql/postgresql/packages.nix @@ -1,5 +1,7 @@ self: super: { + age = super.callPackage ./ext/age.nix { }; + periods = super.callPackage ./ext/periods.nix { }; postgis = super.callPackage ./ext/postgis.nix { diff --git a/pkgs/servers/squid/default.nix b/pkgs/servers/squid/default.nix index d14252da999..ad7d534103c 100644 --- a/pkgs/servers/squid/default.nix +++ b/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "4.12"; + version = "4.13"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "05z34ysy2zn7as11vd365xxhh36bm1ysiwcbr0i0f0nwng406apl"; + sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/servers/sslh/default.nix b/pkgs/servers/sslh/default.nix index 5be4805909d..578d280afd9 100644 --- a/pkgs/servers/sslh/default.nix +++ b/pkgs/servers/sslh/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "sslh"; - version = "1.21"; + version = "1.21c"; src = fetchurl { url = "https://www.rutschle.net/tech/sslh/sslh-v${version}.tar.gz"; - sha256 = "1am63nslvv9xkbn9xavpf1zl6f7g1snz8cvnzlya7dq4la4y97d7"; + sha256 = "01p7w74ppszxgz6n41lqd6xqvc7bjk2dsc769dd1yb7q4qvpiziv"; }; postPatch = "patchShebangs *.sh"; diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 863dc505032..32c0c84dd08 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.0.3"; + version = "1.0.5"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "1m3cfq4qyg2l0hpk8s7nr8cw2j7akiga7x8bwyhdjifnkwsyz6x7"; + sha256 = "0ib2s694kf5iz5hvrlzfs80z0931dhva7yir80crq0pji9y4rp7b"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/servers/tegola/default.nix b/pkgs/servers/tegola/default.nix index 24e25f0c137..ecb7fdd4888 100644 --- a/pkgs/servers/tegola/default.nix +++ b/pkgs/servers/tegola/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "tegola"; - version = "0.11.2"; + version = "0.12.0"; goPackagePath = "github.com/go-spatial/tegola"; @@ -10,9 +10,11 @@ buildGoPackage rec { owner = "go-spatial"; repo = pname; rev = "v${version}"; - sha256 = "0xrjs0py08q9i31rl0cxi6idncrrgqwcspqks3c5vd9i65yqc6fv"; + sha256 = "1bm791cis6bqgvhkk6n03kdxh0y9fdkhsx4rgmv7pm3zzdd7b17r"; }; + buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; + meta = with stdenv.lib; { homepage = "https://www.tegola.io/"; description = "Mapbox Vector Tile server"; diff --git a/pkgs/servers/web-apps/sogo/default.nix b/pkgs/servers/web-apps/sogo/default.nix index 3e78b5d9d43..1ec512ba0ca 100644 --- a/pkgs/servers/web-apps/sogo/default.nix +++ b/pkgs/servers/web-apps/sogo/default.nix @@ -1,24 +1,25 @@ { gnustep, lib, fetchFromGitHub, fetchpatch, makeWrapper, python2, lndir -, openssl_1_1, openldap, sope, libmemcached, curl }: with lib; gnustep.stdenv.mkDerivation rec { +, openssl_1_1, openldap, sope, libmemcached, curl, libsodium, libzip, pkgconfig }: +with lib; gnustep.stdenv.mkDerivation rec { pname = "SOGo"; - version = "4.3.2"; + version = "5.0.0"; src = fetchFromGitHub { owner = "inverse-inc"; repo = pname; rev = "SOGo-${version}"; - sha256 = "1xxad23a8zy6w850x5nrrf54db0x73lc9drmc5kpfk870fk2lmr0"; + sha256 = "sha256-SEyyHekUCSkb5rOh7Ty8AhtT4S9KicTRbo9iWhijdGE="; }; nativeBuildInputs = [ gnustep.make makeWrapper python2 ]; - buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) ] + buildInputs = [ gnustep.base sope openssl_1_1 libmemcached (curl.override { openssl = openssl_1_1; }) libsodium libzip pkgconfig ] ++ optional (openldap != null) openldap; patches = [ # TODO: take a closer look at other patches in https://sources.debian.org/patches/sogo/ and https://github.com/Skrupellos/sogo-patches (fetchpatch { - url = "https://sources.debian.org/data/main/s/sogo/4.3.0-1/debian/patches/0005-Remove-build-date.patch"; - sha256 = "0lrh3bkfj3r0brahfkyb0g7zx7r2jjd5cxzjl43nqla0fs09wsh8"; + url = "https://salsa.debian.org/debian/sogo/-/raw/120ac6390602c811908c7fcb212a79acbc7f7f28/debian/patches/0005-Remove-build-date.patch"; + sha256 = "151i8504kwdlcirgd0pbif7cxnb1q6jsp5j7dbh9p6zw2xgwkp25"; }) ]; diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 64dd3cd70c7..2cb45f33f7b 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "elvish"; - version = "0.14.0"; + version = "0.14.1"; excludedPackages = [ "website" ]; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "1jsxhnm82pjzwvcjq7vrlldyjnv5j6c83a13dj6zphlqq99z68l4"; + sha256 = "05wp3cx4s2cjf60yncdpmycs5h4z1dlin56dmljmfwz4z099079b"; }; vendorSha256 = "1f971n17h9bc0qcgs9ipiaw0x9807mz761fqm605br4ch1kp0897"; diff --git a/pkgs/shells/rssh/default.nix b/pkgs/shells/rssh/default.nix deleted file mode 100644 index b2bec51a95e..00000000000 --- a/pkgs/shells/rssh/default.nix +++ /dev/null @@ -1,97 +0,0 @@ -# CAVEATS: -# - Have only tested this with rsync, scp, and sftp. cvs support should work, but chroot integration is unlikely to function without further work -# - It is compiled without rdist support because rdist is ludicrously ancient (and not already in nixpkgs) - -{ stdenv, fetchurl, openssh, rsync, cvs }: - -stdenv.mkDerivation rec { - pname = "rssh"; - version = "2.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/rssh/rssh/${version}/${pname}-${version}.tar.gz"; - sha256 = "f30c6a760918a0ed39cf9e49a49a76cb309d7ef1c25a66e77a41e2b1d0b40cd9"; - }; - - patches = [ - ./fix-config-path.patch - - # Patches from AUR - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0001-fail-logging.patch?h=rssh"; - name = "0001-fail-logging.patch"; - sha256 = "d30f2f4fdb1b57f94773f5b0968a4da3356b14a040efe69ec1e976c615035c65"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0002-info-to-debug.patch?h=rssh"; - name = "0002-info-to-debug.patch"; - sha256 = "86f6ecf34f62415b0d6204d4cbebc47322dc2ec71732d06aa27758e35d688fcd"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0003-man-page-spelling.patch?h=rssh"; - name = "0003-man-page-spelling.patch"; - sha256 = "455b3bbccddf1493999d00c2cd46e62930ef4fd8211e0b7d3a89d8010d6a5431"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0004-mkchroot.patch?h=rssh"; - name = "0004-mkchroot.patch"; - sha256 = "f7fd8723d2aa94e64e037c13c2f263a52104af680ab52bfcaea73dfa836457c2"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0005-mkchroot-arch.patch?h=rssh"; - name = "0005-mkchroot-arch.patch"; - sha256 = "ac8894c4087a063ae8267d2fdfcde69c2fe6b67a8ff5917e4518b8f73f08ba3f"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0006-mkchroot-symlink.patch?h=rssh"; - name = "0006-mkchroot-symlink.patch"; - sha256 = "bce98728cb9b55c92182d4901c5f9adf49376a07c5603514b0004e3d1c85e9c7"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0007-destdir.patch?h=rssh"; - name = "0007-destdir.patch"; - sha256 = "7fa03644f81dc37d77cc7e2cad994f17f91b2b8a49b1a74e41030a4ac764385e"; - }) - (fetchurl { - url = "https://aur.archlinux.org/cgit/aur.git/plain/0008-rsync-protocol.patch?h=rssh"; - name = "0008-rsync-protocol.patch"; - sha256 = "0c772afe9088eeded129ead86775ef18e58c318bbc58fc3e2585e7ff09cc5e91"; - }) - ]; - - # Run this after to avoid conflict with patches above - postPatch = '' - sed -i '/chmod u+s/d' Makefile.in - ''; - - - buildInputs = [ openssh rsync cvs ]; - - configureFlags = [ - "--with-sftp-server=${openssh}/libexec/sftp-server" - "--with-scp=${openssh}/bin/scp" - "--with-rsync=${rsync}/bin/rsync" - "--with-cvs=${cvs}/bin/cvs" - ]; - - - meta = with stdenv.lib; { - description = "A restricted shell for use with OpenSSH, allowing only scp and/or sftp"; - longDescription = '' - rssh also includes support for rsync and cvs. For example, if you have a server which you only want to allow users to copy files off of via scp, without providing shell access, you can use rssh to do that. - ''; - homepage = "http://www.pizzashack.org/rssh/"; - license = licenses.bsd2; - platforms = platforms.linux; - maintainers = with maintainers; [ arobyn ]; - knownVulnerabilities = [ - "CVE-2019-1000018" - "CVE-2019-3463" - "CVE-2019-3464" - ]; - }; - - passthru = { - shellPath = "/bin/rssh"; - }; -} diff --git a/pkgs/shells/rssh/fix-config-path.patch b/pkgs/shells/rssh/fix-config-path.patch deleted file mode 100644 index eecffb376ab..00000000000 --- a/pkgs/shells/rssh/fix-config-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur rssh-2.3.4/Makefile.in rssh-2.3.4-fixed/Makefile.in ---- rssh-2.3.4/Makefile.in 2012-11-27 11:19:34.000000000 +1100 -+++ rssh-2.3.4-fixed/Makefile.in 2015-11-11 21:13:58.516651742 +1100 -@@ -186,7 +186,7 @@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ - AUTOMAKE_OPTIONS = nostdinc --ourdefs = -DPATH_RSSH_CONFIG=\"@sysconfdir@/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\" -+ourdefs = -DPATH_RSSH_CONFIG=\"/etc/rssh.conf\" -DPATH_CHROOT_HELPER=\"@libexecdir@/rssh_chroot_helper\" - ourflags = @defcflags@ @static@ - AM_CFLAGS = $(ourflags) - nodist_rssh_SOURCES = main.c pathnames.h config.h diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 5d6a8a6065b..f73ec422e06 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -4,21 +4,31 @@ , glibcLocales , coreutils , git +, fetchpatch }: python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.19"; + version = "0.9.20"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; rev = version; - sha256 = "1s7nb23zh4may4k3c9yfiizfdflm97hf5q2aww4j6ibykgcydv64"; + sha256 = "05phrwqd1c64531y78zxkxd4w1cli8yj3x2cqch7nkzbyz93608p"; }; LC_ALL = "en_US.UTF-8"; + + patches = [ + # Fix vox tests. Remove with the next release + (fetchpatch { + url = "https://github.com/xonsh/xonsh/commit/00aeb7645af97134495cc6bc5fe2f41922df8676.patch"; + sha256 = "0hx5jk22wxgmjzmqbxr2pjs3mwh7p0jwld0xhslc1s6whbjml25h"; + }) + ]; + postPatch = '' sed -ie "s|/bin/ls|${coreutils}/bin/ls|" tests/test_execer.py sed -ie "s|SHELL=xonsh|SHELL=$out/bin/xonsh|" tests/test_integrations.py diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 8fc189fbf15..b8a3a7c5fdc 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -1,70 +1,68 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ stdenv, fetchgit }: +{ stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "2020-08-20"; + version = "2020-08-31"; pname = "oh-my-zsh"; - rev = "03b6a72576cb0f0b53abde25d409e8026d5c4ee9"; + rev = "a7f5170d68c0b75a9864763a90ac11e51ec67c81"; - src = fetchgit { inherit rev; - url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0bm043r3pffbv74drrv2xa66rsadrrsayscwwnfgp24svdmx7a6z"; + src = fetchFromGitHub { + inherit rev; + owner = "ohmyzsh"; + repo = "ohmyzsh"; + sha256 = "03k1918cakqmg3x7kkiffdz1zwd86bipypkfigq3pgalh5zkyny9"; }; - pathsToLink = [ "/share/oh-my-zsh" ]; - - phases = "installPhase"; - installPhase = '' - outdir=$out/share/oh-my-zsh - template=templates/zshrc.zsh-template + outdir=$out/share/oh-my-zsh + template=templates/zshrc.zsh-template - mkdir -p $outdir - cp -r $src/* $outdir - cd $outdir + mkdir -p $outdir + cp -r * $outdir + cd $outdir - rm LICENSE.txt - rm -rf .git* + rm LICENSE.txt + rm -rf .git* - chmod -R +w templates + chmod -R +w templates - # Change the path to oh-my-zsh dir and disable auto-updating. - sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ - -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ - $template + # Change the path to oh-my-zsh dir and disable auto-updating. + sed -i -e "s#ZSH=\$HOME/.oh-my-zsh#ZSH=$outdir#" \ + -e 's/\# \(DISABLE_AUTO_UPDATE="true"\)/\1/' \ + $template - chmod +w oh-my-zsh.sh + chmod +w oh-my-zsh.sh - # Both functions expect oh-my-zsh to be in ~/.oh-my-zsh and try to - # modify the directory. - cat >> oh-my-zsh.sh <<- EOF + # Both functions expect oh-my-zsh to be in ~/.oh-my-zsh and try to + # modify the directory. + cat >> oh-my-zsh.sh <<- EOF - # Undefine functions that don't work on Nix. - unfunction uninstall_oh_my_zsh - unfunction upgrade_oh_my_zsh - EOF + # Undefine functions that don't work on Nix. + unfunction uninstall_oh_my_zsh + unfunction upgrade_oh_my_zsh + EOF - # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source - # them, if found. - cat >> $template <<- EOF + # Look for .zsh_variables, .zsh_aliases, and .zsh_funcs, and source + # them, if found. + cat >> $template <<- EOF - # Load the variables. - if [ -f ~/.zsh_variables ]; then - . ~/.zsh_variables - fi + # Load the variables. + if [ -f ~/.zsh_variables ]; then + . ~/.zsh_variables + fi - # Load the functions. - if [ -f ~/.zsh_funcs ]; then - . ~/.zsh_funcs - fi + # Load the functions. + if [ -f ~/.zsh_funcs ]; then + . ~/.zsh_funcs + fi - # Load the aliases. - if [ -f ~/.zsh_aliases ]; then - . ~/.zsh_aliases - fi - EOF + # Load the aliases. + if [ -f ~/.zsh_aliases ]; then + . ~/.zsh_aliases + fi + EOF ''; meta = with stdenv.lib; { diff --git a/pkgs/shells/zsh/oh-my-zsh/update.sh b/pkgs/shells/zsh/oh-my-zsh/update.sh index 0146cac8496..738c0810737 100755 --- a/pkgs/shells/zsh/oh-my-zsh/update.sh +++ b/pkgs/shells/zsh/oh-my-zsh/update.sh @@ -5,7 +5,6 @@ set -eu -o pipefail oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')" latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" -url="$(nix-instantiate --eval -E "with import ./. {}; oh-my-zsh.src.url" | tr -d '"')" if [ ! "null" = "${latestSha}" ]; then latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 5b1c380548f..e0266aacf34 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -338,6 +338,32 @@ in rec { validity.handled ({ overrideAttrs = f: mkDerivation (attrs // (f attrs)); + + # A derivation that always builds successfully and whose runtime + # dependencies are the original derivations build time dependencies + # This allows easy building and distributing of all derivations + # needed to enter a nix-shell with + # nix-build shell.nix -A inputDerivation + inputDerivation = derivation (derivationArg // { + # Add a name in case the original drv didn't have one + name = derivationArg.name or "inputDerivation"; + # This always only has one output + outputs = [ "out" ]; + + # Propagate the original builder and arguments, since we override + # them and they might contain references to build inputs + _derivation_original_builder = derivationArg.builder; + _derivation_original_args = derivationArg.args; + + builder = stdenv.shell; + # The bash builtin `export` dumps all current environment variables, + # which is where all build input references end up (e.g. $PATH for + # binaries). By writing this to $out, Nix can find and register + # them as runtime dependencies (since Nix greps for store paths + # through $out to find them) + args = [ "-c" "export > $out" ]; + }); + inherit meta passthru; } // # Pass through extra attributes that are not inputs, but diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 74a6777d949..91e067e7be7 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.195"; + version = "1.196"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "0d0xagigs5k3appzz5lzxdjncvnkgz4amz6ks7imiq8kkjixvmfy"; + sha256 = "0c79rycgpna8910as6blw3z3sajzzakz4qlvr6js2yr8zq2d0ylg"; }; buildInputs = [ perl ]; diff --git a/pkgs/tools/X11/wmutils-libwm/default.nix b/pkgs/tools/X11/wmutils-libwm/default.nix new file mode 100644 index 00000000000..72022621afe --- /dev/null +++ b/pkgs/tools/X11/wmutils-libwm/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, libxcb }: + +stdenv.mkDerivation rec { + pname = "wmutils-libwm"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "wmutils"; + repo = "libwm"; + rev = "v${version}"; + sha256 = "1lpbqrilhffpzc0b7vnp08jr1wr96lndwc7y0ck8hlbzlvm662l0"; + }; + + buildInputs = [ libxcb ]; + + installFlags = [ "PREFIX=$(out)" ]; + + meta = with stdenv.lib; { + description = "A small library for X window manipulation"; + homepage = "https://github.com/wmutils/libwm"; + license = licenses.isc; + maintainers = with maintainers; [ bhougland ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 84b5d7ebeb2..991f099a1ca 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -19,11 +19,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.18.109"; # N.B: if you change this, change botocore to a matching version too + version = "1.18.120"; # N.B: if you change this, change botocore to a matching version too src = fetchPypi { inherit pname version; - sha256 = "eca463ca5447d7db2eeebd268217b7e73f7e9a22b750505a3efd655dc189ac84"; + sha256 = "3d21dcb0a17b8b623e7b7fd3528ede7d445c485fa4ca6cacfbaf4910a1d17944"; }; postPatch = '' diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 27ea33b6035..7c240aa4131 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - sha256 = "1p3dzzbf840csqlgxyykmyg13z0nkzy4nkqq9y8jlpdm745vcryv"; + sha256 = "1av5w32ia68j2xrw4m16mzm9jn6xlap93kwi8iqw0s6wgihzadds"; }; - vendorSha256 = "1msid4857wsh4qp1f7nyrmpzjv3sklh49cl7a9c1a3qr9m99w4yb"; + vendorSha256 = "13sc4yrzgx2sm98whibfy2kjia3yy9cdvibvhbvg2lz2spprjb9v"; doCheck = false; diff --git a/pkgs/tools/admin/lego/default.nix b/pkgs/tools/admin/lego/default.nix index e5bc573661c..4b2d88cdf27 100644 --- a/pkgs/tools/admin/lego/default.nix +++ b/pkgs/tools/admin/lego/default.nix @@ -1,17 +1,17 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, nixosTests }: buildGoModule rec { pname = "lego"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "go-acme"; repo = pname; rev = "v${version}"; - sha256 = "03824c5nfii7cc6mr1hdkyd4jjy8vpn08lnj4c6pc61s3i6gacc6"; + sha256 = "02p7zlrz8fp5bsvhk4jrx5x3gxnl00friay1jihlzyk3s400n9jb"; }; - vendorSha256 = "14453iiya6algkympyvwm03qgjcwk79z8bbrij7qhnp52qfrbmrp"; + vendorSha256 = "0jh7qi422i2114198fain9nwwf8yd8vna0p3g0hvginh59svyagc"; doCheck = false; @@ -27,4 +27,6 @@ buildGoModule rec { homepage = "https://go-acme.github.io/lego/"; maintainers = teams.acme.members; }; + + passthru.tests.lego = nixosTests.acme; } diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index 2e8ff96d41a..2a71556961e 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -18,13 +18,13 @@ let in buildGoPackage rec { pname = "lxd"; - version = "4.4"; + version = "4.5"; goPackagePath = "github.com/lxc/lxd"; src = fetchurl { url = "https://github.com/lxc/lxd/releases/download/${pname}-${version}/${pname}-${version}.tar.gz"; - sha256 = "0fk42spz57nfmwy6xn02nnlkq01111x03psjq003k2785ah4xk1h"; + sha256 = "1nszzcyn8kvpnxppjbxky5x9a8n0jfmhy20j6nrwm3196gd6hirr"; }; postPatch = '' diff --git a/pkgs/tools/admin/salt/default.nix b/pkgs/tools/admin/salt/default.nix index 35d65b5e657..83b69b12fea 100644 --- a/pkgs/tools/admin/salt/default.nix +++ b/pkgs/tools/admin/salt/default.nix @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { pyyaml pyzmq requests - tornado_4 + tornado ] ++ extraInputs; patches = [ ./fix-libcrypto-loading.patch ]; diff --git a/pkgs/tools/admin/salt/pepper/default.nix b/pkgs/tools/admin/salt/pepper/default.nix index e2cfa806f95..0c6e9dc0ab2 100644 --- a/pkgs/tools/admin/salt/pepper/default.nix +++ b/pkgs/tools/admin/salt/pepper/default.nix @@ -1,19 +1,19 @@ { lib -, pythonPackages +, python3Packages , salt }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "salt-pepper"; version = "0.7.5"; - src = pythonPackages.fetchPypi { + src = python3Packages.fetchPypi { inherit pname version; sha256 = "1wh6yidwdk8jvjpr5g3azhqgsk24c5rlzmw6l86dmi0mpvmxm94w"; }; - buildInputs = with pythonPackages; [ setuptools setuptools_scm salt ]; - checkInputs = with pythonPackages; [ - pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado_4 + buildInputs = with python3Packages; [ setuptools setuptools_scm salt ]; + checkInputs = with python3Packages; [ + pytest mock pyzmq pytest-rerunfailures pytestcov cherrypy tornado ]; meta = with lib; { @@ -21,5 +21,6 @@ pythonPackages.buildPythonApplication rec { homepage = "https://github.com/saltstack/pepper"; maintainers = [ maintainers.pierrer ]; license = licenses.asl20; + broken = true; # ModuleNotFoundError: No module named 'pytestsalt' }; } diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index f075f503ae5..4ab394516a8 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2020.07.28"; + version = "2020.08.09"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "05nsakvnx1jz2k9bvabpw5v3js28ng9z7n6ch58brd3qxc2p76zv"; + sha256 = "1j7jkv2fdrhyyjavffb5nrs8p9mfp8zqqravcad1ayv1z2wxr8vl"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase diff --git a/pkgs/tools/audio/qastools/default.nix b/pkgs/tools/audio/qastools/default.nix index 86ef7f050b2..55dbba007f8 100644 --- a/pkgs/tools/audio/qastools/default.nix +++ b/pkgs/tools/audio/qastools/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "qastools"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitLab { owner = "sebholt"; repo = pname; rev = "v${version}"; - sha256 = "0px4fcn8dagivq5fyi5gy84yj86f6x0lk805mc4ry58d0wsbn68v"; + sha256 = "19hn64hnvryfmrkdg6rqyzahdbqf1s5y3dcca389jj6sdx93b3ip"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index 57ab854a33c..ee6ae0a2934 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -5,7 +5,7 @@ assert par2Support -> par2cmdline != null; -let version = "0.30.1"; in +let version = "0.31"; in with stdenv.lib; @@ -17,7 +17,7 @@ stdenv.mkDerivation { repo = "bup"; owner = "bup"; rev = version; - sha256 = "0z9rpmmi6mbm48ynd6izr0f8l3cklfyar6gjy0c8z9zal1ac9r55"; + sha256 = "03kmmdlgg0p5z39bhckkf91mmq55wghb93ghqvv9f9gaby1diw4z"; }; buildInputs = [ diff --git a/pkgs/tools/backup/dar/default.nix b/pkgs/tools/backup/dar/default.nix index a439bbf41b1..1f379feece4 100644 --- a/pkgs/tools/backup/dar/default.nix +++ b/pkgs/tools/backup/dar/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs, gpgme, xz }: +{ stdenv, fetchurl +, attr, e2fsprogs +, curl, librsync, libthreadar +, gpgme, libgcrypt, openssl +, bzip2, lzo, xz, zlib +}: with stdenv.lib; stdenv.mkDerivation rec { - version = "2.6.9"; + version = "2.6.10"; pname = "dar"; src = fetchurl { url = "mirror://sourceforge/dar/${pname}-${version}.tar.gz"; - sha256 = "1jzqq54w1dix2qdlj4hr9dpq9fnp23h102bk8d2gq6k7n2zgaj6v"; + sha256 = "1ryj4xxar18hshg38j1ljhplypgmfprwqn72k1jwxi28qravg80n"; }; - buildInputs = [ zlib bzip2 openssl lzo libgcrypt gpgme xz ] - ++ optionals stdenv.isLinux [ attr e2fsprogs ]; + outputs = [ "out" "dev" ]; + + buildInputs = [ + curl librsync libthreadar + gpgme libgcrypt openssl + bzip2 lzo xz zlib + ] ++ optionals stdenv.isLinux [ attr e2fsprogs ]; configureFlags = [ "--disable-birthtime" @@ -23,7 +33,8 @@ stdenv.mkDerivation rec { ]; postInstall = '' - rm -r "$out"/share/dar # Disable html help + # Disable html help + rm -r "$out"/share/dar ''; enableParallelBuilding = true; @@ -33,6 +44,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://dar.linux.free.fr"; description = "Disk ARchiver, allows backing up files into indexed archives"; + maintainers = with maintainers; [ izorkin ]; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/backup/grab-site/default.nix b/pkgs/tools/backup/grab-site/default.nix index 81e16ad005b..e69823ab45d 100644 --- a/pkgs/tools/backup/grab-site/default.nix +++ b/pkgs/tools/backup/grab-site/default.nix @@ -1,6 +1,14 @@ -{ stdenv, python3Packages, fetchFromGitHub }: +{ stdenv, python37, fetchFromGitHub }: -python3Packages.buildPythonApplication rec { +let + python = python37.override { + self = python; + packageOverrides = self: super: { + tornado = super.tornado_4; + }; + }; + +in with python.pkgs; buildPythonApplication rec { version = "2.1.19"; name = "grab-site-${version}"; @@ -11,7 +19,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1v1hnhv5knzdl0kj3574ccwlh171vcb7faddp095ycdmiiybalk4"; }; - propagatedBuildInputs = with python3Packages; [ + propagatedBuildInputs = [ click ludios_wpull manhole lmdb autobahn fb-re2 websockets cchardet ]; diff --git a/pkgs/tools/bluetooth/blueberry/default.nix b/pkgs/tools/bluetooth/blueberry/default.nix index 4b7692d49d6..16563c38099 100644 --- a/pkgs/tools/bluetooth/blueberry/default.nix +++ b/pkgs/tools/bluetooth/blueberry/default.nix @@ -8,7 +8,7 @@ , intltool , pavucontrol , python3Packages -, rfkill +, utillinux , wrapGAppsHook }: @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { cinnamon.xapps gnome3.gnome-bluetooth python3Packages.python - rfkill + utillinux ]; pythonPath = with python3Packages; [ @@ -68,8 +68,8 @@ stdenv.mkDerivation rec { --replace /usr/lib/blueberry $out/lib/blueberry \ --replace /usr/share $out/share substituteInPlace $out/lib/blueberry/rfkillMagic.py \ - --replace /usr/bin/rfkill ${rfkill}/bin/rfkill \ - --replace /usr/sbin/rfkill ${rfkill}/bin/rfkill \ + --replace /usr/bin/rfkill ${utillinux}/bin/rfkill \ + --replace /usr/sbin/rfkill ${utillinux}/bin/rfkill \ --replace /usr/lib/blueberry $out/lib/blueberry substituteInPlace $out/share/applications/blueberry.desktop \ --replace Exec=blueberry Exec=$out/bin/blueberry diff --git a/pkgs/tools/compression/bzip2/1_1.nix b/pkgs/tools/compression/bzip2/1_1.nix new file mode 100644 index 00000000000..3f6105ca507 --- /dev/null +++ b/pkgs/tools/compression/bzip2/1_1.nix @@ -0,0 +1,45 @@ +{ stdenv +, fetchFromGitLab +, meson +, python3 +, ninja +}: + +stdenv.mkDerivation rec { + pname = "bzip2-unstable"; + version = "2020-08-11"; + + src = fetchFromGitLab { + owner = "federicomenaquintero"; + repo = "bzip2"; + rev = "15255b553e7c095fb7a26d4dc5819a11352ebba1"; + sha256 = "sha256-BAyz35D62LWi47B/gNcCSKpdaECHBGSpt21vtnk3fKs="; + }; + + postPatch = '' + patchShebangs install_links.py + ''; + + nativeBuildInputs = [ + meson + python3 + ninja + ]; + + outputs = [ "bin" "dev" "out" "man" ]; + + mesonFlags = [ + "-Ddocs=disabled" + ]; + + strictDeps = true; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "High-quality data compression program"; + license = licenses.bsdOriginal; + platforms = platforms.all; + maintainers = []; + }; +} diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix index 9c9f91f9c19..8ce434741a5 100644 --- a/pkgs/tools/compression/zstd/default.nix +++ b/pkgs/tools/compression/zstd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, gnugrep +{ stdenv, fetchFromGitHub, fetchpatch, cmake, bash, gnugrep , fixDarwinDylibNames , file , legacySupport ? false @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ] ++ stdenv.lib.optional stdenv.isDarwin fixDarwinDylibNames; + buildInputs = [ bash ]; patches = [ ./playtests-darwin.patch @@ -29,11 +30,7 @@ stdenv.mkDerivation rec { # work fine, and I'm not sure how to write the condition. ++ stdenv.lib.optional stdenv.hostPlatform.isWindows ./mcfgthreads-no-pthread.patch; - postPatch = - # Patch shebangs for playTests - '' - patchShebangs programs/zstdgrep - '' + stdenv.lib.optionalString (!static) '' + postPatch = stdenv.lib.optionalString (!static) '' substituteInPlace build/cmake/CMakeLists.txt \ --replace 'message(SEND_ERROR "You need to build static library to build tests")' "" substituteInPlace build/cmake/tests/CMakeLists.txt \ @@ -60,6 +57,8 @@ stdenv.mkDerivation rec { doCheck = true; checkPhase = '' runHook preCheck + # Patch shebangs for playTests + patchShebangs ../programs/zstdgrep ctest -R playTests # The only relatively fast test. runHook postCheck ''; diff --git a/pkgs/tools/filesystems/avfs/default.nix b/pkgs/tools/filesystems/avfs/default.nix index eaf9ac634a1..edfcaa0d8f8 100644 --- a/pkgs/tools/filesystems/avfs/default.nix +++ b/pkgs/tools/filesystems/avfs/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "avfs"; - version = "1.1.2"; + version = "1.1.3"; src = fetchurl { url = "mirror://sourceforge/avf/${version}/${pname}-${version}.tar.bz2"; - sha256 = "035b6y49nzgswf5n70aph8pm48sbv9nqwlnp3wwbq892c39kk4xn"; + sha256 = "1psh8k7g7rb0gn7aygbjv86kxyi9xq07barxksa99nnmq3lc2kjg"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/filesystems/bashmount/default.nix b/pkgs/tools/filesystems/bashmount/default.nix index 206e68ce1c2..70a4c1419c8 100644 --- a/pkgs/tools/filesystems/bashmount/default.nix +++ b/pkgs/tools/filesystems/bashmount/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bashmount"; - version = "4.3.0"; + version = "4.3.1"; src = fetchFromGitHub { owner = "jamielinux"; repo = "bashmount"; rev = version; - sha256 = "1idjyl5dr8a72w3lg15qx03wgc5mj2ga2v2jkyb8v9gi5ahl03mn"; + sha256 = "0pqjaib0qiwjq0ral5yjz4iq8hpaj9mqkhlihgfz0xigcn9lxwpf"; }; installPhase = '' diff --git a/pkgs/tools/filesystems/fuse-overlayfs/default.nix b/pkgs/tools/filesystems/fuse-overlayfs/default.nix index ba5f4a3dd7e..11a3615a84c 100644 --- a/pkgs/tools/filesystems/fuse-overlayfs/default.nix +++ b/pkgs/tools/filesystems/fuse-overlayfs/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ fuse3 ]; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) podman; }; meta = with stdenv.lib; { description = "FUSE implementation for overlayfs"; diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix index b05abd72bac..6ba29cb98d4 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix @@ -30,7 +30,7 @@ buildPythonApplication rec { sed -i -e 's|"lsof"|"${lsof}/bin/lsof"|' blivet/formats/fs.py sed -i -r -e 's|"(u?mount)"|"${utillinux.bin}/bin/\1"|' blivet/util.py sed -i -e '/find_library/,/find_library/ { - c libudev = "${systemd.lib}/lib/libudev.so.1" + c libudev = "${stdenv.lib.getLib systemd}/lib/libudev.so.1" }' blivet/pyudev.py ''; diff --git a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix index ffed57e6345..36525e6fa3c 100644 --- a/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix +++ b/pkgs/tools/filesystems/nixpart/0.4/multipath-tools.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup - substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id - substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${systemd.lib}/lib/udev/scsi_id + substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id + substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${stdenv.lib.getLib systemd}/lib/udev/scsi_id sed -i -re ' s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'", diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 896d472b832..158097d3812 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, libaal}: -let version = "2.0.0"; in +let version = "2.0.1"; in stdenv.mkDerivation rec { pname = "reiser4progs"; inherit version; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; - sha256 = "00kx9prz3d5plp1hn4xdkkd99cw42sanlsjnjhj0fsrlmi9yfs8n"; + sha256 = "1r7m95mnp6xmp1j5k99jhmz6g9y2qq7cghlmdxsfbr3xviqfs45d"; }; buildInputs = [libaal]; diff --git a/pkgs/tools/graphics/swfdec/default.nix b/pkgs/tools/graphics/swfdec/default.nix deleted file mode 100644 index d721d06ad58..00000000000 --- a/pkgs/tools/graphics/swfdec/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{stdenv, fetchurl -, cairo, pango, glib, liboil, zlib, gstreamer, gst-plugins-base -, gst-plugins-good , gtk2, libsoup, alsaLib, pkgconfig -}: - -stdenv.mkDerivation rec { - pname = "swfdec"; - version = "0.8.4"; - - src = fetchurl { - url = "http://swfdec.freedesktop.org/download/swfdec/0.8/swfdec-${version}.tar.gz"; - sha256 = "00nqrd0fzf0g76rn80d7h56n6hxv7x1x6k89zj45bj564lzwc3vs"; - }; - - buildInputs = [ - cairo glib liboil pango zlib gstreamer gst-plugins-base gst-plugins-good - gtk2 libsoup alsaLib pkgconfig - ]; - - postInstall = '' - mkdir "$out/bin" - cp tools/.libs/swfdec-extract "$out/bin" - cp tools/.libs/dump "$out/bin/swfdec-dump" - cp player/.libs/swfplay "$out/bin/swfplay" - ''; - - enableParallelBuilding = true; - - meta = { - inherit version; - description = "Decoder/renderer for Macromedia Flash animations"; - license = stdenv.lib.licenses.lgpl21 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - homepage = "https://swfdec.freedesktop.org/wiki/"; - }; -} diff --git a/pkgs/tools/misc/bashcards/default.nix b/pkgs/tools/misc/bashcards/default.nix index ecaabb43c14..3e91b9741c6 100644 --- a/pkgs/tools/misc/bashcards/default.nix +++ b/pkgs/tools/misc/bashcards/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "bashcards"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "rpearce"; repo = pname; rev = "v${version}"; - sha256 = "1zbijbcm9lrqwiax37li0jjqcaxf469wh5d423frain56z1qknxl"; + sha256 = "1rpqrh0022sbrjvd55a0jvpdqhhka5msf8dsz6adbbmxy3xzgdid"; }; dontBuild = true; diff --git a/pkgs/tools/misc/broot/default.nix b/pkgs/tools/misc/broot/default.nix index ccdb8bcd708..7387270b737 100644 --- a/pkgs/tools/misc/broot/default.nix +++ b/pkgs/tools/misc/broot/default.nix @@ -1,6 +1,6 @@ { stdenv , rustPlatform -, fetchFromGitHub +, fetchCrate , installShellFiles , makeWrapper , coreutils @@ -10,16 +10,14 @@ rustPlatform.buildRustPackage rec { pname = "broot"; - version = "0.20.0"; + version = "0.20.3"; - src = fetchFromGitHub { - owner = "Canop"; - repo = pname; - rev = "v${version}"; - sha256 = "0by4cln9ljaphqk5hz56mcavz9kc5s42zlxx33nf3idqrszfcarf"; + src = fetchCrate { + inherit pname version; + sha256 = "0vw956c5xpjsbd9b0ardvgi9jjqb230m2x5n4h9ai0yiwizc8rh6"; }; - cargoSha256 = "1i5zq310k8gv9877rcrvash3aw1cyf3g0741qnky71d565s3n910"; + cargoSha256 = "1zl4p3n327iq7nm7hi79zjxv2gvw9f3lwgkg1qp52kycv1af5gqp"; nativeBuildInputs = [ makeWrapper installShellFiles ]; diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index a87aa33ab11..d7b7646afec 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "1.8.4"; + version = "1.8.5"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - sha256 = "0m8ik01y1lag3mgg3g4rxvzndh86b972hv2702dqs28l5zy5h3mv"; + sha256 = "16sv1kbd66rllnnl851y3x54wkl0p7g0qsblprvfr9715svk1835"; }; - vendorSha256 = "18s60k7y64z12lx9lgj13fl1jh0aiqinwxrsz751d2iqhgdi2jja"; + vendorSha256 = "1i9d672mzmb97s26n0v01m70g4viyl9pdk25haxr6ny4rab2wbi7"; doCheck = false; diff --git a/pkgs/tools/misc/colorpicker/default.nix b/pkgs/tools/misc/colorpicker/default.nix new file mode 100644 index 00000000000..3de5d33617c --- /dev/null +++ b/pkgs/tools/misc/colorpicker/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkg-config, gtk2 }: + +stdenv.mkDerivation rec { + pname = "colorpicker"; + version = "git-2018-01-14"; + + src = fetchFromGitHub { + owner = "Ancurio"; + repo = "colorpicker"; + rev = "287676947e6e3b5b0cee784aeb1638cf22f0ce17"; + sha256 = "1kj1dpb79llrfpszraaz6r7ci114zqi5rmqxwsvq2dnnpjxyi29r"; + }; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ gtk2 ]; + + installPhase = '' + install -Dt $out/bin colorpicker + ''; + + meta = with stdenv.lib; { + description = "Click on a pixel on your screen and print its color value in RGB"; + homepage = "https://github.com/Ancurio/colorpicker"; + maintainers = with maintainers; [ jb55 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix index 65482fabb11..dba42e4bfea 100644 --- a/pkgs/tools/misc/cpuminer-multi/default.nix +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, curl, jansson, autoconf, automake -, aesni ? true }: +, aesni ? stdenv.hostPlatform.aesSupport }: let rev = "8393e03089c0abde61bd5d72aba8f926c3d6eca4"; @@ -28,6 +28,6 @@ stdenv.mkDerivation { license = licenses.gpl2; maintainers = [ maintainers.ehmry ]; # does not build on i686 https://github.com/lucasjones/cpuminer-multi/issues/27 - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/tools/misc/debianutils/default.nix b/pkgs/tools/misc/debianutils/default.nix index 930f1f59a8a..141df333222 100644 --- a/pkgs/tools/misc/debianutils/default.nix +++ b/pkgs/tools/misc/debianutils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "debianutils"; - version = "4.11"; + version = "4.11.1"; src = fetchurl { url = "mirror://debian/pool/main/d/${pname}/${pname}_${version}.tar.xz"; - sha256 = "0lbizfnf3qwsiz2ggia6ff7sjjj8gwhys8bm6wixdc4n0qlycp5v"; + sha256 = "0g4qmzb2ff0rqszzpsal465hcslnpdl4nhghv59qvhamkkqnks4b"; }; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/eva/default.nix b/pkgs/tools/misc/eva/default.nix index 06b7b0a5200..e59c2387a3c 100644 --- a/pkgs/tools/misc/eva/default.nix +++ b/pkgs/tools/misc/eva/default.nix @@ -21,6 +21,12 @@ rustPlatform.buildRustPackage rec { url = "https://github.com/NerdyPepper/eva/commit/cacf51dbb9748b1dbe97b35f3c593a0a272bd4db.patch"; sha256 = "11q7dkz2x1888f3awnlr1nbbxzzfjrr46kd0kk6sgjdkyfh50cvv"; }) + + # to fix `cargo test -- --test-threads $NIX_BUILD_CORES` + (fetchpatch { + url = "https://github.com/NerdyPepper/eva/commit/ccfb3d327567dbaf03b2283c7e684477e2e84590.patch"; + sha256 = "003yxqlyi8jna0rf05q2a006r2pkz6pcwwfl3dv8zb6p83kk1kgj"; + }) ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/misc/fluent-bit/default.nix b/pkgs/tools/misc/fluent-bit/default.nix index 28c005b7abb..2f49d0e57eb 100644 --- a/pkgs/tools/misc/fluent-bit/default.nix +++ b/pkgs/tools/misc/fluent-bit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fluent-bit"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; rev = "v${version}"; - sha256 = "153c7hafmzwxa24h923irfhzaqqd8wbr2aaab6l3hjhgx5q8s5bf"; + sha256 = "0w96f86i2jlzjk2plf8jbdw4q748khbhhjkbzfb8dkq2lhc9i80h"; }; nativeBuildInputs = [ cmake flex bison ]; diff --git a/pkgs/tools/misc/git-town/default.nix b/pkgs/tools/misc/git-town/default.nix index 7a8b16c55e0..34548abd818 100644 --- a/pkgs/tools/misc/git-town/default.nix +++ b/pkgs/tools/misc/git-town/default.nix @@ -2,23 +2,22 @@ buildGoPackage rec { pname = "git-town"; - version = "7.3.0"; - - goPackagePath = "github.com/Originate/git-town"; + version = "7.4.0"; + goPackagePath = "github.com/git-town/git-town"; src = fetchFromGitHub { - owner = "Originate"; + owner = "git-town"; repo = "git-town"; rev = "v${version}"; - sha256 = "166g9i79hqga8k5wvs0b84q6rqniizzsd39v37s9w16axgdrm6nb"; + sha256 = "05s2hp4xn0bs3y6rgqkpgz0k8q8yfpwkw5m8vwim95hk6n41ps18"; }; - buildFlagsArray = [ "-ldflags=-X github.com/Originate/git-town/src/cmd.version=v${version} -X github.com/Originate/git-town/src/cmd.buildDate=nix" ]; + buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; meta = with stdenv.lib; { description = "Generic, high-level git support for git-flow workflows"; homepage = "http://www.git-town.com/"; - maintainers = [ maintainers.allonsy ]; + maintainers = [ maintainers.allonsy maintainers.blaggacao ]; license = licenses.mit; }; } diff --git a/pkgs/tools/misc/godu/default.nix b/pkgs/tools/misc/godu/default.nix new file mode 100644 index 00000000000..37511d2e847 --- /dev/null +++ b/pkgs/tools/misc/godu/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "godu"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "viktomas"; + repo = pname; + rev = "v${version}"; + sha256 = "1fp8iq4x0qiswksznnd6qh7c6g5pwglzz6ga11a7vgic0201wsvb"; + }; + + patches = [ ./go-mod.patch ]; + + vendorSha256 = "1zq7b0zn24cbrjssk4g03i90szp1ms7ila4khwcm7hp9n1py245s"; + + meta = with lib; { + description = "Utility helping to discover large files/folders"; + homepage = "https://github.com/viktomas/godu"; + license = licenses.mit; + maintainers = with maintainers; [ rople380 ]; + }; +} diff --git a/pkgs/tools/misc/godu/go-mod.patch b/pkgs/tools/misc/godu/go-mod.patch new file mode 100644 index 00000000000..2b3efe6be60 --- /dev/null +++ b/pkgs/tools/misc/godu/go-mod.patch @@ -0,0 +1,33 @@ +diff --git a/go.mod b/go.mod +index cf8f2fb..e405e03 100644 +--- a/go.mod ++++ b/go.mod +@@ -5,5 +5,6 @@ go 1.14 + require ( + github.com/gdamore/tcell v1.1.1 + github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd ++ github.com/mattn/go-isatty v0.0.12 // indirect + github.com/stretchr/testify v1.3.0 + ) +diff --git a/go.sum b/go.sum +index 23c1232..e25c87e 100644 +--- a/go.sum ++++ b/go.sum +@@ -8,6 +8,8 @@ github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd h1:1e+0Z+T4t1mKL5xxv + github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd/go.mod h1:qkLSc0A5EXSP6B04TrN4oQoxqFI7A8XvoXSlJi8cwk8= + github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08 h1:5MnxBC15uMxFv5FY/J/8vzyaBiArCOkMdFT9Jsw78iY= + github.com/lucasb-eyer/go-colorful v0.0.0-20181028223441-12d3b2882a08/go.mod h1:NXg0ArsFk0Y01623LgUqoqcouGDB+PwCCQlrwrG6xJ4= ++github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= ++github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= + github.com/mattn/go-runewidth v0.0.4 h1:2BvfKmzob6Bmd4YsL0zygOqfdFnK7GR4QL06Do4/p7Y= + github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= + github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +@@ -16,6 +18,8 @@ github.com/stretchr/objx v0.1.0 h1:4G4v2dO3VZwixGIRoQ5Lfboy6nUhCyYzaqnIAPPhYs4= + github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= + github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q= + github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= ++golang.org/x/sys v0.0.0-20200116001909-b77594299b42 h1:vEOn+mP2zCOVzKckCZy6YsCtDblrpj/w7B9nxGNELpg= ++golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= + golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= + golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= + gopkg.in/DATA-DOG/go-sqlmock.v1 v1.3.0 h1:FVCohIoYO7IJoDDVpV2pdq7SgrMH6wHnuTyrdrxJNoY= \ No newline at end of file diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 4e00a4ddd49..63cdb61dd33 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, flex, bison, python, autoconf, automake, gnulib, libtool +{ stdenv, fetchgit, flex, bison, python3, autoconf, automake, gnulib, libtool , gettext, ncurses, libusb-compat-0_1, freetype, qemu, lvm2, unifont, pkgconfig , fuse # only needed for grub-mount , zfs ? null @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ./fix-bash-completion.patch ]; - nativeBuildInputs = [ bison flex python pkgconfig autoconf automake ]; + nativeBuildInputs = [ bison flex python3 pkgconfig autoconf automake ]; buildInputs = [ ncurses libusb-compat-0_1 freetype gettext lvm2 fuse libtool ] ++ optional doCheck qemu ++ optional zfsSupport zfs; diff --git a/pkgs/tools/misc/hakuneko/default.nix b/pkgs/tools/misc/hakuneko/default.nix index 34405ccc7be..6389d41cdfe 100644 --- a/pkgs/tools/misc/hakuneko/default.nix +++ b/pkgs/tools/misc/hakuneko/default.nix @@ -6,6 +6,7 @@ , makeWrapper , udev , stdenv +, lib , wrapGAppsHook }: let @@ -61,7 +62,7 @@ stdenv.mkDerivation rec { ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' diff --git a/pkgs/tools/misc/kdecoration-viewer/default.nix b/pkgs/tools/misc/kdecoration-viewer/default.nix deleted file mode 100644 index 53b1763ad6a..00000000000 --- a/pkgs/tools/misc/kdecoration-viewer/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ stdenv, fetchFromGitHub, mkDerivation -, cmake, extra-cmake-modules, qtquickcontrols, kconfigwidgets, kdeclarative, kdecoration }: - -mkDerivation { - name = "kdecoration-viewer-2018-07-24"; - - src = fetchFromGitHub { - owner = "KDE"; - repo = "kdecoration-viewer"; - rev = "6e50b39c651bbf92fd7e7116d43bf57288254288"; - sha256 = "01v6i081vx0mydqvnj05xli86m52v6bxxc3z1zlyyap9cfhag7lj"; - }; - - nativeBuildInputs = [ cmake extra-cmake-modules ]; - buildInputs = [ qtquickcontrols kconfigwidgets kdeclarative kdecoration ]; - - meta = with stdenv.lib; { - description = "Allows to preview a KDecoration plugin"; - longDescription = '' - kdecoration-viewer allows to preview a KDecoration plugin. Put your plugins under - $QT_PLUGIN_PATH/org.kde.kdecoration2 to preview. - ''; - homepage = "https://blog.martin-graesslin.com/blog/2014/07/kdecoration2-the-road-ahead/"; - license = licenses.gpl2; - maintainers = [ maintainers.gnidorah ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/misc/lsd/default.nix b/pkgs/tools/misc/lsd/default.nix index 73dcbd3bc3c..415c55fb611 100644 --- a/pkgs/tools/misc/lsd/default.nix +++ b/pkgs/tools/misc/lsd/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "lsd"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "Peltoche"; repo = pname; rev = version; - sha256 = "1vyww54fl4yfvszr0dh8ym2jd9gilrccmwkvl7rbx70sfqzsgaai"; + sha256 = "006fy87jrb77cpa6bywchcvq1p74vlpy151q1j4nsj8npbr02krj"; }; - cargoSha256 = "13g0p6zh2b1z005lszll098d4lv62dzsxwhl76bianzrydif61lr"; + cargoSha256 = "0mrvcca9y0vylcrbfxxba45v05qxd8z91vb4in88px60xah0dy3q"; nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/tools/misc/mbuffer/default.nix b/pkgs/tools/misc/mbuffer/default.nix index 8b1cb938fb7..d86f824b87f 100644 --- a/pkgs/tools/misc/mbuffer/default.nix +++ b/pkgs/tools/misc/mbuffer/default.nix @@ -12,6 +12,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ openssl ]; + + # The mbuffer configure scripts fails to recognize the correct + # objdump binary during cross-building for foreign platforms. + # The correct objdump is exposed via the environment variable + # $OBJDUMP, which should be used in such cases. + preConfigure = stdenv.lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) '' + substituteInPlace configure --replace "OBJDUMP=$ac_cv_path_OBJDUMP" 'OBJDUMP=''${OBJDUMP}' + ''; doCheck = true; meta = { diff --git a/pkgs/tools/misc/mutagen/default.nix b/pkgs/tools/misc/mutagen/default.nix index c5096ea3579..ca75bf34dd1 100644 --- a/pkgs/tools/misc/mutagen/default.nix +++ b/pkgs/tools/misc/mutagen/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mutagen"; - version = "0.11.6"; + version = "0.11.7"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "0gn0ra2fbnggp82h910hz34b2l5fk7f0p9dk7zl50wxrkydfzrk3"; + sha256 = "11wp94khj9bzmadij0nq6i6q0x9z6h0zy4a6fhf322y5nxsmvcgy"; }; vendorSha256 = "0szs9yc49fyh55ra1wf8zj76kdah0x49d45cgivk3gqh2hl17j6l"; diff --git a/pkgs/tools/misc/ostree/default.nix b/pkgs/tools/misc/ostree/default.nix index 568afb50403..fd1bfc7f8c7 100644 --- a/pkgs/tools/misc/ostree/default.nix +++ b/pkgs/tools/misc/ostree/default.nix @@ -39,13 +39,13 @@ let ])); in stdenv.mkDerivation rec { pname = "ostree"; - version = "2020.4"; + version = "2020.5"; outputs = [ "out" "dev" "man" "installedTests" ]; src = fetchurl { url = "https://github.com/ostreedev/ostree/releases/download/v${version}/libostree-${version}.tar.xz"; - sha256 = "0s13cjrpx5r1dc9j9c9924zak45wl9nlbg9hiwgpsal80l92c39n"; + sha256 = "1k92177hjalbdpmg45ymwwrni68vh9rs5x9zvy5fzl9lng12fgpb"; }; patches = [ diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index d11c41195ce..e99f2aa12d5 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { - name = "parallel-20200722"; + name = "parallel-20200822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0vqd8nhf4lkvbfy7nnibxjkpzpfandpklqm0hrix5vki5x7x80a8"; + sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 5b139bf4929..8689e6467fb 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, makeWrapper, jre, graphviz }: stdenv.mkDerivation rec { - version = "1.2020.15"; + version = "1.2020.16"; pname = "plantuml"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/${version}/plantuml.${version}.jar"; - sha256 = "0dvm24ihdr71giz0mihg7wjqf2nrkk7a52vbbzimrvbilaih6s8v"; + sha256 = "0k9dligb0b2kc8rl9k5wp9sh8z1kb8g97v5pfiiwa321lp8y6wpp"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/misc/rpm-ostree/default.nix b/pkgs/tools/misc/rpm-ostree/default.nix index e04d37ba3c6..d1aaf23a6ec 100644 --- a/pkgs/tools/misc/rpm-ostree/default.nix +++ b/pkgs/tools/misc/rpm-ostree/default.nix @@ -40,13 +40,13 @@ stdenv.mkDerivation rec { pname = "rpm-ostree"; - version = "2020.2"; + version = "2020.4"; outputs = [ "out" "dev" "man" "devdoc" ]; src = fetchurl { url = "https://github.com/coreos/${pname}/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "nuEBEVFqr9J+Nf98GZkvNNYOtpMUjKzYrzCc1T2cR3A="; + sha256 = "019hjmfjhnvlrnb056fvznnsasnyw5awd594aa2126nbsi1j45dc"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/misc/sd-mux-ctrl/default.nix b/pkgs/tools/misc/sd-mux-ctrl/default.nix new file mode 100644 index 00000000000..b87a83fcdf9 --- /dev/null +++ b/pkgs/tools/misc/sd-mux-ctrl/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchgit, cmake, pkgconfig, libftdi1, popt}: + +stdenv.mkDerivation rec { + pname = "sd-mux-ctrl-unstable"; + version = "2020-02-17"; + + src = fetchgit { + url = "https://git.tizen.org/cgit/tools/testlab/sd-mux"; + rev = "9dd189d973da64e033a0c5c2adb3d94b23153d94"; + sha256 = "0fxl8m1zkkyxkc2zi8930m0njfgnd04a22acny6vljnzag2shjvg"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + + buildInputs = [ libftdi1 popt ]; + + postInstall = '' + install -D -m 644 ../doc/man/sd-mux-ctrl.1 $out/share/man/man1/sd-mux-ctrl.1 + ''; + + meta = with stdenv.lib; { + description = "Tool for controlling multiple sd-mux devices"; + homepage = "https://wiki.tizen.org/SD_MUX"; + license = licenses.asl20; + maintainers = with maintainers; [ sarcasticadmin ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/misc/somafm-cli/default.nix b/pkgs/tools/misc/somafm-cli/default.nix new file mode 100644 index 00000000000..312b402ae66 --- /dev/null +++ b/pkgs/tools/misc/somafm-cli/default.nix @@ -0,0 +1,33 @@ +{ stdenv +, fetchFromGitHub +, makeWrapper +, curl +, jq +, mpv +}: + +stdenv.mkDerivation rec { + pname = "somafm-cli"; + version = "0.3.1"; + + src = fetchFromGitHub { + owner = "rockymadden"; + repo = "somafm-cli"; + rev = "v${version}"; + sha256 = "1h5p9qsczgfr450sklh2vkllcpzb7nicbs8ciyvkavh3d7hds0yy"; + }; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -m0755 -D src/somafm $out/bin/somafm + wrapProgram $out/bin/somafm --prefix PATH ":" "${stdenv.lib.makeBinPath [ curl jq mpv ]}"; + ''; + + meta = with stdenv.lib; { + description = "Listen to SomaFM in your terminal via pure bash"; + homepage = "https://github.com/rockymadden/somafm-cli"; + license = licenses.mit; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix index a1e6f57ce3d..90c3c696526 100644 --- a/pkgs/tools/misc/staruml/default.nix +++ b/pkgs/tools/misc/staruml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ stdenv, lib, fetchurl, makeWrapper , dpkg, patchelf , gtk2, glib, gdk-pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd , libXdamage, expat }: @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ - ln -s ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 + ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 for binary in StarUML Brackets-node; do ${patchelf}/bin/patchelf \ diff --git a/pkgs/tools/misc/thin-provisioning-tools/default.nix b/pkgs/tools/misc/thin-provisioning-tools/default.nix index 0aba67647e0..8df030eafad 100644 --- a/pkgs/tools/misc/thin-provisioning-tools/default.nix +++ b/pkgs/tools/misc/thin-provisioning-tools/default.nix @@ -1,33 +1,19 @@ -{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost }: +{ stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, expat, libaio, boost, binutils }: stdenv.mkDerivation rec { pname = "thin-provisioning-tools"; - version = "0.7.6"; + version = "0.9.0"; src = fetchFromGitHub { owner = "jthornber"; repo = "thin-provisioning-tools"; rev = "v${version}"; - sha256 = "175mk3krfdmn43cjw378s32hs62gq8fmq549rjmyc651sz6jnj0g"; + sha256 = "1iwg04rhmdhijmlk5hfl8wvv83115lzb65if6cc1glkkfva8jfjp"; }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ expat libaio boost ]; - - patches = [ - (fetchpatch { - # a) Fix build if limits.h provides definition for PAGE_SIZE, as musl does w/musl per XSI[1] although it's apparently optional [2]. - # This value is only provided when it's known to be a constant, to avoid the need to discover the value dynamically. - # b) If not using system-provided (kernel headers, or libc headers, or something) use the POSIX approach of querying the value - # dynamically using sysconf(_SC_PAGE_SIZE) instead of hardcoded value that hopefully is correct. - # [1] http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/limits.h.html - # [2] http://www.openwall.com/lists/musl/2015/09/11/8 - url = "https://raw.githubusercontent.com/void-linux/void-packages/a0ece13ad7ab2aae760e09e41e0459bd999a3695/srcpkgs/thin-provisioning-tools/patches/musl.patch"; - sha256 = "1m8r3vhrnsy8drgs0svs3fgpi3mmxzdcqsv6bmvc0j52cvfqvhvy"; - extraPrefix = ""; # empty means add 'a/' and 'b/' - }) - ]; + buildInputs = [ expat libaio boost binutils ]; enableParallelBuilding = true; diff --git a/pkgs/tools/misc/topgrade/default.nix b/pkgs/tools/misc/topgrade/default.nix index 578d2ba42e5..f009de0a6fc 100644 --- a/pkgs/tools/misc/topgrade/default.nix +++ b/pkgs/tools/misc/topgrade/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "topgrade"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "r-darwish"; repo = pname; rev = "v${version}"; - sha256 = "1v57dqkrh67cmj1ish650z8yk737hm1qynqr5yv0vlna86gwhrhs"; + sha256 = "1adx029cq30g0qnrvdq2di8bpadzdxrpbsqchxfsda8zg6cprh1j"; }; - cargoSha256 = "00vxrv8lbdwwbdbaqb4rq0w3bc8n9qwk9zgb1j656lyswib7g1d3"; + cargoSha256 = "0jpjn6sb8bkwnq7np487hb8bkm6rv84mihmqwy3ymgdzlqcng6sk"; buildInputs = lib.optional stdenv.isDarwin Foundation; diff --git a/pkgs/tools/misc/yubikey-manager-qt/default.nix b/pkgs/tools/misc/yubikey-manager-qt/default.nix index 8ebbe75d686..01454b48254 100644 --- a/pkgs/tools/misc/yubikey-manager-qt/default.nix +++ b/pkgs/tools/misc/yubikey-manager-qt/default.nix @@ -20,11 +20,11 @@ let inherit (stdenv) lib; in stdenv.mkDerivation rec { pname = "yubikey-manager-qt"; - version = "1.1.4"; + version = "1.1.5"; src = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "0rbr72741q7fqkr9qmvgj2mi6192ayz7bl935q2bsnqils4wsa3f"; + sha256 = "1yimlaqvhq34gw6wkqgil0qq8x9zbfzh4psqihjr2d9jaa2wygwy"; }; nativeBuildInputs = [ wrapQtAppsHook python3.pkgs.wrapPython qmake ]; diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index b690b63ef4b..d3aa432a45e 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.8.2"; + version = "3.10.1"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - sha256 = "0hm5h8glva0d9mj870j56bc721w4br7dzwhns096rgzyv93m7rx0"; + sha256 = "1djkryx8bz2rg0iqqb30jb122ydiyli2i9xsvcdmd42c47hxg46y"; }; - vendorSha256 = "1g3jbdx7m5m56ifcc1p6hgz2wzmb287cyyaiz03ffdvwd3k73k4j"; + vendorSha256 = "0c3hyvy8s470zvrv49fx0iil59z0xq10dw4vnr55qgbm2k2pay6w"; doCheck = false; diff --git a/pkgs/tools/networking/bgpq4/default.nix b/pkgs/tools/networking/bgpq4/default.nix new file mode 100644 index 00000000000..2caeb437f7a --- /dev/null +++ b/pkgs/tools/networking/bgpq4/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchFromGitHub, autoreconfHook }: + +stdenv.mkDerivation rec { + pname = "bgpq4"; + version = "0.0.6"; + + src = fetchFromGitHub { + owner = "bgp"; + repo = pname; + rev = version; + sha256 = "1n6d6xq7vafx1la0fckqv0yjr245ka9dgbcqaz9m6dcdk0fdlkks"; + }; + + nativeBuildInputs = [ + autoreconfHook + ]; + + meta = with stdenv.lib; { + description = "BGP filtering automation tool"; + homepage = "https://github.com/bgp/bgpq4"; + license = licenses.bsd2; + maintainers = with maintainers; [ vincentbernat ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix index 0a8ae10eb13..6c8254c797b 100644 --- a/pkgs/tools/networking/chrony/default.nix +++ b/pkgs/tools/networking/chrony/default.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { pname = "chrony"; - version = "3.5"; + version = "3.5.1"; src = fetchurl { url = "https://download.tuxfamily.org/chrony/${pname}-${version}.tar.gz"; - sha256 = "1d9r2dhslll4kzdmxrj0qfgwq1b30d4l3s5cwr8yr93029dpj0jf"; + sha256 = "19ywl8a3lb2id7lcna5hp2g4pjnfwdc9ihr0fk6i9m45vdq2za0v"; }; patches = [ diff --git a/pkgs/tools/networking/circus/default.nix b/pkgs/tools/networking/circus/default.nix index 82c9db90432..ea03f8878b2 100644 --- a/pkgs/tools/networking/circus/default.nix +++ b/pkgs/tools/networking/circus/default.nix @@ -1,7 +1,14 @@ -{ stdenv, python3Packages }: +{ stdenv, python3 }: let - inherit (python3Packages) buildPythonApplication fetchPypi iowait psutil pyzmq tornado_4 mock; + python = python3.override { + self = python; + packageOverrides = self: super: { + tornado = super.tornado_4; + }; + }; + + inherit (python.pkgs) buildPythonApplication fetchPypi iowait psutil pyzmq tornado mock six; in buildPythonApplication rec { @@ -23,7 +30,7 @@ buildPythonApplication rec { doCheck = false; # weird error - propagatedBuildInputs = [ iowait psutil pyzmq tornado_4 ]; + propagatedBuildInputs = [ iowait psutil pyzmq tornado six ]; meta = with stdenv.lib; { description = "A process and socket manager"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 9a8a245a790..8e151bc2ead 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.71.1"; + version = "7.72.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "097jnkbayscifgzgl7v8kwd7m2crpvbyaazac3ab1yal0pca8llx"; + sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd"; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix index c3d07ddca95..c8119209692 100644 --- a/pkgs/tools/networking/dd-agent/datadog-agent.nix +++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix @@ -65,7 +65,7 @@ in buildGoPackage rec { wrapProgram "$out/bin/agent" \ --set PYTHONPATH "$out/${python.sitePackages}" \ - --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib + --prefix LD_LIBRARY_PATH : ${lib.getLib systemd}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index b686ea4d04f..5f9f3ceef07 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchFromGitHub , boost, zlib, openssl , upnpSupport ? true, miniupnpc ? null -, aesniSupport ? false -, avxSupport ? false +, aesniSupport ? stdenv.hostPlatform.aesSupport +, avxSupport ? stdenv.hostPlatform.avxSupport }: assert upnpSupport -> miniupnpc != null; diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix index 3bd61a0bd49..53568615a62 100644 --- a/pkgs/tools/networking/lftp/default.nix +++ b/pkgs/tools/networking/lftp/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lftp"; - version = "4.9.1"; + version = "4.9.2"; src = fetchurl { urls = [ @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { "https://ftp.st.ryukoku.ac.jp/pub/network/ftp/lftp/${pname}-${version}.tar.xz" "https://lftp.yar.ru/ftp/${pname}-${version}.tar.xz" ]; - sha256 = "0jq2g8h1bx06ya9fsja748vwb2qrca4wsfrgi3fmaa8hznpgqsar"; + sha256 = "03b7y0h3mf4jfq5y8zw6hv9v44z3n6i8hc1iswax96y3z7sc85y5"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 6f94e0c63c5..e4f2f168576 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, python2Packages, gettext }: +{ stdenv, lib, fetchFromGitHub, python3Packages, gettext }: -python2Packages.buildPythonApplication rec { +with python3Packages; + +buildPythonApplication rec { pname = "linkchecker"; - version = "9.4.0"; + version = "unstable-2020-08-15"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "1vbwl2vb8dyzki27z3sl5yf9dhdd2cpkg10vbgaz868dhpqlshgs"; + rev = "0086c28b3a419faa60562f2713346996062c03c2"; + sha256 = "0am5id8vqlqn1gb9jri0vjgiq5ffgrjq8yzdk1zc98gn2n0397wl"; }; nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = [ ConfigArgParse argcomplete + beautifulsoup4 dnspython pyxdg requests ]; - checkInputs = with python2Packages; [ + checkInputs = [ parameterized pytest ]; @@ -29,21 +32,14 @@ python2Packages.buildPythonApplication rec { postPatch = '' sed -i 's/^requests.*$/requests>=2.2/' requirements.txt sed -i "s/'request.*'/'requests >= 2.2'/" setup.py - sed -i 's~/usr/lib/python2.7/argparse.py~~g' po/Makefile ''; checkPhase = '' - runHook preCheck - - # the mime test fails for me... - rm tests/test_mimeutil.py ${lib.optionalString stdenv.isDarwin '' # network tests fails on darwin rm tests/test_network.py ''} - make test PYTESTOPTS="--tb=short" TESTS="tests/test_*.py tests/logger/test_*.py" - - runHook postCheck + pytest --ignore=tests/checker/{test_telnet,telnetserver}.py -k 'not TestLoginUrl' ''; meta = { diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 935cadbd7b8..9cf5f91cd6d 100644 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -115,6 +115,6 @@ stdenv.mkDerivation rec { homepage = "https://www.gnu.org/software/mailutils/"; # Some of the dependencies fail to build on {cyg,dar}win. - platforms = platforms.gnu ++ platforms.linux; + platforms = platforms.gnu ++ platforms.unix; }; } diff --git a/pkgs/tools/networking/oneshot/default.nix b/pkgs/tools/networking/oneshot/default.nix index e9772b193d3..f02370ab69d 100644 --- a/pkgs/tools/networking/oneshot/default.nix +++ b/pkgs/tools/networking/oneshot/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "oneshot"; - version = "1.1.3"; + version = "1.2.0"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "14s5cl1g0rgqj7fj699xgz2kmkzym1zpckhv3h33ypsn4dq7gjh2"; + sha256 = "11xmvqj7md970rjhkg1zj2w6yqpw6cj83aw37a82sfdn90kyhg9d"; }; - vendorSha256 = "0v53dsj0w959pmvk6v1i7rwlfd2y0vrghxlwkgidw0sf775qpgvy"; + vendorSha256 = "1cxr96yrrmz37r542mc5376jll9lqjqm18k8761h9jqfbzmh9rkp"; doCheck = false; diff --git a/pkgs/tools/networking/radsecproxy/default.nix b/pkgs/tools/networking/radsecproxy/default.nix index ab5ff481ec7..e2a0c900c52 100644 --- a/pkgs/tools/networking/radsecproxy/default.nix +++ b/pkgs/tools/networking/radsecproxy/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "radsecproxy"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "12pvwd7v3iswki3riycxaiiqxingg4bqnkwc5ay3j4n2kzynr1qg"; + sha256 = "1g7q128cip1dac9jad58rd96afx4xz7x7vsiv0af8iyq2ivqvs2m"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/tools/networking/siege/default.nix b/pkgs/tools/networking/siege/default.nix index 21b6bd346fd..7e85973cbdb 100644 --- a/pkgs/tools/networking/siege/default.nix +++ b/pkgs/tools/networking/siege/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, zlib }: stdenv.mkDerivation rec { - name = "siege-4.0.6"; + name = "siege-4.0.7"; src = fetchurl { url = "http://download.joedog.org/siege/${name}.tar.gz"; - sha256 = "03w0iska74nb6r8wnljn7inasbq7qflf55vjmxnb9jrc4pi7mpnw"; + sha256 = "1y3dnl1ziw0c0d4nw30aj0sdmjvarn4xfxgfkswffwnkm8z5p9xz"; }; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; diff --git a/pkgs/tools/networking/slirp4netns/default.nix b/pkgs/tools/networking/slirp4netns/default.nix index 93367ea2679..60cb3413253 100644 --- a/pkgs/tools/networking/slirp4netns/default.nix +++ b/pkgs/tools/networking/slirp4netns/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - passthru.tests.podman = nixosTests.podman; + passthru.tests = { inherit (nixosTests) podman; }; meta = with stdenv.lib; { homepage = "https://github.com/rootless-containers/slirp4netns"; diff --git a/pkgs/tools/networking/toss/default.nix b/pkgs/tools/networking/toss/default.nix new file mode 100644 index 00000000000..9752dcc4f64 --- /dev/null +++ b/pkgs/tools/networking/toss/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "toss"; + version = "1.1"; + src = fetchFromGitHub { + owner = "zerotier"; + repo = pname; + rev = version; + sha256 = "05ql0d8wbdhnmh3dw8ch5bi6clfb9h8v21lq2a74iy02slya2y0r"; + }; + preInstall = "export DESTDIR=$out/bin"; + meta = with stdenv.lib; + src.meta // { + description = "Dead simple LAN file transfers from the command line"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ ehmry ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix index 39a7b11f09f..4ee330eb918 100644 --- a/pkgs/tools/networking/unbound/default.nix +++ b/pkgs/tools/networking/unbound/default.nix @@ -30,6 +30,8 @@ stdenv.mkDerivation rec { "--with-rootkey-file=${dns-root-data}/root.key" "--enable-pie" "--enable-relro-now" + ] ++ stdenv.lib.optional stdenv.hostPlatform.isStatic [ + "--disable-flto" ]; installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ]; diff --git a/pkgs/tools/networking/vpn-slice/default.nix b/pkgs/tools/networking/vpn-slice/default.nix new file mode 100644 index 00000000000..9511c214c08 --- /dev/null +++ b/pkgs/tools/networking/vpn-slice/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonApplication, python3Packages, fetchFromGitHub }: + +buildPythonApplication rec { + pname = "vpn-slice"; + version = "0.14"; + + src = fetchFromGitHub { + owner = "dlenski"; + repo = pname; + rev = "v${version}"; + sha256 = "1z2mdl3arzl95zrj4ir57f762gcimmmq5nk91j679cshxz4snxyr"; + }; + + propagatedBuildInputs = with python3Packages; [ setproctitle dnspython ]; + + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/dlenski/vpn-slice"; + description = + "vpnc-script replacement for easy and secure split-tunnel VPN setup"; + license = licenses.gpl3; + maintainers = with maintainers; [ jdbaldry ]; + }; +} diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index c3e4c637109..a9f0d7e77d6 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -13,11 +13,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "wireguard-tools"; - version = "1.0.20200820"; + version = "1.0.20200827"; src = fetchzip { url = "https://git.zx2c4.com/wireguard-tools/snapshot/wireguard-tools-${version}.tar.xz"; - sha256 = "138pf23x39xm68pa4ks3g76axphl8pz5jw4fyi54wi7rvxclybc7"; + sha256 = "1d8rs1g6zy3kz327cc3hzkk5a44278x9p32gxasz6i94bq0b2bs3"; }; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 720c43ccc2d..945c96ae851 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, deepin }: +{ stdenv, fetchurl, readline }: let version = "1.5c"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { description = "SSH and Telnet client with ZMODEM file transfer capability"; homepage = "http://zssh.sourceforge.net/"; license = stdenv.lib.licenses.gpl2; - maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal + maintainers = [ ]; # required by deepin-terminal platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/package-management/librepo/default.nix b/pkgs/tools/package-management/librepo/default.nix index 39b34bf153d..0e2cec68520 100644 --- a/pkgs/tools/package-management/librepo/default.nix +++ b/pkgs/tools/package-management/librepo/default.nix @@ -13,7 +13,7 @@ }: stdenv.mkDerivation rec { - version = "1.12.0"; + version = "1.12.1"; pname = "librepo"; outputs = [ "out" "dev" "py" ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { owner = "rpm-software-management"; repo = "librepo"; rev = version; - sha256 = "070zgay0cbw6jrkcfp4qql9f9ydd41ilwk39xdrp939b23gp112d"; + sha256 = "0793j35fcv6bbz2pkd5rcsmx37hb1f0y48r4758cbfnl9rbp9y4z"; }; nativeBuildInputs = [ diff --git a/pkgs/tools/package-management/nfpm/default.nix b/pkgs/tools/package-management/nfpm/default.nix index 41ec0234088..18a1da8ce5f 100644 --- a/pkgs/tools/package-management/nfpm/default.nix +++ b/pkgs/tools/package-management/nfpm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "nfpm"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "1q4fzjlaiwsm028cwcw7xgcbdkccw18f2mf1vh7lz42l1bxy8bk4"; + sha256 = "0jmxafvxzqg65zg5cnjd2nsz1mmw06mc7qz3lbs5h2gkxiah8264"; }; - vendorSha256 = "1bsb05qhr9zm8yar8mdi3mw0i5ak1s5x0i8qkz5fd6wcqnsw2jjw"; + vendorSha256 = "0yvzwbm0xb1h45x96h658avbjz9w79aaa6z042xpvjqc4wsr8155"; doCheck = false; diff --git a/pkgs/tools/package-management/nix-du/default.nix b/pkgs/tools/package-management/nix-du/default.nix index 417962733af..8356e43e2e6 100644 --- a/pkgs/tools/package-management/nix-du/default.nix +++ b/pkgs/tools/package-management/nix-du/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "nix-du"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "symphorien"; repo = "nix-du"; rev = "v${version}"; - sha256 = "149d60mid29s5alv5m3d7jrhyzc6cj7b6hpiq399gsdwzgxr00wq"; + sha256 = "0h8ya0nn65hbyi3ssmrjarfxadx2sa61sspjlrln8knk7ppxk3mq"; }; - cargoSha256 = "1a6svl89dcdb5fpvs2i32i6agyhl0sx7kkkw70rqr17fyzl5psai"; + cargoSha256 = "0d86bn6myr29bwrzw3ihnzg1yij673s80bm1l8srk2k2szyfwwh5"; doCheck = true; checkInputs = [ nix graphviz ]; diff --git a/pkgs/tools/package-management/nix-template/default.nix b/pkgs/tools/package-management/nix-template/default.nix new file mode 100644 index 00000000000..0ef3602c597 --- /dev/null +++ b/pkgs/tools/package-management/nix-template/default.nix @@ -0,0 +1,23 @@ +{ lib, rustPlatform, fetchFromGitHub }: + +rustPlatform.buildRustPackage rec { + pname = "nix-template"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "jonringer"; + repo = pname; + rev = "v${version}"; + sha256 = "1h6xdvhzg7nb0s82b3r5bsh8bfdb1l5sm7fa24lfwd396xp9yyig"; + }; + + cargoSha256 = "13y3b60xnry71999kygvkr29gkyjss3ga3rzb43ajah4qp90rsqs"; + + meta = with lib; { + description = "Make creating nix expressions easy"; + homepage = "https://github.com/jonringer/nix-template/"; + changelog = "https://github.com/jonringer/nix-template/releases/tag/v${version}"; + license = licenses.cc0; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 05036770316..2acf5d194e0 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -195,14 +195,14 @@ in rec { }); nixUnstable = lib.lowPrio (callPackage common rec { - name = "nix-2.4${suffix}"; - suffix = "pre20200721_ff314f1"; + name = "nix-3.0${suffix}"; + suffix = "pre20200829_f156513"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "ff314f186e3f91d87af6ad96c0ae3b472494b940"; - hash = "sha256-QibpLo4/gf2xYGoeQcgjZzH/qy5TBRVH+QCHgqOwur0="; + rev = "f15651303f8596bf34c67fc8d536b1e9e7843a87"; + hash = "sha256-HqM3Z4DLdMrf+0PPZL9ysctGg+K+i3S/IHA1GsJj0Ro="; }; inherit storeDir stateDir confDir boehmgc; diff --git a/pkgs/tools/package-management/nixpkgs-review/default.nix b/pkgs/tools/package-management/nixpkgs-review/default.nix index 922546009fc..935f6553f9c 100644 --- a/pkgs/tools/package-management/nixpkgs-review/default.nix +++ b/pkgs/tools/package-management/nixpkgs-review/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "nixpkgs-review"; - version = "2.3.1"; + version = "2.4.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "nixpkgs-review"; rev = version; - sha256 = "1v988jsxx2r82q6mf3503130cny088hin2as00yi26jzxjkrjcli"; + sha256 = "0kca4442mla8j9980gi8kgp0vgm0f15hcjd0w0wdj8rlmkx9yf2l"; }; makeWrapperArgs = [ diff --git a/pkgs/tools/security/1password-gui/default.nix b/pkgs/tools/security/1password-gui/default.nix index 3fc19c12e8e..91052f945ed 100644 --- a/pkgs/tools/security/1password-gui/default.nix +++ b/pkgs/tools/security/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.8.0"; + version = "0.8.4"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "1r26vyx724h3k6p340bg3lmcxwyvgxj2kqvwczq784583hpq3lq9"; + sha256 = "04rjlyi465pkg75pql3rfzmfj9zf8pfnxynz110x1wkqnvqmsxgw"; }; nativeBuildInputs = [ makeWrapper ]; @@ -51,6 +51,8 @@ stdenv.mkDerivation rec { --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath runtimeLibs}" ''; + passthru.updateScript = ./update.sh; + meta = with stdenv.lib; { description = "Multi-platform password manager"; longDescription = '' diff --git a/pkgs/tools/security/1password-gui/update.sh b/pkgs/tools/security/1password-gui/update.sh new file mode 100755 index 00000000000..7703aba9984 --- /dev/null +++ b/pkgs/tools/security/1password-gui/update.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused common-updater-scripts + +version="$(curl -sL https://onepassword.s3.amazonaws.com/linux/debian/dists/edge/main/binary-amd64/Packages | sed -r -n 's/^Version: (.*)-[0-9]+/\1/p' | head -n1)" +update-source-version _1password-gui "$version" diff --git a/pkgs/tools/security/bitwarden/default.nix b/pkgs/tools/security/bitwarden/default.nix index 4e087ee631e..d383a00a7f2 100644 --- a/pkgs/tools/security/bitwarden/default.nix +++ b/pkgs/tools/security/bitwarden/default.nix @@ -6,6 +6,7 @@ , makeDesktopItem , makeWrapper , stdenv +, lib , udev , wrapGAppsHook }: @@ -72,7 +73,7 @@ let ''; runtimeDependencies = [ - udev.lib + (lib.getLib udev) ]; postFixup = '' diff --git a/pkgs/tools/security/creddump/default.nix b/pkgs/tools/security/creddump/default.nix new file mode 100644 index 00000000000..d37c58a5159 --- /dev/null +++ b/pkgs/tools/security/creddump/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitLab, python2, python2Packages }: + +python2Packages.buildPythonApplication rec { + pname = "creddump"; + version = "0.3"; + + src = fetchFromGitLab { + owner = "kalilinux"; + repo = "packages/creddump"; + # url-encoding workaround: https://github.com/NixOS/nixpkgs/issues/65796#issuecomment-517829019 + rev = "debian%2F${version}-1kali2"; # %2F = urlquote("/") + sha256 = "0r3rs2hggsvv619l3fh3c0jli6d3ryyj30ni3hz0nz670z5smzcf"; + }; + + # No setup.py is available + dontBuild = true; + doCheck = false; + propagatedBuildInputs = [ python2Packages.pycrypto ]; + + installPhase = '' + mkdir -p ${placeholder "out"}/bin + cp -r framework ${placeholder "out"}/bin/framework + cp pwdump.py ${placeholder "out"}/bin/pwdump + cp cachedump.py ${placeholder "out"}/bin/cachedump + cp lsadump.py ${placeholder "out"}/bin/lsadump + ''; + + meta = with stdenv.lib; { + description = "Python tool to extract various credentials and secrets from Windows registry hives"; + homepage = "https://gitlab.com/kalilinux/packages/creddump"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = [ maintainers.fishi0x01 ]; + }; +} + diff --git a/pkgs/tools/security/doppler/default.nix b/pkgs/tools/security/doppler/default.nix index b637eacd3da..847d5d0cafb 100644 --- a/pkgs/tools/security/doppler/default.nix +++ b/pkgs/tools/security/doppler/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "doppler"; - version = "3.10.1"; + version = "3.10.3"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = version; - sha256 = "0wzs480dg6q6j8jzhk5lkf5hs53jf7ljmnyw3i9xwqm9sxq7dsfx"; + sha256 = "15wmg67wwwgrs8q45r1z98k9v7mf2bfgsa40gcf8dr18ilnfpbn4"; }; vendorSha256 = "0wqbwk72k4r30a3vnf0gnx3k97y8xgnr2iavk5bc8f8vkjv0bsv6"; diff --git a/pkgs/tools/security/encryptr/default.nix b/pkgs/tools/security/encryptr/default.nix index b4c2bef2cf4..62311a41da3 100644 --- a/pkgs/tools/security/encryptr/default.nix +++ b/pkgs/tools/security/encryptr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype +{ stdenv, lib, fetchurl, glib, nss, nspr, gconf, fontconfig, freetype , pango , cairo, libX11 , libXi, libXcursor, libXext, libXfixes , libXrender, libXcomposite , alsaLib, libXdamage, libXtst, libXrandr , expat, libcap, systemd , dbus, gtk2 , gdk-pixbuf, libnotify @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { cp -v {encryptr-bin,icudtl.dat,nw.pak} $out/bin mv -v $out/bin/encryptr{-bin,} cp -v lib* $out/lib - ln -sv ${systemd.lib}/lib/libudev.so.1 $out/lib/libudev.so.0 + ln -sv ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ --set-rpath $out/lib:${rpath} \ diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix index 6377e829aa6..c27f82d7053 100644 --- a/pkgs/tools/security/fail2ban/default.nix +++ b/pkgs/tools/security/fail2ban/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, python3, gamin }: +{ stdenv, fetchFromGitHub, python3 }: let version = "0.11.1"; in diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 7c095cffa31..3a99c8eb3f2 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -16,11 +16,11 @@ assert guiSupport -> pinentry != null && enableMinimal == false; stdenv.mkDerivation rec { pname = "gnupg"; - version = "2.2.20"; + version = "2.2.21"; src = fetchurl { url = "mirror://gnupg/gnupg/${pname}-${version}.tar.bz2"; - sha256 = "0c6a4v9p6qzhsw1pfcwc459bxpc8hma0w9z8iqb9khvligack9q4"; + sha256 = "1v3nirp9m7yxjkkcdixibckl379pdyr3mdx8b1k379szzdw35s31"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; @@ -38,8 +38,10 @@ stdenv.mkDerivation rec { ./accept-subkeys-with-a-good-revocation-but-no-self-sig.patch ]; postPatch = '' - sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' \ - configure doc/dirmngr.texi doc/gnupg.info-1 + sed -i 's,hkps://hkps.pool.sks-keyservers.net,hkps://keys.openpgp.org,g' configure doc/dirmngr.texi doc/gnupg.info-1 + # Fix broken SOURCE_DATE_EPOCH usage - remove on the next upstream update + sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.am + sed -i 's/$SOURCE_DATE_EPOCH/''${SOURCE_DATE_EPOCH}/' doc/Makefile.in '' + stdenv.lib.optionalString ( stdenv.isLinux && pcsclite != null) '' sed -i 's,"libpcsclite\.so[^"]*","${stdenv.lib.getLib pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c ''; #" fix Emacs syntax highlighting :-( diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 4f90bace895..15ad1c70a8d 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -1,5 +1,8 @@ -{ stdenv, makeWrapper -, buildGoModule, fetchFromGitHub, installShellFiles +{ stdenv +, makeWrapper +, buildGoModule +, fetchFromGitHub +, installShellFiles , git , gnupg , xclip @@ -9,7 +12,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.9.2"; + version = "1.10.1"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -17,20 +20,22 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "066dphw8xq0g72kj64sdai2yyllnr6ca27bfy5sxhk8x69j97rvz"; + sha256 = "0dhh64mxfhk610wr7bpakzgmc4a4iyhfkkl3qhjp6a46g9iygana"; }; - vendorSha256 = "1wn20bh7ma4pblsf6qnlbz5bx4p9apig3d1yz7cpsqv4z3w07baw"; + vendorSha256 = "07wv6yahx4yzr3h1x93x4r5rvw8wbfk836f04b4r9xjbnpq7lb2a"; doCheck = false; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; - wrapperPath = stdenv.lib.makeBinPath ([ - git - gnupg - xclip - ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard); + wrapperPath = stdenv.lib.makeBinPath ( + [ + git + gnupg + xclip + ] ++ stdenv.lib.optional stdenv.isLinux wl-clipboard + ); postInstall = '' for shell in bash fish zsh; do @@ -42,16 +47,18 @@ buildGoModule rec { ''; postFixup = '' - wrapProgram $out/bin/gopass \ - --prefix PATH : "${wrapperPath}" + for bin in $out/bin/*; do + wrapProgram $bin \ + --prefix PATH : "${wrapperPath}" + done ''; meta = with stdenv.lib; { - description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; - homepage = "https://www.gopass.pw/"; - license = licenses.mit; - maintainers = with maintainers; [ andir rvolosatovs ]; - platforms = platforms.unix; + description = "The slightly more awesome Standard Unix Password Manager for Teams. Written in Go."; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ andir rvolosatovs ]; + platforms = platforms.unix; longDescription = '' gopass is a rewrite of the pass password manager in Go with the aim of diff --git a/pkgs/tools/security/ibm-sw-tpm2/default.nix b/pkgs/tools/security/ibm-sw-tpm2/default.nix index d6e8a521a2f..c177726bbb1 100644 --- a/pkgs/tools/security/ibm-sw-tpm2/default.nix +++ b/pkgs/tools/security/ibm-sw-tpm2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ibm-sw-tpm2"; - version = "1628"; + version = "1637"; src = fetchurl { url = "mirror://sourceforge/ibmswtpm2/ibmtpm${version}.tar.gz"; - sha256 = "18wywbsdp5sjrapznk2ydbmx0whz513dhybn1lls24xfl7kp9s58"; + sha256 = "09z3wbv38dc8wnw1q961s6bcd0kvz2xkjp6dxg4kn914fwzlqfnx"; }; buildInputs = [ openssl ]; diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index 14f2059cf5c..191b4f35150 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.1.3"; + version = "0.1.4"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "1zp4gpbqhivmp7lpm10xb6ahx1z7nsijz7pi5i0bndv0y9mr609p"; + sha256 = "1hjcx651nqj1plxw4i2nv72zc0igd8pl31dy2zwm5yyky6dl7qla"; }; - cargoSha256 = "1inqz4whqw9mb3m22kv44f255m3cjr66pc5ncdw2rgpy3zjh4p3z"; + cargoSha256 = "11fw097r4mim3rgb0db7naqlf3ws0bavqdd4z84mpdg6714dga0n"; nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ python3 ]; @@ -27,6 +27,8 @@ rustPlatform.buildRustPackage rec { checkFlagsArray = [ "--skip=kbs2::config::tests::test_find_config_dir" ]; postInstall = '' + mkdir -p $out/share/kbs2 + cp -r contrib/ $out/share/kbs2 for shell in bash fish zsh; do $out/bin/kbs2 --completions $shell > kbs2.$shell installShellCompletion kbs2.$shell diff --git a/pkgs/tools/security/keybase/gui.nix b/pkgs/tools/security/keybase/gui.nix index aabe1fcebbd..20c1bb8f7f1 100644 --- a/pkgs/tools/security/keybase/gui.nix +++ b/pkgs/tools/security/keybase/gui.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, atk, cairo, cups, udev +{ stdenv, lib, fetchurl, alsaLib, atk, cairo, cups, udev , dbus, expat, fontconfig, freetype, gdk-pixbuf, glib, gtk3, libappindicator-gtk3 , libnotify, nspr, nss, pango, systemd, xorg, autoPatchelfHook, wrapGAppsHook , runtimeShell, gsettings-desktop-schemas }: @@ -56,7 +56,7 @@ stdenv.mkDerivation rec { ]; runtimeDependencies = [ - udev.lib + (lib.getLib udev) libappindicator-gtk3 ]; diff --git a/pkgs/tools/security/rhash/default.nix b/pkgs/tools/security/rhash/default.nix index 863b03a117c..394dd89484f 100644 --- a/pkgs/tools/security/rhash/default.nix +++ b/pkgs/tools/security/rhash/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, which }: stdenv.mkDerivation rec { - version = "1.3.9"; + version = "1.4.0"; pname = "rhash"; src = fetchFromGitHub { owner = "rhash"; repo = "RHash"; rev = "v${version}"; - sha256 = "06i49x1l21h2q7pfnf4crbmjyg8b9ad0qs10ywyyn5sjpi0c21wq"; + sha256 = "18zgr1bjzz8v6rckz2q2hx9f2ssbv8qfwclzpbyjaz0c1c9lqqar"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix new file mode 100644 index 00000000000..2a2e8c7ec6c --- /dev/null +++ b/pkgs/tools/security/rustscan/default.nix @@ -0,0 +1,37 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, nmap +}: + +rustPlatform.buildRustPackage rec { + pname = "rustscan"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "RustScan"; + repo = pname; + rev = "${version}"; + sha256 = "0rkqsh4i58cf18ad97yr4f68s5jg6z0ybz4bw8607lz7cjkfvjay"; + }; + + cargoSha256 = "0mj214f2md7kjknmcayc5dcfmlk2b8mqkn7kxzdis8qv9a5xcbk8"; + + postPatch = '' + substituteInPlace src/main.rs \ + --replace 'Command::new("nmap")' 'Command::new("${nmap}/bin/nmap")' + ''; + + checkFlags = [ + "--skip=infer_ulimit_lowering_no_panic" + "--skip=google_dns_runs" + "--skip=parse_correct_ips_or_hosts" + ]; + + meta = with lib; { + description = "Faster Nmap Scanning with Rust"; + homepage = "https://github.com/RustScan/RustScan"; + license = licenses.gpl3Only; + maintainers = [ maintainers.SuperSandro2000 ]; + }; +} diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 940e67013ee..fc52662e536 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.26.2"; + version = "2.27.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "0y5gvdrdr6i9spdwsxvzs1bxs32icxpkqxnglp1bf4gglc580d87"; + sha256 = "15ddzab93iqwbvxnaw5wp4dzwlxjqxvyy1c4w37jm69zkczylrmc"; }; runVend = true; - vendorSha256 = "1kzihyx44sx6php4z58fzy6c3g0y713939yzxpgk3n03snn2x8sf"; + vendorSha256 = "1w7vnpv36lhxpaljdhslbckkr7p81nzc91a0503wk8nrrc4ljsyy"; doCheck = false; diff --git a/pkgs/tools/security/sshguard/default.nix b/pkgs/tools/security/sshguard/default.nix index bad1c9fd16d..6c2298f6729 100644 --- a/pkgs/tools/security/sshguard/default.nix +++ b/pkgs/tools/security/sshguard/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, autoreconfHook, yacc, flex}: stdenv.mkDerivation rec { - version = "2.4.0"; + version = "2.4.1"; pname = "sshguard"; src = fetchurl { url = "mirror://sourceforge/sshguard/${pname}-${version}.tar.gz"; - sha256 = "1h6n2xyh58bshplbdqlr9rbnf3lz7nydnq5m2hkq15is3c4s8p06"; + sha256 = "0rrwmx91ifvc61wkld8gjkmfsq0ixxmf7m8fg4addkkxwvk04pc7"; }; doCheck = true; diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index 50a7844356f..eb999b5cedc 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "vault"; - version = "1.5.0"; + version = "1.5.3"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - sha256 = "1bdhcsx7hwz4kb68jrrrzlbr7k744g0pym996dq1p5rvz05j3pqc"; + sha256 = "149if5s4rdpxgzakh8s79j1fcfcqk1w7gvgchc044xlicl1r49ic"; }; goPackagePath = "github.com/hashicorp/vault"; diff --git a/pkgs/tools/security/vault/vault-bin.nix b/pkgs/tools/security/vault/vault-bin.nix index 6b14a834330..b8a70eb82f9 100644 --- a/pkgs/tools/security/vault/vault-bin.nix +++ b/pkgs/tools/security/vault/vault-bin.nix @@ -1,30 +1,30 @@ { stdenv, fetchurl, unzip }: let - version = "1.3.0"; + version = "1.5.3"; sources = let base = "https://releases.hashicorp.com/vault/${version}"; in { x86_64-linux = fetchurl { url = "${base}/vault_${version}_linux_amd64.zip"; - sha256 = "1crfj4gd1qwwa2xidd0pjffv0n6hf5hbhv6568m6zc1ig0qqm6yq"; + sha256 = "1chhi7piq04j8rgk15rcszqqp37xd9cjj67plr5pgvdps3s1zihy"; }; i686-linux = fetchurl { url = "${base}/vault_${version}_linux_386.zip"; - sha256 = "0pyf0kyvxpmx3fwfvin1r0x30r9byx9lyi81894q06xrhiwbqc0l"; + sha256 = "0jbnvypapang025wfyj6i70jdz3g29ggg7rzmg8xh6gfyhwk3vmb"; }; x86_64-darwin = fetchurl { url = "${base}/vault_${version}_darwin_amd64.zip"; - sha256 = "113vnpz9n6y7z2k9jqpfpxqxqbrmd9bhny79yaxqzkfdqw8vyv3g"; + sha256 = "1m54258lfdr79p2j8janbkhp0a8bs8xbrcr51lqx2s620n7sfbya"; }; i686-darwin = fetchurl { url = "${base}/vault_${version}_darwin_386.zip"; - sha256 = "0d191qai0bpl7cyivca26wqgycsj2dz08809z147d1vnrz321v6w"; + sha256 = "038qkkhlwj86fz9vpcycvv5nb41y8mqypqvhfp0ia11birp8xlsr"; }; aarch64-linux = fetchurl { url = "${base}/vault_${version}_linux_arm64.zip"; - sha256 = "1bk5y3knc42mh07gnnn6p109qz908014620h1s0348wp4qfdy49w"; + sha256 = "1vivkwcy9j9zs7w65k7y8chix8jnii5pz8zck6rlpwgz5vs0h04k"; }; }; diff --git a/pkgs/tools/system/bpytop/default.nix b/pkgs/tools/system/bpytop/default.nix index 2751689209b..a408f44ec10 100644 --- a/pkgs/tools/system/bpytop/default.nix +++ b/pkgs/tools/system/bpytop/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bpytop"; - version = "1.0.13"; + version = "1.0.21"; src = fetchFromGitHub { owner = "aristocratos"; repo = pname; rev = "v${version}"; - sha256 = "1mrzl5ry5janifykp58gf5g7xw7522wvpp8hgq2hpfx52z6my1bj"; + sha256 = "10cygn4srmzk1b279hrlp4rjbldkzq7354fhm0jbmd3rp15b454p"; }; buildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/system/fio/default.nix b/pkgs/tools/system/fio/default.nix index 80789681fc4..77a85e01473 100644 --- a/pkgs/tools/system/fio/default.nix +++ b/pkgs/tools/system/fio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "fio"; - version = "3.21"; + version = "3.22"; src = fetchFromGitHub { owner = "axboe"; repo = "fio"; rev = "fio-${version}"; - sha256 = "0v8bq79n2nfnrs8pw2f3a93f8k691dnfzd5qxb5srwak4y2za7hn"; + sha256 = "16p17l1xbqqkgppvwmfaywknhk4ybafnx8hm56ffd8bls9vaqw5m"; }; buildInputs = [ python zlib ] diff --git a/pkgs/tools/system/htop/default.nix b/pkgs/tools/system/htop/default.nix index c9adf5377e2..2d86894808c 100644 --- a/pkgs/tools/system/htop/default.nix +++ b/pkgs/tools/system/htop/default.nix @@ -1,23 +1,32 @@ -{ lib, fetchurl, stdenv, ncurses, -IOKit, python3 }: +{ lib, fetchFromGitHub, stdenv, autoreconfHook +, ncurses, IOKit, python3 +, fetchpatch +}: stdenv.mkDerivation rec { pname = "htop"; - version = "2.2.0"; + version = "3.0.0"; - src = fetchurl { - url = "https://hisham.hm/htop/releases/${version}/${pname}-${version}.tar.gz"; - sha256 = "0mrwpb3cpn3ai7ar33m31yklj64c3pp576vh1naqff6f21pq5mnr"; + src = fetchFromGitHub { + owner = "htop-dev"; + repo = pname; + rev = version; + sha256 = "096gdnpaszs5rfp7qj8npi2jkvdqpp8mznn89f97ykrg6pgagwq4"; }; - nativeBuildInputs = [ python3 ]; - buildInputs = - [ ncurses ] ++ - lib.optionals stdenv.isDarwin [ IOKit ]; + patches = [ + # Never use glyphs for checkmarks. Issue - https://github.com/htop-dev/htop/issues/29 + # Remove with the next release. + (fetchpatch { + url = "https://github.com/htop-dev/htop/commit/96074058278829facb86f6f4de099d56a00a0c0e.patch"; + sha256 = "1rnfvjfsvfgr1s7kzr1hk6nwik6shcq4mg6dlbgdq0f2fz0cnazk"; + }) + ]; - prePatch = '' - patchShebangs scripts/MakeHeader.py - ''; + nativeBuildInputs = [ autoreconfHook python3 ]; + + buildInputs = [ ncurses + ] ++ lib.optionals stdenv.isDarwin [ IOKit ]; meta = with stdenv.lib; { description = "An interactive process viewer for Linux"; diff --git a/pkgs/tools/system/pciutils/default.nix b/pkgs/tools/system/pciutils/default.nix index 4bbe2bdcee0..1814d4b9765 100644 --- a/pkgs/tools/system/pciutils/default.nix +++ b/pkgs/tools/system/pciutils/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, pkgconfig, zlib, kmod, which }: +{ stdenv, fetchurl, pkgconfig, zlib, kmod, which +, static ? stdenv.targetPlatform.isStatic +}: stdenv.mkDerivation rec { name = "pciutils-3.7.0"; # with release-date database @@ -12,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib kmod which ]; makeFlags = [ - "SHARED=yes" + "SHARED=${if static then "no" else "yes"}" "PREFIX=\${out}" "STRIP=" "HOST=${stdenv.hostPlatform.system}" diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index d9953b7cdb5..9939f9ea154 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.14"; + version = "0.11.19"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0sqka2ns9xqma9wa67in4vrd15q0rz62gblmzniq5i4xppykc55j"; + sha256 = "0s08qahjc68h5qhnahmb9z19l51p5sw2pmzrlknq1j5900zpa2x5"; }; postPatch = '' diff --git a/pkgs/tools/text/miller/default.nix b/pkgs/tools/text/miller/default.nix index ead501763e7..4137fd4d278 100644 --- a/pkgs/tools/text/miller/default.nix +++ b/pkgs/tools/text/miller/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "miller"; - version = "5.8.0"; + version = "5.9.0"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${version}"; - sha256 = "06y1l730xps196jbnxahmd5alc9ba5m8hakm9sc8hx1q5b9ylfih"; + sha256 = "14fi6jlqb980qjcpb90fk85cglskq9b9i2k0216bhpvjmagywgp7"; }; nativeBuildInputs = [ autoreconfHook flex libtool ]; diff --git a/pkgs/tools/text/ocrmypdf/default.nix b/pkgs/tools/text/ocrmypdf/default.nix index b7864b05b6e..bfa22a4fd18 100644 --- a/pkgs/tools/text/ocrmypdf/default.nix +++ b/pkgs/tools/text/ocrmypdf/default.nix @@ -29,14 +29,14 @@ let in buildPythonApplication rec { pname = "ocrmypdf"; - version = "10.3.0"; + version = "11.0.1"; disabled = ! python3Packages.isPy3k; src = fetchFromGitHub { owner = "jbarlow83"; repo = "OCRmyPDF"; rev = "v${version}"; - sha256 = "0c6v7846lmkmbyfla07s35mpba4h09h0fx6pxqf0yvdjxmj46q8c"; + sha256 = "194ds9i1zd80ynzwgv7kprax0crh7bbchayawdcvg2lyr64a82xn"; }; nativeBuildInputs = with python3Packages; [ @@ -76,8 +76,6 @@ buildPythonApplication rec { src = ./liblept.patch; liblept = "${stdenv.lib.getLib leptonica}/lib/liblept${stdenv.hostPlatform.extensions.sharedLibrary}"; }) - # https://github.com/jbarlow83/OCRmyPDF/pull/596 - ./0001-Make-compatible-with-pdfminer.six-version-20200720.patch ]; makeWrapperArgs = [ "--prefix PATH : ${stdenv.lib.makeBinPath [ ghostscript jbig2enc pngquant qpdf tesseract4 unpaper ]}" ]; diff --git a/pkgs/tools/text/podiff/default.nix b/pkgs/tools/text/podiff/default.nix index bee2c7a1a8f..b76dfd2256a 100644 --- a/pkgs/tools/text/podiff/default.nix +++ b/pkgs/tools/text/podiff/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation { pname = "podiff"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.1.tar.gz"; - sha256 = "1zz6bcmka5zvk2rq775qv122lqh54aijkxlghvx7z0r6kh880x59"; + url = "ftp://download.gnu.org.ua/pub/release/podiff/podiff-1.2.tar.gz"; + sha256 = "1l2b4hh53xlx28riigwarzkhxpv1pcz059xj1ka33ccvxc6c20k9"; }; patchPhase = '' diff --git a/pkgs/tools/text/poedit/default.nix b/pkgs/tools/text/poedit/default.nix index ccd99a272b5..05241033c6a 100644 --- a/pkgs/tools/text/poedit/default.nix +++ b/pkgs/tools/text/poedit/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "poedit"; - version = "2.3.1"; + version = "2.4.1"; src = fetchurl { url = "https://github.com/vslavik/poedit/archive/v${version}-oss.tar.gz"; - sha256 = "04f9za35rwyr7mabk8f8izc0fgvc3sfx45v8dml1xmi634n174ds"; + sha256 = "0pvd903j2x3h9wh38fhlcn23d0jkjlqnfbdpbvnbhy6al1ngx72w"; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 3f3cbd8efcd..3e225ec3567 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "2.5.1"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "0z62rqcvcz8iy6ig7y05gn90m0pn99jc0ll9b82kdbr257kz91r1"; + sha256 = "16ly1dz8wxnjk6kc88dl2x0ijmzw5v87fhai9fnardwfmycn7ivc"; }; buildInputs = [ boost bzip2 lz4 pcre2 xz zlib ]; diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 65b2678dfc0..69390b4d3d3 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.3.2"; + version = "2.3.3"; subPackages = [ "." ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0accs8ygg2h5hk8n4d5hs1fpxp9mlbzic6f4dwrygi463z7c3icc"; + sha256 = "13b565l87nm3gpxxhw1bpjx7yqcgf5124k3wh7r149z38xyqc3wk"; }; vendorSha256 = null; diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 9180573541d..852175c4f21 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, wget, bash }: stdenv.mkDerivation rec { - version = "2.29"; + version = "2.30"; pname = "wgetpaste"; src = fetchurl { url = "http://wgetpaste.zlin.dk/${pname}-${version}.tar.bz2"; - sha256 = "1rp0wxr3zy7y2xp3azaadfghrx7g0m138f9qg6icjxkkz4vj9r22"; + sha256 = "14k5i6j6f34hcf9gdb9cnvfwscn0ys2dgd73ci421wj9zzqkbv73"; }; # currently zsh-autocompletion support is not installed diff --git a/pkgs/tools/typesetting/lowdown/default.nix b/pkgs/tools/typesetting/lowdown/default.nix index aa7a8598d66..017066a2c22 100644 --- a/pkgs/tools/typesetting/lowdown/default.nix +++ b/pkgs/tools/typesetting/lowdown/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lowdown"; - version = "0.7.3"; + version = "0.7.4"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://kristaps.bsd.lv/lowdown/snapshots/lowdown-${version}.tar.gz"; - sha512 = "14mx22aqr9cmin4cyhrclhm0hly1i21j2dmsikfp1c87wl2kpn9xgxnix5r0iqh5dwjxdh591rfh21xjp0l11m0nl5wkpnn7wmq7g6b"; + sha512 = "2iw5x3lf5knnscp0ifgk50yj48p54cbd34h94qrxa9vdybg2nnipklrqmmqblf6l7qph98h7jvlyr99m5qlrki9lvjr1jcgbgp31pn0"; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/tools/typesetting/satysfi/default.nix b/pkgs/tools/typesetting/satysfi/default.nix index 7a4b8010f04..b97652bb4a6 100644 --- a/pkgs/tools/typesetting/satysfi/default.nix +++ b/pkgs/tools/typesetting/satysfi/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, fetchFromGitHub, ruby, dune, ocamlPackages +{ stdenv, fetchzip, fetchFromGitHub, ruby, dune_2, ocamlPackages , ipaexfont, junicode, lmodern, lmmath }: let @@ -6,8 +6,8 @@ let src = fetchFromGitHub { owner = "gfngfn"; repo = "camlpdf"; - rev = "v2.2.2+satysfi"; - sha256 = "1dkyibjd8qb9fzljlzdsfdhb798vc9m8xqkd7295fm6bcfpr5r5k"; + rev = "v2.3.1+satysfi"; + sha256 = "1s8wcqdkl1alvfcj67lhn3qdz8ikvd1v64f4q6bi4c0qj9lmp30k"; }; }); otfm = ocamlPackages.otfm.overrideAttrs (o: { @@ -18,23 +18,29 @@ let sha256 = "0y8s0ij1vp1s4h5y1hn3ns76fzki2ba5ysqdib33akdav9krbj8p"; }; }); - yojson = ocamlPackages.yojson.overrideAttrs (o: { + yojson-with-position = ocamlPackages.buildDunePackage { + pname = "yojson-with-position"; + version = "1.4.2"; src = fetchFromGitHub { owner = "gfngfn"; - repo = "yojson"; - rev = "v1.4.1+satysfi"; - sha256 = "06lajzycwmvc6s26cf40s9xn001cjxrpxijgfha3s4f4rpybb1mp"; + repo = "yojson-with-position"; + rev = "v1.4.2+satysfi"; + sha256 = "17s5xrnpim54d1apy972b5l08bph4c0m5kzbndk600fl0vnlirnl"; }; - }); + useDune2 = true; + nativeBuildInputs = [ ocamlPackages.cppo ]; + propagatedBuildInputs = [ ocamlPackages.biniou ]; + inherit (ocamlPackages.yojson) meta; + }; in stdenv.mkDerivation rec { pname = "satysfi"; - version = "0.0.4"; + version = "0.0.5"; src = fetchFromGitHub { owner = "gfngfn"; repo = "SATySFi"; rev = "v${version}"; - sha256 = "0ilvgixglklqwavf8p9mcbrjq6cjfm9pk4kqx163c0irh0lh0adv"; + sha256 = "1y72by6d15bc6qb1lv1ch6cm1i74gyr0w127nnvs2s657snm0y1n"; fetchSubmodules = true; }; @@ -44,11 +50,11 @@ in $out/share/satysfi ''; - nativeBuildInputs = [ ruby dune ]; + nativeBuildInputs = [ ruby dune_2 ]; - buildInputs = [ camlpdf otfm ] ++ (with ocamlPackages; [ + buildInputs = [ camlpdf otfm yojson-with-position ] ++ (with ocamlPackages; [ ocaml findlib menhir - batteries camlimages core_kernel ppx_deriving uutf yojson omd cppo re + batteries camlimages core_kernel ppx_deriving uutf omd cppo re ]); installPhase = '' diff --git a/pkgs/tools/typesetting/tikzit/default.nix b/pkgs/tools/typesetting/tikzit/default.nix index 31baa431bfc..76b9b285d15 100644 --- a/pkgs/tools/typesetting/tikzit/default.nix +++ b/pkgs/tools/typesetting/tikzit/default.nix @@ -2,13 +2,13 @@ mkDerivation { pname = "tikzit"; - version = "2.1.5"; + version = "2.1.6"; src = fetchFromGitHub { owner = "tikzit"; repo = "tikzit"; - rev = "v2.1.5"; - sha256 = "1xrx7r8b6nb912k91pkdwaz2gijfq6lzssyqxard0591h2mycbcg"; + rev = "v2.1.6"; + sha256 = "0ba99pgv54pj1xvhrwn9db2w0v4h07vsjajcnhpa2smy88ypg32h"; }; nativeBuildInputs = [ qmake qttools flex bison ]; diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix index 1f0c28d49b7..cdb156f3121 100644 --- a/pkgs/tools/virtualization/cri-tools/default.nix +++ b/pkgs/tools/virtualization/cri-tools/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "cri-tools"; - version = "1.18.0"; + version = "1.19.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "v${version}"; - sha256 = "06sxjhjpd893fn945c1s4adri2bf7s50ddvcw5pnwb6qndzfljw6"; + sha256 = "0dx21ws4nzzizzjb0g172fzvjgwck88ikr5c2av08ii06rys1567"; }; vendorSha256 = null; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 80f85c707aa..d36f73e2f86 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -104,6 +104,7 @@ mapAliases ({ deadbeef-mpris2-plugin = deadbeefPlugins.mpris2; # added 2018-02-23 deadpixi-sam = deadpixi-sam-unstable; debian_devscripts = debian-devscripts; # added 2016-03-23 + deepin = throw "deepin was a work in progress and it has been canceled and removed https://github.com/NixOS/nixpkgs/issues/94870"; # added 2020-08-31 desktop_file_utils = desktop-file-utils; # added 2018-02-25 devicemapper = lvm2; # added 2018-04-25 digikam5 = digikam; # added 2017-02-18 @@ -218,6 +219,7 @@ mapAliases ({ jikes = throw "deprecated in 2019-10-07: jikes was abandoned by upstream"; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 + kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepass-keefox = keepass-keepassrpc; # backwards compatibility alias, added 2018-02 keepassx-community = keepassxc; # added 2017-11 @@ -326,6 +328,7 @@ mapAliases ({ nagiosPluginsOfficial = monitoring-plugins; ncat = nmap; # added 2016-01-26 netcat-openbsd = libressl.nc; # added 2018-04-25 + netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # added 2020-08-31 networkmanager_fortisslvpn = networkmanager-fortisslvpn; # added 2018-02-25 networkmanager_iodine = networkmanager-iodine; # added 2018-02-25 networkmanager_l2tp = networkmanager-l2tp; # added 2018-02-25 @@ -456,6 +459,7 @@ mapAliases ({ phonon = throw "Please use libsForQt5.phonon, as Qt4 support in this package has been removed."; # added 2019-11-22 qca-qt5 = libsForQt5.qca-qt5; # added 2015-12-19 quake3game = ioquake3; # added 2016-01-14 + qvim = throw "qvim has been removed."; # added 2020-08-31 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtpfsgui = throw "Is now luminanceHDR"; # added 2019-06-26 quaternion-git = throw "quaternion-git has been removed in favor of the stable version 'quaternion'"; # added 2020-04-09 @@ -467,9 +471,11 @@ mapAliases ({ robomongo = robo3t; #added 2017-09-28 rocm-runtime-ext = throw "rocm-runtime-ext has been removed, since its functionality was added to rocm-runtime"; #added 2020-08-21 rssglx = rss-glx; #added 2015-03-25 + rssh = throw "rssh has been removed from nixpkgs: no upstream releases since 2012, several known CVEs"; # added 2020-08-25 recordmydesktop = throw "recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 + rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 ruby_2_0_0 = throw "deprecated 2018-0213: use a newer version of ruby"; ruby_2_1_0 = throw "deprecated 2018-0213: use a newer version of ruby"; @@ -560,7 +566,9 @@ mapAliases ({ suil-qt5 = suil; # added 2018-05-01 surf-webkit2 = surf; # added 2017-04-02 sup = throw "deprecated in 2019-09-10: abandoned by upstream"; + swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 system_config_printer = system-config-printer; # added 2016-01-03 + systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 systemd_with_lvm2 = throw "obsolete, enabled by default via the lvm module"; # added 2020-07-12 systool = sysfsutils; # added 2018-04-25 tahoelafs = tahoe-lafs; # added 2018-03-26 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48401d6f473..b7f9053ca1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -123,6 +123,8 @@ in appimageTools = callPackage ../build-support/appimage { }; + appindicator-sharp = callPackage ../development/libraries/appindicator-sharp { }; + ensureNewerSourcesHook = { year }: makeSetupHook {} (writeScript "ensure-newer-sources-hook.sh" '' postUnpackHooks+=(_ensureNewerSources) @@ -180,6 +182,8 @@ in colorz = callPackage ../tools/misc/colorz { }; + colorpicker = callPackage ../tools/misc/colorpicker { }; + comedilib = callPackage ../development/libraries/comedilib { }; cpu-x = callPackage ../applications/misc/cpu-x { }; @@ -196,6 +200,8 @@ in hobbes = callPackage ../development/tools/hobbes { }; + html5validator = python36Packages.callPackage ../applications/misc/html5validator { }; + proto-contrib = callPackage ../development/tools/proto-contrib {}; protoc-gen-doc = callPackage ../development/tools/protoc-gen-doc {}; @@ -210,6 +216,8 @@ in onesixtyone = callPackage ../tools/security/onesixtyone {}; + creddump = callPackage ../tools/security/creddump {}; + device-tree_rpi = callPackage ../os-specific/linux/device-tree/raspberrypi.nix {}; diffPlugins = (callPackage ../build-support/plugins.nix {}).diffPlugins; @@ -573,7 +581,10 @@ in acpica-tools = callPackage ../tools/system/acpica-tools { }; - act = callPackage ../development/tools/misc/act {}; + act = callPackage ../development/tools/misc/act { + # go 1.15 cannot connect to docker-for-mac https://github.com/docker/for-mac/issues/4855 + buildGoModule = if stdenv.isDarwin then buildGo114Module else buildGoModule; + }; actdiag = with python3.pkgs; toPythonApplication actdiag; @@ -976,6 +987,10 @@ in dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; + dot-http = callPackage ../development/tools/dot-http { + inherit (darwin.apple_sdk.frameworks) Security; + }; + doona = callPackage ../tools/security/doona { }; ecdsautils = callPackage ../tools/security/ecdsautils { }; @@ -1174,6 +1189,7 @@ in androidndkPkgs = androidndkPkgs_18b; androidndkPkgs_18b = (callPackage ../development/androidndk-pkgs {})."18b"; + androidndkPkgs_21 = (callPackage ../development/androidndk-pkgs {})."21"; androidsdk_9_0 = androidenv.androidPkgs_9_0.androidsdk; @@ -1358,6 +1374,11 @@ in then python.pkgs.tensorflow.libtensorflow else libtensorflow-bin; + libtorch-bin = callPackage ../development/libraries/science/math/libtorch/bin.nix { + inherit (linuxPackages) nvidia_x11; + cudaSupport = pkgs.config.cudaSupport or false; + }; + behdad-fonts = callPackage ../data/fonts/behdad-fonts { }; bless = callPackage ../applications/editors/bless { }; @@ -1486,8 +1507,12 @@ in ''; }); - caddy = callPackage ../servers/caddy { }; - caddy2 = callPackage ../servers/caddy/v2.nix { }; + caddy = callPackage ../servers/caddy { + buildGoModule = buildGo114Module; + }; + caddy2 = callPackage ../servers/caddy/v2.nix { + buildGoModule = buildGo114Module; + }; traefik = callPackage ../servers/traefik { }; calamares = libsForQt5.callPackage ../tools/misc/calamares { @@ -1710,6 +1735,8 @@ in dconf = callPackage ../development/libraries/dconf { }; + dcw-gmt = callPackage ../applications/gis/gmt/dcw.nix { }; + ddar = callPackage ../tools/backup/ddar { }; ddate = callPackage ../tools/misc/ddate { }; @@ -1840,6 +1867,8 @@ in eksctl = callPackage ../tools/admin/eksctl { }; + electronplayer = callPackage ../applications/video/electronplayer/electronplayer.nix { }; + element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { }; element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { @@ -2008,12 +2037,19 @@ in variant = "krita"; }; + gmt = callPackage ../applications/gis/gmt { + inherit (darwin.apple_sdk.frameworks) + Accelerate CoreGraphics CoreVideo; + }; + goa = callPackage ../development/tools/goa { }; gohai = callPackage ../tools/system/gohai { }; gorilla-bin = callPackage ../tools/security/gorilla-bin { }; + godu = callPackage ../tools/misc/godu { }; + gosu = callPackage ../tools/misc/gosu { }; gotify-cli = callPackage ../tools/misc/gotify-cli { }; @@ -2214,6 +2250,8 @@ in nix-direnv = callPackage ../tools/misc/nix-direnv { }; + nix-template = callPackage ../tools/package-management/nix-template { }; + nixpkgs-pytools = with python3.pkgs; toPythonApplication nixpkgs-pytools; noteshrink = callPackage ../tools/misc/noteshrink { }; @@ -2246,6 +2284,8 @@ in obinskit = callPackage ../applications/misc/obinskit {}; + odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -2548,6 +2588,8 @@ in bzip2 = callPackage ../tools/compression/bzip2 { }; + bzip2_1_1 = callPackage ../tools/compression/bzip2/1_1.nix { }; + cabextract = callPackage ../tools/archivers/cabextract { }; cadaver = callPackage ../tools/networking/cadaver { @@ -2806,6 +2848,12 @@ in biosdevname = callPackage ../tools/networking/biosdevname { }; + code-browser-qt = libsForQt5.callPackage ../applications/editors/code-browser { withQt = true; + }; + code-browser-gtk = callPackage ../applications/editors/code-browser { withGtk = true; + qtbase = qt5.qtbase; + }; + c14 = callPackage ../applications/networking/c14 { }; certstrap = callPackage ../tools/security/certstrap { }; @@ -2896,7 +2944,9 @@ in cudatoolkit_10 cudatoolkit_10_0 cudatoolkit_10_1 - cudatoolkit_10_2; + cudatoolkit_10_2 + cudatoolkit_11 + cudatoolkit_11_0; cudatoolkit = cudatoolkit_10; @@ -2913,7 +2963,9 @@ in cudnn_cudatoolkit_10 cudnn_cudatoolkit_10_0 cudnn_cudatoolkit_10_1 - cudnn_cudatoolkit_10_2; + cudnn_cudatoolkit_10_2 + cudnn_cudatoolkit_11 + cudnn_cudatoolkit_11_0; cudnn = cudnn_cudatoolkit_10; @@ -3161,6 +3213,8 @@ in dtc = callPackage ../development/compilers/dtc { }; + dt-schema = python3Packages.callPackage ../development/tools/dt-schema { }; + dub = callPackage ../development/tools/build-managers/dub { }; duc = callPackage ../tools/misc/duc { }; @@ -3335,14 +3389,8 @@ in cholmod-extra = callPackage ../development/libraries/science/math/cholmod-extra { }; - emscriptenVersion = "1.39.1"; - emscripten = callPackage ../development/compilers/emscripten { }; - emscriptenfastcompPackages = dontRecurseIntoAttrs (callPackage ../development/compilers/emscripten/fastcomp { }); - - emscriptenfastcomp = emscriptenfastcompPackages.emscriptenfastcomp; - emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); emscriptenStdenv = stdenv // { mkDerivation = buildEmscriptenPackage; }; @@ -3467,7 +3515,7 @@ in f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { }; - Fabric = python2Packages.Fabric; + Fabric = with python3Packages; toPythonApplication Fabric; fail2ban = callPackage ../tools/security/fail2ban { }; @@ -3534,7 +3582,7 @@ in fdtools = callPackage ../tools/misc/fdtools { }; - featherpad = callPackage ../applications/editors/featherpad {}; + featherpad = qt5.callPackage ../applications/editors/featherpad {}; feedreader = callPackage ../applications/networking/feedreaders/feedreader {}; @@ -3969,7 +4017,7 @@ in gocryptfs = callPackage ../tools/filesystems/gocryptfs { }; godot = callPackage ../development/tools/godot {}; - + godot-headless = callPackage ../development/tools/godot/headless.nix { }; godot-server = callPackage ../development/tools/godot/server.nix { }; @@ -4511,7 +4559,9 @@ in buildGoModule = buildGo114Module; }; ipfs-migrator = callPackage ../applications/networking/ipfs-migrator { }; - ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { }; + ipfs-cluster = callPackage ../applications/networking/ipfs-cluster { + buildGoModule = buildGo114Module; + }; ipget = callPackage ../applications/networking/ipget { }; @@ -4549,6 +4599,8 @@ in isync = callPackage ../tools/networking/isync { }; + itm-tools = callPackage ../development/tools/misc/itm-tools { }; + ix = callPackage ../tools/misc/ix { }; jaaa = callPackage ../applications/audio/jaaa { }; @@ -4715,6 +4767,8 @@ in kibana = kibana6; kibana-oss = kibana6-oss; + kibi = callPackage ../applications/editors/kibi { }; + kismet = callPackage ../applications/networking/sniffers/kismet { }; klick = callPackage ../applications/audio/klick { }; @@ -4846,6 +4900,11 @@ in kippo = callPackage ../servers/kippo { }; + kimg = callPackage ../development/tools/misc/kimg { + asciidoc = asciidoc-full; + imagemagick = imagemagick7Big; + }; + kristall = libsForQt5.callPackage ../applications/networking/browsers/kristall { }; kzipmix = pkgsi686Linux.callPackage ../tools/compression/kzipmix { }; @@ -5543,9 +5602,8 @@ in xnbd = callPackage ../tools/networking/xnbd { }; nccl = callPackage ../development/libraries/science/math/nccl { }; - nccl_cudatoolkit_9_0 = nccl.override { cudatoolkit = cudatoolkit_9_0; }; - nccl_cudatoolkit_9 = nccl.override { cudatoolkit = cudatoolkit_9; }; nccl_cudatoolkit_10 = nccl.override { cudatoolkit = cudatoolkit_10; }; + nccl_cudatoolkit_11 = nccl.override { cudatoolkit = cudatoolkit_11; }; ndjbdns = callPackage ../tools/networking/ndjbdns { }; @@ -5579,6 +5637,8 @@ in ncftp = callPackage ../tools/networking/ncftp { }; + ncgopher = callPackage ../applications/networking/ncgopher { }; + ncompress = callPackage ../tools/compression/ncompress { }; ndisc6 = callPackage ../tools/networking/ndisc6 { }; @@ -5595,6 +5655,8 @@ in netkittftp = callPackage ../tools/networking/netkit/tftp { }; + netlify-cli = nodePackages.netlify-cli; + netpbm = callPackage ../tools/graphics/netpbm { }; netrw = callPackage ../tools/networking/netrw { }; @@ -6663,6 +6725,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + rustscan = callPackage ../tools/security/rustscan { }; + rw = callPackage ../tools/misc/rw { }; rxp = callPackage ../tools/text/xml/rxp { }; @@ -6763,6 +6827,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + sd-mux-ctrl = callPackage ../tools/misc/sd-mux-ctrl { }; + sd-switch = callPackage ../os-specific/linux/sd-switch { }; sdate = callPackage ../tools/misc/sdate { }; @@ -6941,6 +7007,10 @@ in snort = callPackage ../applications/networking/ids/snort { }; + so = callPackage ../development/tools/so { + inherit (darwin.apple_sdk.frameworks) Security; + }; + soapui = callPackage ../applications/networking/soapui { }; sshguard = callPackage ../tools/security/sshguard {}; @@ -7066,8 +7136,6 @@ in supertux-editor = callPackage ../applications/editors/supertux-editor { }; - super-user-spark = haskellPackages.callPackage ../applications/misc/super_user_spark { }; - svgbob = callPackage ../tools/graphics/svgbob { }; svgcleaner = callPackage ../tools/graphics/svgcleaner { }; @@ -7135,8 +7203,6 @@ in swec = callPackage ../tools/networking/swec { }; - swfdec = callPackage ../tools/graphics/swfdec {}; - svnfs = callPackage ../tools/filesystems/svnfs { }; svtplay-dl = callPackage ../tools/misc/svtplay-dl { }; @@ -7341,6 +7407,8 @@ in torsocks = callPackage ../tools/security/tor/torsocks.nix { }; + toss = callPackage ../tools/networking/toss { }; + tox-node = callPackage ../tools/networking/tox-node { }; toxvpn = callPackage ../tools/networking/toxvpn { }; @@ -7616,6 +7684,8 @@ in vpnc = callPackage ../tools/networking/vpnc { }; + vpn-slice = python3Packages.callPackage ../tools/networking/vpn-slice { }; + vp = callPackage ../applications/misc/vp { # Enable next line for console graphics. Note that # it requires `sixel` enabled terminals such as mlterm @@ -8074,6 +8144,7 @@ in inherit (yarn2nix-moretea) yarn2nix mkYarnPackage + mkYarnModules fixup_yarn_lock; yasr = callPackage ../applications/audio/yasr { }; @@ -8244,8 +8315,6 @@ in tcsh = callPackage ../shells/tcsh { }; - rssh = callPackage ../shells/rssh { }; - rush = callPackage ../shells/rush { }; xonsh = callPackage ../shells/xonsh { }; @@ -8399,6 +8468,7 @@ in }; }; + clang_11 = llvmPackages_11.clang; clang_10 = llvmPackages_10.clang; clang_9 = llvmPackages_9.clang; clang_8 = llvmPackages_8.clang; @@ -8455,6 +8525,8 @@ in ''; }; + copper = callPackage ../development/compilers/copper {}; + inherit (callPackages ../development/compilers/crystal { inherit (llvmPackages_10) stdenv clang llvm; }) @@ -9194,6 +9266,8 @@ in jwasm = callPackage ../development/compilers/jwasm { }; + knightos-kcc = callPackage ../development/compilers/kcc { }; + kotlin = callPackage ../development/compilers/kotlin { }; lazarus = callPackage ../development/compilers/fpc/lazarus.nix { @@ -9213,6 +9287,7 @@ in lld_8 = llvmPackages_8.lld; lld_9 = llvmPackages_9.lld; lld_10 = llvmPackages_10.lld; + lld_11 = llvmPackages_11.lld; lldb = llvmPackages.lldb; lldb_5 = llvmPackages_5.lldb; @@ -9221,10 +9296,12 @@ in lldb_8 = llvmPackages_8.lldb; lldb_9 = llvmPackages_9.lldb; lldb_10 = llvmPackages_10.lldb; + lldb_11 = llvmPackages_11.lldb; llvm = llvmPackages.llvm; llvm-manpages = llvmPackages.llvm-manpages; + llvm_11 = llvmPackages_11.llvm; llvm_10 = llvmPackages_10.llvm; llvm_9 = llvmPackages_9.llvm; llvm_8 = llvmPackages_8.llvm; @@ -9270,6 +9347,14 @@ in targetLlvmLibraries = targetPackages.llvmPackages_10.libraries; }; + llvmPackages_11 = callPackage ../development/compilers/llvm/11 ({ + inherit (stdenvAdapters) overrideCC; + buildLlvmTools = buildPackages.llvmPackages_11.tools; + targetLlvmLibraries = targetPackages.llvmPackages_11.libraries; + } // stdenv.lib.optionalAttrs (stdenv.hostPlatform.isi686 && buildPackages.stdenv.cc.isGNU) { + stdenv = gcc7Stdenv; + }); + llvmPackages_latest = llvmPackages_10; llvmPackages_rocm = callPackage ../development/compilers/llvm/rocm { }; @@ -9503,13 +9588,18 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; cargo-bloat = callPackage ../development/tools/rust/cargo-bloat { }; + cargo-cache = callPackage ../development/tools/rust/cargo-cache { + inherit (darwin.apple_sdk.frameworks) Security; + }; cargo-crev = callPackage ../development/tools/rust/cargo-crev { inherit (darwin.apple_sdk.frameworks) Security; }; cargo-deny = callPackage ../development/tools/rust/cargo-deny { inherit (darwin.apple_sdk.frameworks) Security; }; + cargo-embed = callPackage ../development/tools/rust/cargo-embed { }; cargo-expand = callPackage ../development/tools/rust/cargo-expand { }; + cargo-flash = callPackage ../development/tools/rust/cargo-flash { }; cargo-fund = callPackage ../development/tools/rust/cargo-fund { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -10149,6 +10239,8 @@ in spark = callPackage ../applications/networking/cluster/spark { }; + sparkleshare = callPackage ../applications/version-management/sparkleshare { }; + spidermonkey_1_8_5 = callPackage ../development/interpreters/spidermonkey/1.8.5.nix { }; spidermonkey_38 = callPackage ../development/interpreters/spidermonkey/38.nix ({ inherit (darwin) libobjc; @@ -11005,6 +11097,8 @@ in inherit (darwin.apple_sdk.frameworks) Security; }; + kpack = callPackage ../development/tools/misc/kpack { }; + kustomize = callPackage ../development/tools/kustomize { }; ktlint = callPackage ../development/tools/ktlint { }; @@ -11013,6 +11107,8 @@ in lazygit = callPackage ../development/tools/lazygit { }; + laminar = callPackage ../development/tools/continuous-integration/laminar { }; + Literate = callPackage ../development/tools/literate-programming/Literate {}; lcov = callPackage ../development/tools/analysis/lcov { }; @@ -11434,6 +11530,8 @@ in terraform-lsp = callPackage ../development/tools/misc/terraform-lsp { }; terraform-ls = callPackage ../development/tools/misc/terraform-ls { }; + terraformer = callPackage ../development/tools/misc/terraformer { }; + texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { }; texinfo4 = texinfo413; texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { }; @@ -12455,9 +12553,7 @@ in gperftools = callPackage ../development/libraries/gperftools { }; - grab-site = callPackage ../tools/backup/grab-site { - python3Packages = python37Packages; - }; + grab-site = callPackage ../tools/backup/grab-site { }; grib-api = callPackage ../development/libraries/grib-api { }; @@ -12707,6 +12803,8 @@ in haxor-news = callPackage ../applications/misc/haxor-news { }; + hdt = callPackage ../misc/hdt {}; + herqq = libsForQt5.callPackage ../development/libraries/herqq { }; heyefi = haskellPackages.heyefi; @@ -13051,7 +13149,7 @@ in libaudclient = callPackage ../development/libraries/libaudclient { }; libav = libav_11; # branch 11 is API-compatible with branch 10 - libav_all = callPackage ../development/libraries/libav { }; + libav_all = callPackages ../development/libraries/libav { }; inherit (libav_all) libav_0_8 libav_11 libav_12; libavc1394 = callPackage ../development/libraries/libavc1394 { }; @@ -13899,6 +13997,8 @@ in libtheora = callPackage ../development/libraries/libtheora { }; + libthreadar = callPackage ../development/libraries/libthreadar { }; + libtiff = callPackage ../development/libraries/libtiff { }; libtiger = callPackage ../development/libraries/libtiger { }; @@ -14281,6 +14381,8 @@ in inherit (darwin.stubs) setfile; }; + muparserx = callPackage ../development/libraries/muparserx { }; + mutest = callPackage ../development/libraries/mutest { }; mygpoclient = pythonPackages.mygpoclient; @@ -14620,8 +14722,9 @@ in python = python37; }; - protobuf = protobuf3_12; + protobuf = protobuf3_13; + protobuf3_13 = callPackage ../development/libraries/protobuf/3.13.nix { }; protobuf3_12 = callPackage ../development/libraries/protobuf/3.12.nix { }; protobuf3_11 = callPackage ../development/libraries/protobuf/3.11.nix { }; protobuf3_10 = callPackage ../development/libraries/protobuf/3.10.nix { }; @@ -14751,15 +14854,16 @@ in inherit (kdeFrameworks.override { libsForQt5 = self; }) attica baloo bluez-qt kactivities kactivities-stats karchive kauth kbookmarks kcmutils kcalendarcore kcodecs kcompletion kconfig - kconfigwidgets kcoreaddons kcrash kdbusaddons kdeclarative kdelibs4support + kconfigwidgets kcoreaddons kcrash kdav kdbusaddons kdeclarative kdelibs4support kdesignerplugin kdnssd kemoticons kfilemetadata kglobalaccel kguiaddons khtml ki18n kiconthemes kidletime kimageformats kio kitemmodels kitemviews kjobwidgets kjs kjsembed kmediaplayer knewstuff knotifications knotifyconfig kpackage kparts kpeople kplotting kpty kross krunner kservice ktexteditor ktextwidgets kunitconversion kwallet kwayland kwidgetsaddons kwindowsystem kxmlgui kxmlrpcclient modemmanager-qt - networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet syntax-highlighting - syndication threadweaver kirigami2 kholidays kpurpose kcontacts; + networkmanager-qt plasma-framework prison qqc2-desktop-style solid sonnet + syntax-highlighting syndication threadweaver kirigami2 kholidays kpurpose + kcontacts kquickcharts; ### KDE PLASMA 5 @@ -15495,7 +15599,9 @@ in vcg = callPackage ../development/libraries/vcg { }; - vid-stab = callPackage ../development/libraries/vid-stab { }; + vid-stab = callPackage ../development/libraries/vid-stab { + inherit (llvmPackages) openmp; + }; vigra = callPackage ../development/libraries/vigra { }; @@ -15591,7 +15697,6 @@ in webkitgtk = callPackage ../development/libraries/webkitgtk { harfbuzz = harfbuzzFull; inherit (gst_all_1) gst-plugins-base gst-plugins-bad; - stdenv = clangStdenv; # TODO: https://github.com/NixOS/nixpkgs/issues/36947 }; websocketpp = callPackage ../development/libraries/websocket++ { }; @@ -15607,24 +15712,22 @@ in wt3 wt4; + wxformbuilder = callPackage ../development/tools/wxformbuilder { }; + wxGTK = wxGTK28; wxGTK30 = wxGTK30-gtk2; wxGTK31 = wxGTK31-gtk2; - wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { - inherit (gnome2) GConf; - }; + wxGTK28 = callPackage ../development/libraries/wxwidgets/2.8 { }; wxGTK29 = callPackage ../development/libraries/wxwidgets/2.9 { - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QuickTime; }; wxGTK30-gtk2 = callPackage ../development/libraries/wxwidgets/3.0 { withGtk2 = true; - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; @@ -15637,7 +15740,6 @@ in wxGTK31-gtk2 = callPackage ../development/libraries/wxwidgets/3.1 { withGtk2 = true; - inherit (gnome2) GConf; inherit (darwin.stubs) setfile; inherit (darwin.apple_sdk.frameworks) AGL Carbon Cocoa Kernel QTKit; }; @@ -16814,7 +16916,7 @@ in enableMDNS = true; enableDomainController = true; enableRegedit = true; - enableCephFS = true; + enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64; enableGlusterFS = true; }); @@ -17141,7 +17243,11 @@ in criu = callPackage ../os-specific/linux/criu { }; - cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; + cryptsetup = callPackage ../os-specific/linux/cryptsetup { + # cryptsetup only really needs the devmapper component of cryptsetup + # but itself is used as a library in systemd (=udev) + lvm2 = lvm2.override { udev = null; }; + }; cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { }; @@ -17478,6 +17584,22 @@ in ]; }; + linux-rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + + linux-rt_5_6 = callPackage ../os-specific/linux/kernel/linux-rt-5.6.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_5_7 = callPackage ../os-specific/linux/kernel/linux-5.7.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17486,6 +17608,14 @@ in ]; }; + linux_5_8 = callPackage ../os-specific/linux/kernel/linux-5.8.nix { + kernelPatches = [ + kernelPatches.bridge_stp_helper + kernelPatches.request_key_helper + kernelPatches.export_kernel_fpu_functions."5.3" + ]; + }; + linux_testing = callPackage ../os-specific/linux/kernel/linux-testing.nix { kernelPatches = [ kernelPatches.bridge_stp_helper @@ -17560,8 +17690,6 @@ in ddcci-driver = callPackage ../os-specific/linux/ddcci { }; - deepin-anything = callPackage ../os-specific/linux/deepin-anything { }; - digimend = callPackage ../os-specific/linux/digimend { }; dpdk = callPackage ../os-specific/linux/dpdk { }; @@ -17654,6 +17782,8 @@ in netatop = callPackage ../os-specific/linux/netatop { }; + oci-seccomp-bpf-hook = if stdenv.lib.versionAtLeast kernel.version "5.4" then callPackage ../os-specific/linux/oci-seccomp-bpf-hook { } else null; + perf = callPackage ../os-specific/linux/kernel/perf.nix { }; phc-intel = if stdenv.lib.versionAtLeast kernel.version "4.10" then callPackage ../os-specific/linux/phc-intel { } else null; @@ -17711,23 +17841,32 @@ in # Update this when adding the newest kernel major version! # And update linux_latest_for_hardened below if the patches are already available - linuxPackages_latest = linuxPackages_5_7; + linuxPackages_latest = linuxPackages_5_8; linux_latest = linuxPackages_latest.kernel; - # Build the kernel modules for the some of the kernels. + # Realtime kernel packages. + linuxPackages-rt_5_4 = linuxPackagesFor pkgs.linux-rt_5_4; + linuxPackages-rt = linuxPackages-rt_5_4; + linux-rt = linuxPackages-rt.kernel; + linuxPackages-rt_5_6 = linuxPackagesFor pkgs.linux-rt_5_6; + linuxPackages-rt_latest = linuxPackages-rt_5_6; + linux-rt_latest = linuxPackages-rt_latest.kernel; + linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp; linuxPackages_rpi1 = linuxPackagesFor pkgs.linux_rpi1; linuxPackages_rpi2 = linuxPackagesFor pkgs.linux_rpi2; linuxPackages_rpi3 = linuxPackagesFor pkgs.linux_rpi3; linuxPackages_rpi4 = linuxPackagesFor pkgs.linux_rpi4; + # Build kernel modules for some of the kernels. linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4); linuxPackages_4_9 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_9); linuxPackages_4_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_14); linuxPackages_4_19 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_19); linuxPackages_5_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_4); linuxPackages_5_7 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_7); + linuxPackages_5_8 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_5_8); - # When adding to this list: + # When adding to the list above: # - Update linuxPackages_latest to the latest version # - Update the rev in ../os-specific/linux/kernel/linux-libre.nix to the latest one. @@ -17959,6 +18098,8 @@ in iferr = callPackage ../development/tools/iferr { }; + ginkgo = callPackage ../development/tools/ginkgo { }; + go-bindata = callPackage ../development/tools/go-bindata { }; go-bindata-assetfs = callPackage ../development/tools/go-bindata-assetfs { }; @@ -18142,8 +18283,6 @@ in regionset = callPackage ../os-specific/linux/regionset { }; - rfkill = callPackage ../os-specific/linux/rfkill { }; - rfkill_udev = callPackage ../os-specific/linux/rfkill/udev.nix { }; riscv-pk = callPackage ../misc/riscv-pk { }; @@ -18214,12 +18353,26 @@ in sysstat = callPackage ../os-specific/linux/sysstat { }; systemd = callPackage ../os-specific/linux/systemd { - utillinux = utillinuxMinimal; # break the cyclic dependency + # break some cyclic dependencies + utillinux = utillinuxMinimal; + # provide a super minimal gnupg used for systemd-machined + gnupg = callPackage ../tools/security/gnupg/22.nix { + enableMinimal = true; + guiSupport = false; + pcsclite = null; + sqlite = null; + pinentry = null; + adns = null; + gnutls = null; + libusb1 = null; + openldap = null; + readline = null; + zlib = null; + bzip2 = null; + }; }; - udev = systemd; # TODO: move to aliases.nix - # standalone cryptsetup generator for systemd - systemd-cryptsetup-generator = callPackage ../os-specific/linux/systemd/cryptsetup-generator.nix { }; + udev = systemd; # TODO: move to aliases.nix systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; @@ -18265,6 +18418,7 @@ in ubootPine64 ubootPine64LTS ubootPinebook + ubootPinebookPro ubootQemuAarch64 ubootQemuArm ubootRaspberryPi @@ -19156,6 +19310,8 @@ in vegeta = callPackage ../tools/networking/vegeta { }; + venta = callPackage ../data/themes/venta { }; + victor-mono = callPackage ../data/fonts/victor-mono { }; vimix-gtk-themes = callPackage ../data/themes/vimix {}; @@ -19480,6 +19636,8 @@ in bgpq3 = callPackage ../tools/networking/bgpq3 { }; + bgpq4 = callPackage ../tools/networking/bgpq4 { }; + blackbox = callPackage ../applications/version-management/blackbox { }; bleachbit = callPackage ../applications/misc/bleachbit { }; @@ -19858,9 +20016,7 @@ in buildServerGui = false; }; - droopy = callPackage ../applications/networking/droopy { - inherit (python3Packages) wrapPython; - }; + droopy = python37Packages.callPackage ../applications/networking/droopy { }; drumgizmo = callPackage ../applications/audio/drumgizmo { }; @@ -20250,6 +20406,8 @@ in gopher = callPackage ../applications/networking/gopher/gopher { }; + gophernotes = callPackage ../applications/editors/gophernotes { }; + goxel = callPackage ../applications/graphics/goxel { }; gpa = callPackage ../applications/misc/gpa { }; @@ -20629,6 +20787,8 @@ in gollum = callPackage ../applications/misc/gollum { }; + gonic = callPackage ../servers/gonic { }; + googleearth = callPackage ../applications/misc/googleearth { }; google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome2.GConf; }; @@ -20873,6 +21033,8 @@ in i3lock-fancy = callPackage ../applications/window-managers/i3/lock-fancy.nix { }; + i3lock-fancy-rapid = callPackage ../applications/window-managers/i3/lock-fancy-rapid.nix { }; + i3lock-pixeled = callPackage ../misc/screensavers/i3lock-pixeled { }; betterlockscreen = callPackage ../misc/screensavers/betterlockscreen { @@ -20889,6 +21051,8 @@ in i3-wk-switch = callPackage ../applications/window-managers/i3/wk-switch.nix { }; + windowchef = callPackage ../applications/window-managers/windowchef/default.nix { }; + wmfocus = callPackage ../applications/window-managers/i3/wmfocus.nix { }; wmfs = callPackage ../applications/window-managers/wmfs/default.nix { }; @@ -21129,8 +21293,6 @@ in kdeconnect = libsForQt5.callPackage ../applications/misc/kdeconnect { }; - kdecoration-viewer = libsForQt5.callPackage ../tools/misc/kdecoration-viewer { }; - inherit (kdeFrameworks) kdesu; kdevelop-pg-qt = libsForQt5.callPackage ../applications/editors/kdevelop5/kdevelop-pg-qt.nix { }; @@ -21624,6 +21786,8 @@ in moonlight-embedded = callPackage ../applications/misc/moonlight-embedded { }; + mooSpace = callPackage ../applications/audio/mooSpace { }; + mop = callPackage ../applications/misc/mop { }; mopidyPackages = callPackages ../applications/audio/mopidy/default.nix { @@ -21784,8 +21948,6 @@ in neocomp = callPackage ../applications/window-managers/neocomp { }; - netease-cloud-music = callPackage ../applications/audio/netease-cloud-music {}; - newsflash = callPackage ../applications/networking/feedreaders/newsflash { }; nicotine-plus = callPackage ../applications/networking/soulseek/nicotine-plus { @@ -21794,6 +21956,8 @@ in nixos-shell = callPackage ../tools/virtualization/nixos-shell {}; + noaa-apt = callPackage ../applications/radio/noaa-apt { }; + node-problem-detector = callPackage ../applications/networking/cluster/node-problem-detector { }; ninjas2 = callPackage ../applications/audio/ninjas2 {}; @@ -21846,6 +22010,8 @@ in planner = callPackage ../applications/office/planner { }; + plasma-wayland-protocols = libsForQt5.callPackage ../development/libraries/plasma-wayland-protocols { }; + playonlinux = callPackage ../applications/misc/playonlinux { stdenv = stdenv_32bit; }; @@ -22098,6 +22264,10 @@ in opentimestamps-client = python3Packages.callPackage ../tools/misc/opentimestamps-client {}; + opentoonz = (qt5.overrideScope' (_: _: { + libtiff = callPackage ../applications/graphics/opentoonz/libtiff.nix { }; + })).callPackage ../applications/graphics/opentoonz { }; + opentx = libsForQt5.callPackage ../applications/misc/opentx { }; opera = callPackage ../applications/networking/browsers/opera {}; @@ -22855,6 +23025,8 @@ in prusa-slicer = callPackage ../applications/misc/prusa-slicer { }; + robustirc-bridge = callPackage ../servers/irc/robustirc-bridge { }; + sddm = libsForQt5.callPackage ../applications/display-managers/sddm { }; skrooge = libsForQt5.callPackage ../applications/office/skrooge {}; @@ -22967,6 +23139,11 @@ in surf-display = callPackage ../desktops/surf-display { }; + surge = callPackage ../applications/audio/surge { + inherit (gnome3) zenity; + git = gitMinimal; + }; + sunvox = callPackage ../applications/audio/sunvox { }; swh_lv2 = callPackage ../applications/audio/swh-lv2 { }; @@ -22983,7 +23160,9 @@ in # this can be changed to python3 once pyside2 is updated to support the latest python version syncplay = python37.pkgs.callPackage ../applications/networking/syncplay { }; - inherit (callPackages ../applications/networking/syncthing { }) + inherit (callPackages ../applications/networking/syncthing { + buildGoModule = buildGo114Module; + }) syncthing syncthing-cli syncthing-discovery @@ -23086,6 +23265,8 @@ in terminus = callPackage ../applications/misc/terminus { }; + tty-solitaire = callPackage ../applications/misc/tty-solitaire { }; + lxterminal = callPackage ../applications/misc/lxterminal { }; aminal = callPackage ../applications/misc/aminal { @@ -23234,6 +23415,8 @@ in treesheets = callPackage ../applications/office/treesheets { wxGTK = wxGTK31; }; + tremc = callPackage ../applications/networking/p2p/tremc { }; + tribler = callPackage ../applications/networking/p2p/tribler { }; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { @@ -23242,6 +23425,10 @@ in tudu = callPackage ../applications/office/tudu { }; + tunefish = callPackage ../applications/audio/tunefish { + stdenv = clangStdenv; # https://github.com/jpcima/tunefish/issues/4 + }; + tut = callPackage ../applications/misc/tut { }; tuxguitar = callPackage ../applications/editors/music/tuxguitar { }; @@ -23335,12 +23522,6 @@ in inherit (xorg) libxcb; }; - qvim = lowPrio (callPackage ../applications/editors/vim/qvim.nix { - features = "huge"; # one of tiny, small, normal, big or huge - lua = pkgs.lua5; - flags = [ "python" "X11" ]; # only flag "X11" by now - }); - vimpc = callPackage ../applications/audio/vimpc { }; wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; @@ -23370,6 +23551,8 @@ in inherit (lua52Packages) lpeg; }; + viw = callPackage ../applications/editors/viw { }; + virt-viewer = callPackage ../applications/virtualization/virt-viewer { }; virt-top = callPackage ../applications/virtualization/virt-top { }; @@ -24026,6 +24209,8 @@ in youtube-viewer = perlPackages.WWWYoutubeViewer; + ytalk = callPackage ../applications/networking/instant-messengers/ytalk { }; + ytcc = callPackage ../tools/networking/ytcc { }; zam-plugins = callPackage ../applications/audio/zam-plugins { }; @@ -24483,7 +24668,6 @@ in fsg = callPackage ../games/fsg { wxGTK = wxGTK28.override { unicode = false; - gst-plugins-base = null; }; }; @@ -24533,6 +24717,8 @@ in gshogi = python3Packages.callPackage ../games/gshogi {}; + gshhg-gmt = callPackage ../applications/gis/gmt/gshhg.nix { }; + qtads = qt5.callPackage ../games/qtads { }; gtetrinet = callPackage ../games/gtetrinet { @@ -24576,11 +24762,15 @@ in katago = callPackage ../games/katago { }; katagoWithCuda = katago.override { - cudaSupport = true; + enableCuda = true; cudnn = cudnn_cudatoolkit_10_2; cudatoolkit = cudatoolkit_10_2; }; + katagoCPU = katago.override { + enableGPU = false; + }; + klavaro = callPackage ../games/klavaro {}; kobodeluxe = callPackage ../games/kobodeluxe { }; @@ -24684,8 +24874,6 @@ in nxengine-evo = callPackage ../games/nxengine-evo { }; - oci-seccomp-bpf-hook = callPackage ../applications/virtualization/oci-seccomp-bpf-hook { }; - odamex = callPackage ../games/odamex { }; oilrush = callPackage ../games/oilrush { }; @@ -25090,6 +25278,8 @@ in tk = tk-8_5; }; + xcowsay = callPackage ../games/xcowsay { }; + xjump = callPackage ../games/xjump { }; # TODO: the corresponding nix file is missing # xracer = callPackage ../games/xracer { }; @@ -25172,11 +25362,6 @@ in cinnamon = recurseIntoAttrs (callPackage ../desktops/cinnamon { }); - deepin = recurseIntoAttrs (import ../desktops/deepin { - inherit pkgs libsForQt5; - inherit (lib) makeScope; - }); - enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; }); @@ -25284,6 +25469,8 @@ in plasma-workspace-wallpapers polkit-kde-agent powerdevil sddm-kcm systemsettings user-manager xdg-desktop-portal-kde; + plasma-applet-caffeine-plus = libsForQt5.callPackage ../desktops/plasma-5/addons/caffeine-plus.nix { }; + kwin-tiling = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/tiling.nix { }; krohnkite = libsForQt5.callPackage ../desktops/plasma-5/kwin/scripts/krohnkite.nix { }; @@ -25501,6 +25688,8 @@ in snpeff = callPackage ../applications/science/biology/snpeff { }; + somafm-cli = callPackage ../tools/misc/somafm-cli/default.nix { }; + somatic-sniper = callPackage ../applications/science/biology/somatic-sniper { }; sortmerna = callPackage ../applications/science/biology/sortmerna { }; @@ -25823,11 +26012,11 @@ in ifstat-legacy = callPackage ../tools/networking/ifstat-legacy { }; isabelle = callPackage ../applications/science/logic/isabelle { - polyml = stdenv.lib.overrideDerivation polyml57 (attrs: { + polyml = stdenv.lib.overrideDerivation polyml (attrs: { configureFlags = [ "--enable-intinf-as-int" "--with-gmp" "--disable-shared" ]; }); - java = if stdenv.isLinux then jre else jdk; + java = openjdk11; }; iprover = callPackage ../applications/science/logic/iprover { }; @@ -25842,6 +26031,7 @@ in lean2 = callPackage ../applications/science/logic/lean2 {}; lean3 = lean; elan = callPackage ../applications/science/logic/elan {}; + mathlibtools = with python3Packages; toPythonApplication mathlibtools; leo2 = callPackage ../applications/science/logic/leo2 { ocaml = ocaml-ng.ocamlPackages_4_01_0.ocaml;}; @@ -26439,9 +26629,7 @@ in hatari = callPackage ../misc/emulators/hatari { }; - helm = callPackage ../applications/audio/helm { - stdenv = gcc8Stdenv; - }; + helm = callPackage ../applications/audio/helm { }; helmfile = callPackage ../applications/networking/cluster/helmfile { }; @@ -26512,11 +26700,11 @@ in # Exceptions are versions that we need to keep to allow upgrades from older NixOS releases inherit (callPackage ../applications/networking/cluster/kops {}) mkKops - kops_1_15 kops_1_16 kops_1_17 + kops_1_18 ; - kops = kops_1_17; + kops = kops_1_18; lguf-brightness = callPackage ../misc/lguf-brightness { }; @@ -26876,6 +27064,8 @@ in pyload = callPackage ../applications/networking/pyload {}; + pwntools = with python3Packages; toPythonApplication pwntools; + uae = callPackage ../misc/emulators/uae { }; fsuae = callPackage ../misc/emulators/fs-uae { }; @@ -26995,9 +27185,7 @@ in sanoid = callPackage ../tools/backup/sanoid { }; - satysfi = callPackage ../tools/typesetting/satysfi { - ocamlPackages = ocaml-ng.ocamlPackages_4_07; - }; + satysfi = callPackage ../tools/typesetting/satysfi { }; sc-controller = pythonPackages.callPackage ../misc/drivers/sc-controller { inherit libusb1; # Shadow python.pkgs.libusb1. @@ -27192,6 +27380,8 @@ in webfs = callPackage ../servers/http/webfs { }; + webkit2-sharp = callPackage ../development/libraries/webkit2-sharp { }; + websocketd = callPackage ../applications/networking/websocketd { }; wikicurses = callPackage ../applications/misc/wikicurses { @@ -27226,6 +27416,8 @@ in wmutils-core = callPackage ../tools/X11/wmutils-core { }; + wmutils-libwm = callPackage ../tools/X11/wmutils-libwm { }; + wmutils-opt = callPackage ../tools/X11/wmutils-opt { }; wordpress = callPackage ../servers/web-apps/wordpress { }; @@ -27416,6 +27608,8 @@ in sequelpro = callPackage ../applications/misc/sequelpro {}; + snowsql = callPackage ../applications/misc/snowsql {}; + sidequest = callPackage ../applications/misc/sidequest {}; maphosts = callPackage ../tools/networking/maphosts {}; diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix index 02184a5685e..affb4ae92c1 100644 --- a/pkgs/top-level/darwin-packages.nix +++ b/pkgs/top-level/darwin-packages.nix @@ -88,4 +88,8 @@ in ios-deploy = callPackage ../os-specific/darwin/ios-deploy {}; + discrete-scroll = callPackage ../os-specific/darwin/discrete-scroll { + inherit (darwin.apple_sdk.frameworks) Cocoa; + }; + }) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 5e307305af5..f65829e29ca 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -40,7 +40,6 @@ releaseTools.sourceTarball { checkPhase = '' set -o pipefail - export NIX_DB_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR export NIX_PATH=nixpkgs=$TMPDIR/barf.nix opts=(--option build-users-group "") diff --git a/pkgs/top-level/metrics.nix b/pkgs/top-level/metrics.nix index 244b0ce7a66..2bfcb9d5d80 100644 --- a/pkgs/top-level/metrics.nix +++ b/pkgs/top-level/metrics.nix @@ -7,7 +7,6 @@ runCommand "nixpkgs-metrics" requiredSystemFeatures = [ "benchmark" ]; } '' - export NIX_DB_DIR=$TMPDIR export NIX_STATE_DIR=$TMPDIR nix-store --init diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f47fd2fbcfa..32bb7d33786 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -137,12 +137,16 @@ let cohttp = callPackage ../development/ocaml-modules/cohttp { }; + cohttp-async = callPackage ../development/ocaml-modules/cohttp/async.nix { }; + cohttp-lwt = callPackage ../development/ocaml-modules/cohttp/lwt.nix { }; cohttp-lwt-unix = callPackage ../development/ocaml-modules/cohttp/lwt-unix.nix { }; conduit = callPackage ../development/ocaml-modules/conduit { }; + conduit-async = callPackage ../development/ocaml-modules/conduit/async.nix { }; + conduit-lwt = callPackage ../development/ocaml-modules/conduit/lwt.nix { }; conduit-lwt-unix = callPackage ../development/ocaml-modules/conduit/lwt-unix.nix { }; @@ -151,6 +155,8 @@ let containers = callPackage ../development/ocaml-modules/containers { }; + containers-data = callPackage ../development/ocaml-modules/containers/data.nix { }; + cow = callPackage ../development/ocaml-modules/cow { }; cpdf = callPackage ../development/ocaml-modules/cpdf { }; @@ -218,16 +224,20 @@ let dune = callPackage ../development/tools/ocaml/dune { }; dune_2 = - if lib.versionAtLeast ocaml.version "4.07" + if lib.versionAtLeast ocaml.version "4.08" then callPackage ../development/tools/ocaml/dune/2.nix { } else if lib.versionAtLeast ocaml.version "4.02" then pkgs.dune_2 else throw "dune_2 is not available for OCaml ${ocaml.version}"; + dune-action-plugin = callPackage ../development/ocaml-modules/dune-action-plugin { }; + dune-build-info = callPackage ../development/ocaml-modules/dune-build-info { }; dune-configurator = callPackage ../development/ocaml-modules/dune-configurator { }; + dune-glob = callPackage ../development/ocaml-modules/dune-glob { }; + dune-private-libs = callPackage ../development/ocaml-modules/dune-private-libs { }; dune-release = callPackage ../development/tools/ocaml/dune-release { @@ -312,6 +322,8 @@ let herelib = callPackage ../development/ocaml-modules/herelib { }; + hidapi = callPackage ../development/ocaml-modules/hidapi { }; + higlo = callPackage ../development/ocaml-modules/higlo { }; hkdf = callPackage ../development/ocaml-modules/hkdf { }; @@ -742,6 +754,12 @@ let piqi-ocaml = callPackage ../development/ocaml-modules/piqi-ocaml { }; + posix-base = callPackage ../development/ocaml-modules/posix/base.nix { }; + + posix-socket = callPackage ../development/ocaml-modules/posix/socket.nix { }; + + posix-types = callPackage ../development/ocaml-modules/posix/types.nix { }; + ppxfind = callPackage ../development/ocaml-modules/ppxfind { }; ppxlib = callPackage ../development/ocaml-modules/ppxlib { }; @@ -943,6 +961,8 @@ let wasm = callPackage ../development/ocaml-modules/wasm { }; + webbrowser = callPackage ../development/ocaml-modules/webbrowser { }; + webmachine = callPackage ../development/ocaml-modules/webmachine { }; wtf8 = callPackage ../development/ocaml-modules/wtf8 { }; @@ -983,7 +1003,7 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.13.nix { - inherit ctypes janePackage num octavius ppxlib re; + inherit ctypes dune-configurator janePackage num octavius ppxlib re; inherit (pkgs) openssl; } else if lib.versionOlder "4.07" ocaml.version @@ -1213,7 +1233,7 @@ in let inherit (pkgs) callPackage; in rec ocamlPackages_4_11 = mkOcamlPackages (callPackage ../development/compilers/ocaml/4.11.nix { }); - ocamlPackages_latest = ocamlPackages_4_10; + ocamlPackages_latest = ocamlPackages_4_11; ocamlPackages = ocamlPackages_4_10; } diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d845fbde0d9..c85ca5a3c5a 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4039,6 +4039,23 @@ let }; }; + CryptSodium = buildPerlPackage { + pname = "Crypt-Sodium"; + version = "0.11"; + src = fetchurl { + url = "mirror://cpan/authors/id/M/MG/MGREGORO/Crypt-Sodium-0.11.tar.gz"; + sha256 = "0y3c24zv4iwnvlf9zwxambk8ddram54fm6l1m5yhbskc0nhp6z4h"; + }; + NIX_CFLAGS_COMPILE = "-I${pkgs.libsodium.dev}/include"; + NIX_CFLAGS_LINK = "-L${pkgs.libsodium.out}/lib -lsodium"; + meta = { + homepage = "https://metacpan.org/release/Crypt-Sodium"; + description = "Perl bindings for libsodium (NaCL)"; + license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + maintainers = [ maintainers.sgo ]; + }; + }; + CryptTwofish = buildPerlPackage { pname = "Crypt-Twofish"; version = "2.17"; @@ -12858,10 +12875,10 @@ let Mojolicious = buildPerlPackage { pname = "Mojolicious"; - version = "8.55"; + version = "8.58"; src = fetchurl { - url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.55.tar.gz"; - sha256 = "116f79a8jvdk0zfj34gp3idhxgk4l8qq4ka6pwhdp8pmks969w0x"; + url = "mirror://cpan/authors/id/S/SR/SRI/Mojolicious-8.58.tar.gz"; + sha256 = "0543m2g1pjm06b0yr4cffw70ki76762ria65zvrjccc2zk69pwvy"; }; meta = { homepage = "https://mojolicious.org"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dd5b52edc90..d6ce5710f8a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -142,161 +142,362 @@ in { else callPackage ../development/python-modules/setuptools { }; - vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; + aadict = callPackage ../development/python-modules/aadict { }; - acoustics = callPackage ../development/python-modules/acoustics { }; + aafigure = callPackage ../development/python-modules/aafigure { }; - py3to2 = callPackage ../development/python-modules/3to2 { }; + absl-py = callPackage ../development/python-modules/absl-py { }; - pynamodb = callPackage ../development/python-modules/pynamodb { }; + accupy = callPackage ../development/python-modules/accupy { }; - aadict = callPackage ../development/python-modules/aadict { }; + acme = callPackage ../development/python-modules/acme { }; - absl-py = callPackage ../development/python-modules/absl-py { }; + acme-tiny = callPackage ../development/python-modules/acme-tiny { }; + + acoustics = callPackage ../development/python-modules/acoustics { }; + + actdiag = callPackage ../development/python-modules/actdiag { }; + + adal = callPackage ../development/python-modules/adal { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; + addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + aenum = callPackage ../development/python-modules/aenum { }; + afdko = callPackage ../development/python-modules/afdko { }; + + affine = callPackage ../development/python-modules/affine { }; + affinity = callPackage ../development/python-modules/affinity { }; agate = callPackage ../development/python-modules/agate { }; agate-dbf = callPackage ../development/python-modules/agate-dbf { }; - alerta = callPackage ../development/python-modules/alerta { }; + agate-excel = callPackage ../development/python-modules/agate-excel { }; - alerta-server = callPackage ../development/python-modules/alerta-server { }; + agate-sql = callPackage ../development/python-modules/agate-sql { }; - androguard = callPackage ../development/python-modules/androguard { }; + aioamqp = callPackage ../development/python-modules/aioamqp { }; - phonenumbers = callPackage ../development/python-modules/phonenumbers { }; + aioconsole = callPackage ../development/python-modules/aioconsole { }; - agate-excel = callPackage ../development/python-modules/agate-excel { }; + aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; - agate-sql = callPackage ../development/python-modules/agate-sql { }; + aiodns = callPackage ../development/python-modules/aiodns { }; + + aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; + + aioeventlet = callPackage ../development/python-modules/aioeventlet { }; + + aiofiles = callPackage ../development/python-modules/aiofiles { }; + + aioftp = callPackage ../development/python-modules/aioftp { }; + + aioh2 = callPackage ../development/python-modules/aioh2 { }; + + aioharmony = callPackage ../development/python-modules/aioharmony { }; + + aiohttp = callPackage ../development/python-modules/aiohttp { }; + + aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; + + aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + + aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + + aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + + aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; + + aiohue = callPackage ../development/python-modules/aiohue { }; aioimaplib = callPackage ../development/python-modules/aioimaplib { }; + aiojobs = callPackage ../development/python-modules/aiojobs { }; + + aiokafka = callPackage ../development/python-modules/aiokafka { }; + aiolifx = callPackage ../development/python-modules/aiolifx { }; aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { }; - aioamqp = callPackage ../development/python-modules/aioamqp { }; + aiomysql = callPackage ../development/python-modules/aiomysql { }; - aiojobs = callPackage ../development/python-modules/aiojobs { }; + aioprocessing = callPackage ../development/python-modules/aioprocessing { }; aioredis = callPackage ../development/python-modules/aioredis { }; + aioresponses = callPackage ../development/python-modules/aioresponses { }; + + aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + aiorun = callPackage ../development/python-modules/aiorun { }; - ansicolor = callPackage ../development/python-modules/ansicolor { }; + aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; + + aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + + aiounifi = callPackage ../development/python-modules/aiounifi { }; + + aiounittest = callPackage ../development/python-modules/aiounittest { }; + + aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + + ajpy = callPackage ../development/python-modules/ajpy { }; + + alabaster = callPackage ../development/python-modules/alabaster { }; + + alarmdecoder = callPackage ../development/python-modules/alarmdecoder { }; + + alembic = callPackage ../development/python-modules/alembic { }; + + alerta = callPackage ../development/python-modules/alerta { }; + + alerta-server = callPackage ../development/python-modules/alerta-server { }; + + algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; + + allpairspy = callPackage ../development/python-modules/allpairspy { }; + + alot = callPackage ../development/python-modules/alot { }; + + altair = callPackage ../development/python-modules/altair { }; + + amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + + amqp = callPackage ../development/python-modules/amqp { }; + + amqplib = callPackage ../development/python-modules/amqplib { }; + + androguard = callPackage ../development/python-modules/androguard { }; - ansiwrap = callPackage ../development/python-modules/ansiwrap { }; + aniso8601 = callPackage ../development/python-modules/aniso8601 { }; + + annexremote = callPackage ../development/python-modules/annexremote { }; + + annoy = callPackage ../development/python-modules/annoy { }; + + anonip = callPackage ../development/python-modules/anonip { }; ansi2html = callPackage ../development/python-modules/ansi2html { }; - anytree = callPackage ../development/python-modules/anytree { - inherit (pkgs) graphviz; - }; + ansible = callPackage ../development/python-modules/ansible { }; + + ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; + + ansible-lint = callPackage ../development/python-modules/ansible-lint { }; + + ansible-runner = callPackage ../development/python-modules/ansible-runner { }; + + ansi = callPackage ../development/python-modules/ansi { }; + + ansicolor = callPackage ../development/python-modules/ansicolor { }; + + ansicolors = callPackage ../development/python-modules/ansicolors { }; + + ansiconv = callPackage ../development/python-modules/ansiconv { }; + + ansiwrap = callPackage ../development/python-modules/ansiwrap { }; + + antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; + + antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + + anyjson = callPackage ../development/python-modules/anyjson { }; + + anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; + + apache-airflow = callPackage ../development/python-modules/apache-airflow { }; + + apipkg = callPackage ../development/python-modules/apipkg { }; + + apispec = callPackage ../development/python-modules/apispec { }; aplpy = callPackage ../development/python-modules/aplpy { }; + appdirs = callPackage ../development/python-modules/appdirs { }; + + appleseed = disabledIf isPy3k (toPythonModule (pkgs.appleseed.override { inherit (self) python; })); + + application = callPackage ../development/python-modules/application { }; + + applicationinsights = callPackage ../development/python-modules/applicationinsights { }; + + appnope = callPackage ../development/python-modules/appnope { }; + apprise = callPackage ../development/python-modules/apprise { }; - arrayqueues = callPackage ../development/python-modules/arrayqueues { }; + approvaltests = callPackage ../development/python-modules/approvaltests { }; + + apptools = callPackage ../development/python-modules/apptools { }; + + APScheduler = callPackage ../development/python-modules/APScheduler { }; + + apsw = callPackage ../development/python-modules/apsw { }; + + area = callPackage ../development/python-modules/area { }; + + arelle = callPackage ../development/python-modules/arelle { gui = true; }; + + arelle-headless = callPackage ../development/python-modules/arelle { gui = false; }; aresponses = callPackage ../development/python-modules/aresponses { }; + argcomplete = callPackage ../development/python-modules/argcomplete { }; + + argh = callPackage ../development/python-modules/argh { }; + argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; + args = callPackage ../development/python-modules/args { }; + aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2; }; + arrayqueues = callPackage ../development/python-modules/arrayqueues { }; + + arrow = callPackage ../development/python-modules/arrow { }; + arviz = callPackage ../development/python-modules/arviz { }; - asana = callPackage ../development/python-modules/asana { }; + arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; - asdf = callPackage ../development/python-modules/asdf { }; + asana = callPackage ../development/python-modules/asana { }; asciimatics = callPackage ../development/python-modules/asciimatics { }; asciitree = callPackage ../development/python-modules/asciitree { }; + asdf = callPackage ../development/python-modules/asdf { }; + ase = if isPy27 then - callPackage ../development/python-modules/ase/3.17.nix { } - else - callPackage ../development/python-modules/ase { }; + callPackage ../development/python-modules/ase/3.17.nix { } + else + callPackage ../development/python-modules/ase { }; + + asgiref = callPackage ../development/python-modules/asgiref { }; + + asn1ate = callPackage ../development/python-modules/asn1ate { }; asn1crypto = callPackage ../development/python-modules/asn1crypto { }; aspy-yaml = callPackage ../development/python-modules/aspy.yaml { }; + astor = callPackage ../development/python-modules/astor { }; + astral = callPackage ../development/python-modules/astral { }; - astropy = callPackage ../development/python-modules/astropy { }; + astroid = if isPy3k then + callPackage ../development/python-modules/astroid { } + else + callPackage ../development/python-modules/astroid/1.6.nix { }; - astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + astropy = callPackage ../development/python-modules/astropy { }; astropy-healpix = callPackage ../development/python-modules/astropy-healpix { }; + astropy-helpers = callPackage ../development/python-modules/astropy-helpers { }; + astroquery = callPackage ../development/python-modules/astroquery { }; asttokens = callPackage ../development/python-modules/asttokens { }; + astunparse = callPackage ../development/python-modules/astunparse { }; + + async_generator = callPackage ../development/python-modules/async_generator { }; + + asyncpg = callPackage ../development/python-modules/asyncpg { }; + + asyncssh = callPackage ../development/python-modules/asyncssh { }; + + asynctest = callPackage ../development/python-modules/asynctest { }; + + async-timeout = callPackage ../development/python-modules/async_timeout { }; + + async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + + atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; + atom = callPackage ../development/python-modules/atom { }; - augeas = callPackage ../development/python-modules/augeas { - inherit (pkgs) augeas; - }; + atomiclong = callPackage ../development/python-modules/atomiclong { }; - authheaders = callPackage ../development/python-modules/authheaders { }; + atomicwrites = callPackage ../development/python-modules/atomicwrites { }; - authres = callPackage ../development/python-modules/authres { }; + atomman = callPackage ../development/python-modules/atomman { }; - auth0-python = callPackage ../development/python-modules/auth0-python { }; + atpublic = callPackage ../development/python-modules/atpublic { }; - autograd = callPackage ../development/python-modules/autograd { }; + atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; - autologging = callPackage ../development/python-modules/autologging { }; + attrdict = callPackage ../development/python-modules/attrdict { }; - automat = callPackage ../development/python-modules/automat { }; + attrs = callPackage ../development/python-modules/attrs { }; - awkward = callPackage ../development/python-modules/awkward { }; - awkward1 = callPackage ../development/python-modules/awkward1 { }; + audio-metadata = callPackage ../development/python-modules/audio-metadata { }; - aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; + audioread = callPackage ../development/python-modules/audioread { }; - aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + audiotools = callPackage ../development/python-modules/audiotools { }; - aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; - atomman = callPackage ../development/python-modules/atomman { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; + + authheaders = callPackage ../development/python-modules/authheaders { }; authlib = callPackage ../development/python-modules/authlib { }; - # packages defined elsewhere + authres = callPackage ../development/python-modules/authres { }; - amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; + autobahn = callPackage ../development/python-modules/autobahn { }; - ansiconv = callPackage ../development/python-modules/ansiconv { }; + autograd = callPackage ../development/python-modules/autograd { }; + + autologging = callPackage ../development/python-modules/autologging { }; + + automat = callPackage ../development/python-modules/automat { }; + + autopep8 = callPackage ../development/python-modules/autopep8 { }; avahi = toPythonModule (pkgs.avahi.override { inherit python; withPython = true; }); - azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; + av = callPackage ../development/python-modules/av { inherit (pkgs) pkgconfig; }; - azure-common = callPackage ../development/python-modules/azure-common { }; + avro3k = callPackage ../development/python-modules/avro3k { }; - azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + avro = callPackage ../development/python-modules/avro { }; + + avro-python3 = callPackage ../development/python-modules/avro-python3 { }; + + awesome-slugify = callPackage ../development/python-modules/awesome-slugify { }; + + awkward = callPackage ../development/python-modules/awkward { }; + awkward1 = callPackage ../development/python-modules/awkward1 { }; + + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + + aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; + + aws-sam-translator = callPackage ../development/python-modules/aws-sam-translator { }; + + aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; azure-applicationinsights = callPackage ../development/python-modules/azure-applicationinsights { }; azure-batch = callPackage ../development/python-modules/azure-batch { }; + azure-common = callPackage ../development/python-modules/azure-common { }; + azure-core = callPackage ../development/python-modules/azure-core { }; + azure-cosmos = callPackage ../development/python-modules/azure-cosmos { }; + azure-cosmosdb-nspkg = callPackage ../development/python-modules/azure-cosmosdb-nspkg { }; azure-cosmosdb-table = callPackage ../development/python-modules/azure-cosmosdb-table { }; @@ -323,30 +524,6 @@ in { azure-loganalytics = callPackage ../development/python-modules/azure-loganalytics { }; - azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; - - azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; - - azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; - - azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; - - azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; - - azure-storage = callPackage ../development/python-modules/azure-storage { }; - - azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - - azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; - - azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; - - azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - - azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; - - azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; - azure-mgmt-advisor = callPackage ../development/python-modules/azure-mgmt-advisor { }; azure-mgmt-apimanagement = callPackage ../development/python-modules/azure-mgmt-apimanagement { }; @@ -357,10 +534,10 @@ in { azure-mgmt-authorization = callPackage ../development/python-modules/azure-mgmt-authorization { }; - azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; - azure-mgmt-batchai = callPackage ../development/python-modules/azure-mgmt-batchai { }; + azure-mgmt-batch = callPackage ../development/python-modules/azure-mgmt-batch { }; + azure-mgmt-billing = callPackage ../development/python-modules/azure-mgmt-billing { }; azure-mgmt-botservice = callPackage ../development/python-modules/azure-mgmt-botservice { }; @@ -371,6 +548,8 @@ in { azure-mgmt-commerce = callPackage ../development/python-modules/azure-mgmt-commerce { }; + azure-mgmt-common = callPackage ../development/python-modules/azure-mgmt-common { }; + azure-mgmt-compute = callPackage ../development/python-modules/azure-mgmt-compute { }; azure-mgmt-consumption = callPackage ../development/python-modules/azure-mgmt-consumption { }; @@ -395,12 +574,12 @@ in { azure-mgmt-datamigration = callPackage ../development/python-modules/azure-mgmt-datamigration { }; + azure-mgmt-deploymentmanager = callPackage ../development/python-modules/azure-mgmt-deploymentmanager { }; + azure-mgmt-devspaces = callPackage ../development/python-modules/azure-mgmt-devspaces { }; azure-mgmt-devtestlabs = callPackage ../development/python-modules/azure-mgmt-devtestlabs { }; - azure-mgmt-deploymentmanager = callPackage ../development/python-modules/azure-mgmt-deploymentmanager { }; - azure-mgmt-dns = callPackage ../development/python-modules/azure-mgmt-dns { }; azure-mgmt-eventgrid = callPackage ../development/python-modules/azure-mgmt-eventgrid { }; @@ -417,7 +596,8 @@ in { azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { }; - azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; + azure-mgmt-iothubprovisioningservices = + callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { }; @@ -451,6 +631,8 @@ in { azure-mgmt-notificationhubs = callPackage ../development/python-modules/azure-mgmt-notificationhubs { }; + azure-mgmt-nspkg = callPackage ../development/python-modules/azure-mgmt-nspkg { }; + azure-mgmt-policyinsights = callPackage ../development/python-modules/azure-mgmt-policyinsights { }; azure-mgmt-powerbiembedded = callPackage ../development/python-modules/azure-mgmt-powerbiembedded { }; @@ -459,10 +641,10 @@ in { azure-mgmt-rdbms = callPackage ../development/python-modules/azure-mgmt-rdbms { }; - azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; - azure-mgmt-recoveryservicesbackup = callPackage ../development/python-modules/azure-mgmt-recoveryservicesbackup { }; + azure-mgmt-recoveryservices = callPackage ../development/python-modules/azure-mgmt-recoveryservices { }; + azure-mgmt-redhatopenshift = callPackage ../development/python-modules/azure-mgmt-redhatopenshift { }; azure-mgmt-redis = callPackage ../development/python-modules/azure-mgmt-redis { }; @@ -499,5332 +681,5160 @@ in { azure-multiapi-storage = callPackage ../development/python-modules/azure-multiapi-storage { }; - backports_csv = callPackage ../development/python-modules/backports_csv {}; - - backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which {}; - - bacpypes = callPackage ../development/python-modules/bacpypes {}; - - bap = callPackage ../development/python-modules/bap { - bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; - }; + azure-nspkg = callPackage ../development/python-modules/azure-nspkg { }; - baselines = callPackage ../development/python-modules/baselines { }; + azure-servicebus = callPackage ../development/python-modules/azure-servicebus { }; - bash_kernel = callPackage ../development/python-modules/bash_kernel { - inherit (pkgs) bash; - }; + azure-servicefabric = callPackage ../development/python-modules/azure-servicefabric { }; - bashlex = callPackage ../development/python-modules/bashlex { }; + azure-servicemanagement-legacy = callPackage ../development/python-modules/azure-servicemanagement-legacy { }; - bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; + azure-storage-blob = callPackage ../development/python-modules/azure-storage-blob { }; - bayespy = callPackage ../development/python-modules/bayespy { }; + azure-storage = callPackage ../development/python-modules/azure-storage { }; - beanstalkc = callPackage ../development/python-modules/beanstalkc { }; + azure-storage-common = callPackage ../development/python-modules/azure-storage-common { }; - beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; + azure-storage-file = callPackage ../development/python-modules/azure-storage-file { }; - biplist = callPackage ../development/python-modules/biplist { }; + azure-storage-file-share = callPackage ../development/python-modules/azure-storage-file-share { }; - bip_utils = callPackage ../development/python-modules/bip_utils { }; + azure-storage-nspkg = callPackage ../development/python-modules/azure-storage-nspkg { }; - bitarray = callPackage ../development/python-modules/bitarray { }; + azure-storage-queue = callPackage ../development/python-modules/azure-storage-queue { }; - bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; + Babel = callPackage ../development/python-modules/Babel { }; - bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; + babelfish = callPackage ../development/python-modules/babelfish { }; - blivet = callPackage ../development/python-modules/blivet { }; + babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; - bluepy = callPackage ../development/python-modules/bluepy { }; + backcall = callPackage ../development/python-modules/backcall { }; - boltons = callPackage ../development/python-modules/boltons { }; + backoff = callPackage ../development/python-modules/backoff { }; - bravia-tv = callPackage ../development/python-modules/bravia-tv { }; + backports_abc = callPackage ../development/python-modules/backports_abc { }; - braintree = callPackage ../development/python-modules/braintree { }; + backports_csv = callPackage ../development/python-modules/backports_csv { }; - breezy = callPackage ../development/python-modules/breezy { }; + backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; - brother = callPackage ../development/python-modules/brother { }; + backports_lzma = callPackage ../development/python-modules/backports_lzma { }; - build = callPackage ../development/python-modules/build { }; + backports_os = callPackage ../development/python-modules/backports_os { }; - bytecode = callPackage ../development/python-modules/bytecode { }; + backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; - ciso8601 = callPackage ../development/python-modules/ciso8601 { }; + backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; - deepdiff = callPackage ../development/python-modules/deepdiff { }; + backports_ssl_match_hostname = + if !(pythonOlder "3.5") then null else callPackage ../development/python-modules/backports_ssl_match_hostname { }; - deepmerge = callPackage ../development/python-modules/deepmerge { }; + backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; - django-sesame = callPackage ../development/python-modules/django-sesame { }; + backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock { }; - bravado-core = callPackage ../development/python-modules/bravado-core { }; + backports_weakref = callPackage ../development/python-modules/backports_weakref { }; - breathe = callPackage ../development/python-modules/breathe { }; + bacpypes = callPackage ../development/python-modules/bacpypes { }; - brotli = callPackage ../development/python-modules/brotli { }; + bandit = callPackage ../development/python-modules/bandit { }; - broadlink = callPackage ../development/python-modules/broadlink { }; + bap = callPackage ../development/python-modules/bap { bap = pkgs.ocaml-ng.ocamlPackages_4_06.bap; }; - browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; + base58 = callPackage ../development/python-modules/base58 { }; - browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {}); + baselines = callPackage ../development/python-modules/baselines { }; - btrfs = callPackage ../development/python-modules/btrfs { }; + basemap = callPackage ../development/python-modules/basemap { }; - bt_proximity = callPackage ../development/python-modules/bt-proximity { }; + bash_kernel = callPackage ../development/python-modules/bash_kernel { inherit (pkgs) bash; }; - bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 + bashlex = callPackage ../development/python-modules/bashlex { }; - bugsnag = callPackage ../development/python-modules/bugsnag { }; + basiciw = callPackage ../development/python-modules/basiciw { inherit (pkgs) gcc wirelesstools; }; - cachecontrol = callPackage ../development/python-modules/cachecontrol { }; + batchgenerators = callPackage ../development/python-modules/batchgenerators { }; - cachelib = callPackage ../development/python-modules/cachelib { }; + batchspawner = callPackage ../development/python-modules/batchspawner { }; - cachy = callPackage ../development/python-modules/cachy { }; + batinfo = callPackage ../development/python-modules/batinfo { }; - cadquery = callPackage ../development/python-modules/cadquery { }; + bayesian-optimization = callPackage ../development/python-modules/bayesian-optimization { }; - catalogue = callPackage ../development/python-modules/catalogue { }; + bayespy = callPackage ../development/python-modules/bayespy { }; - cbeams = callPackage ../misc/cbeams { }; + bcdoc = callPackage ../development/python-modules/bcdoc { }; - cdecimal = callPackage ../development/python-modules/cdecimal { }; + bcrypt = callPackage ../development/python-modules/bcrypt { }; - certbot = callPackage ../development/python-modules/certbot { }; + beaker = callPackage ../development/python-modules/beaker { }; - certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; + beancount = callPackage ../development/python-modules/beancount { }; - certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; + beancount_docverif = callPackage ../development/python-modules/beancount_docverif { }; - certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; + beanstalkc = callPackage ../development/python-modules/beanstalkc { }; - cfn-flip = callPackage ../development/python-modules/cfn-flip { }; + beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; - chalice = callPackage ../development/python-modules/chalice { }; + bedup = callPackage ../development/python-modules/bedup { }; - channels-redis = callPackage ../development/python-modules/channels-redis { }; + behave = callPackage ../development/python-modules/behave { }; - cleo = callPackage ../development/python-modules/cleo { }; + bellows = callPackage ../development/python-modules/bellows { }; - clikit = callPackage ../development/python-modules/clikit { }; + bespon = callPackage ../development/python-modules/bespon { }; - cliff = callPackage ../development/python-modules/cliff { }; + betamax = callPackage ../development/python-modules/betamax { }; - clifford = callPackage ../development/python-modules/clifford { }; + betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; - clickclick = callPackage ../development/python-modules/clickclick { }; + betamax-serializers = callPackage ../development/python-modules/betamax-serializers { }; - clustershell = callPackage ../development/python-modules/clustershell { }; + bibtexparser = callPackage ../development/python-modules/bibtexparser { }; - cnvkit = callPackage ../development/python-modules/cnvkit { }; + bidict = callPackage ../development/python-modules/bidict { }; - cocotb = callPackage ../development/python-modules/cocotb { }; + bids-validator = callPackage ../development/python-modules/bids-validator { }; - compiledb = callPackage ../development/python-modules/compiledb { }; + billiard = callPackage ../development/python-modules/billiard { }; - connexion = callPackage ../development/python-modules/connexion { }; + binaryornot = callPackage ../development/python-modules/binaryornot { }; - coordinates = callPackage ../development/python-modules/coordinates { }; + binwalk = callPackage ../development/python-modules/binwalk { + pyqtgraph = null; + matplotlib = null; + }; - cozy = callPackage ../development/python-modules/cozy { }; + binwalk-full = appendToName "full" (self.binwalk.override { + pyqtgraph = self.pyqtgraph; + matplotlib = self.matplotlib; + }); - codespell = callPackage ../development/python-modules/codespell { }; + biopython = callPackage ../development/python-modules/biopython { }; - convertdate = callPackage ../development/python-modules/convertdate { }; + biplist = callPackage ../development/python-modules/biplist { }; - cot = callPackage ../development/python-modules/cot { }; + bip_utils = callPackage ../development/python-modules/bip_utils { }; - crc32c = callPackage ../development/python-modules/crc32c { }; + bitarray = callPackage ../development/python-modules/bitarray { }; - curio = callPackage ../development/python-modules/curio { }; + bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; - dendropy = callPackage ../development/python-modules/dendropy { }; + bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; - denonavr = callPackage ../development/python-modules/denonavr { }; + bitcoinlib = callPackage ../development/python-modules/bitcoinlib { }; - dependency-injector = callPackage ../development/python-modules/dependency-injector { }; + bitcoin-price-api = callPackage ../development/python-modules/bitcoin-price-api { }; - btchip = callPackage ../development/python-modules/btchip { }; + bitmath = callPackage ../development/python-modules/bitmath { }; - databricks-cli = callPackage ../development/python-modules/databricks-cli { }; + bitstring = callPackage ../development/python-modules/bitstring { }; - datatable = callPackage ../development/python-modules/datatable { - inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; - }; + bitstruct = callPackage ../development/python-modules/bitstruct { }; - databases = callPackage ../development/python-modules/databases { }; + bjoern = callPackage ../development/python-modules/bjoern { }; - datamodeldict = callPackage ../development/python-modules/datamodeldict { }; + bkcharts = callPackage ../development/python-modules/bkcharts { }; - datasette = callPackage ../development/python-modules/datasette { }; + black = callPackage ../development/python-modules/black { }; - datashader = callPackage ../development/python-modules/datashader { }; + bleach = callPackage ../development/python-modules/bleach { }; - dbf = callPackage ../development/python-modules/dbf { }; + bleak = callPackage ../development/python-modules/bleak { }; - dbfread = callPackage ../development/python-modules/dbfread { }; + blessed = callPackage ../development/python-modules/blessed { }; - deap = callPackage ../development/python-modules/deap { }; + blessings = callPackage ../development/python-modules/blessings { }; - deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; + blinker = callPackage ../development/python-modules/blinker { }; - dkimpy = callPackage ../development/python-modules/dkimpy { }; + BlinkStick = callPackage ../development/python-modules/blinkstick { }; - diceware = callPackage ../development/python-modules/diceware { }; + blis = callPackage ../development/python-modules/blis { }; - dictionaries = callPackage ../development/python-modules/dictionaries { }; + blist = callPackage ../development/python-modules/blist { }; - diff_cover = callPackage ../development/python-modules/diff_cover { }; + blivet = callPackage ../development/python-modules/blivet { }; - diofant = callPackage ../development/python-modules/diofant { }; + blockdiag = callPackage ../development/python-modules/blockdiag { }; - dipy = callPackage ../development/python-modules/dipy { }; + blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; - docrep = callPackage ../development/python-modules/docrep { }; + block-io = callPackage ../development/python-modules/block-io { }; - dominate = callPackage ../development/python-modules/dominate { }; + bluepy = callPackage ../development/python-modules/bluepy { }; - dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { - inherit (pkgs) substituteAll dotnet-sdk; - }; + bokeh = callPackage ../development/python-modules/bokeh { }; - emcee = callPackage ../development/python-modules/emcee { }; + boltons = callPackage ../development/python-modules/boltons { }; - emailthreads = callPackage ../development/python-modules/emailthreads { }; + boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; - email_validator = callPackage ../development/python-modules/email-validator { }; + booleanoperations = callPackage ../development/python-modules/booleanoperations { }; - ewmh = callPackage ../development/python-modules/ewmh { }; + boolean-py = callPackage ../development/python-modules/boolean-py { }; - exchangelib = callPackage ../development/python-modules/exchangelib { }; + # Build boost for this specific Python version + # TODO: use separate output for libboost_python.so + boost = toPythonModule (pkgs.boost.override { + inherit (self) python numpy; + enablePython = true; + }); - dcmstack = callPackage ../development/python-modules/dcmstack { }; + boto3 = callPackage ../development/python-modules/boto3 { }; - dbus-python = callPackage ../development/python-modules/dbus { - inherit (pkgs) dbus pkgconfig; - }; + boto = callPackage ../development/python-modules/boto { }; - debts = callPackage ../development/python-modules/debts { }; + botocore = callPackage ../development/python-modules/botocore { }; - dftfit = callPackage ../development/python-modules/dftfit { }; + bottle = callPackage ../development/python-modules/bottle { }; - dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; + bottleneck = callPackage ../development/python-modules/bottleneck { }; - discid = callPackage ../development/python-modules/discid { }; + box2d = callPackage ../development/python-modules/box2d { }; - discordpy = callPackage ../development/python-modules/discordpy { }; + bpython = callPackage ../development/python-modules/bpython { }; - parver = callPackage ../development/python-modules/parver { }; - arpeggio = callPackage ../development/python-modules/arpeggio { }; + braintree = callPackage ../development/python-modules/braintree { }; - influxdb-client = callPackage ../development/python-modules/influxdb-client { }; + branca = callPackage ../development/python-modules/branca { }; - invoke = callPackage ../development/python-modules/invoke { }; + bravado-core = callPackage ../development/python-modules/bravado-core { }; - distorm3 = callPackage ../development/python-modules/distorm3 { }; + bravia-tv = callPackage ../development/python-modules/bravia-tv { }; - distlib = callPackage ../development/python-modules/distlib { }; + breathe = callPackage ../development/python-modules/breathe { }; - distributed = callPackage ../development/python-modules/distributed { }; + breezy = callPackage ../development/python-modules/breezy { }; - docutils = callPackage ../development/python-modules/docutils { }; + broadlink = callPackage ../development/python-modules/broadlink { }; - dogtail = callPackage ../development/python-modules/dogtail { }; + brother = callPackage ../development/python-modules/brother { }; - diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; + brotli = callPackage ../development/python-modules/brotli { }; - eliot = callPackage ../development/python-modules/eliot {}; + brotlipy = callPackage ../development/python-modules/brotlipy { }; - entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; + browser-cookie3 = callPackage ../development/python-modules/browser-cookie3 { }; - entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; + browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy { }); - eradicate = callPackage ../development/python-modules/eradicate { }; + bsddb3 = callPackage ../development/python-modules/bsddb3 { }; - face = callPackage ../development/python-modules/face { }; + bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; - fastparquet = callPackage ../development/python-modules/fastparquet { }; + btchip = callPackage ../development/python-modules/btchip { }; - fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + bt_proximity = callPackage ../development/python-modules/bt-proximity { }; - fasttext = callPackage ../development/python-modules/fasttext { }; + BTrees = callPackage ../development/python-modules/btrees { }; - facedancer = callPackage ../development/python-modules/facedancer { }; + btrfs = callPackage ../development/python-modules/btrfs { }; - favicon = callPackage ../development/python-modules/favicon { }; + bugseverywhere = throw "bugseverywhere has been removed: Abandoned by upstream."; # Added 2019-11-27 - fdint = callPackage ../development/python-modules/fdint { }; + bugsnag = callPackage ../development/python-modules/bugsnag { }; - fido2 = callPackage ../development/python-modules/fido2 { }; + bugwarrior = callPackage ../development/python-modules/bugwarrior { }; - filterpy = callPackage ../development/python-modules/filterpy { }; + bugz = callPackage ../development/python-modules/bugz { }; - filemagic = callPackage ../development/python-modules/filemagic { }; + bugzilla = callPackage ../development/python-modules/bugzilla { }; - finalfusion = callPackage ../development/python-modules/finalfusion { }; + buildbot = callPackage ../development/python-modules/buildbot { }; - fints = callPackage ../development/python-modules/fints { }; + buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - fire = callPackage ../development/python-modules/fire { }; + buildbot-full = self.buildbot.withPlugins + (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); - firetv = callPackage ../development/python-modules/firetv { }; + buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; - flower = callPackage ../development/python-modules/flower { }; + buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); - flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; + buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; - flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; + build = callPackage ../development/python-modules/build { }; - flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; + bumps = callPackage ../development/python-modules/bumps { }; - foxdot = callPackage ../development/python-modules/foxdot { }; + bunch = callPackage ../development/python-modules/bunch { }; - freetype-py = callPackage ../development/python-modules/freetype-py { }; + bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; }; - fsspec = callPackage ../development/python-modules/fsspec { }; + bytecode = callPackage ../development/python-modules/bytecode { }; - furl = callPackage ../development/python-modules/furl { }; + bz2file = callPackage ../development/python-modules/bz2file { }; - fuse = callPackage ../development/python-modules/fuse-python { - inherit (pkgs) fuse pkgconfig; - }; + cachecontrol = callPackage ../development/python-modules/cachecontrol { }; - fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; + cached-property = callPackage ../development/python-modules/cached-property { }; - genanki = callPackage ../development/python-modules/genanki { }; + cachelib = callPackage ../development/python-modules/cachelib { }; - geoip2 = callPackage ../development/python-modules/geoip2 { }; + cachetools = let + cachetools' = callPackage ../development/python-modules/cachetools { }; + cachetools_2 = cachetools'.overridePythonAttrs (oldAttrs: rec { + version = "3.1.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; + }; + }); + in if isPy3k then cachetools' else cachetools_2; - getmac = callPackage ../development/python-modules/getmac { }; + cachy = callPackage ../development/python-modules/cachy { }; - gidgethub = callPackage ../development/python-modules/gidgethub { }; + cadquery = callPackage ../development/python-modules/cadquery { }; - gin-config = callPackage ../development/python-modules/gin-config { }; + caffe = toPythonModule (pkgs.caffe.override { + pythonSupport = true; + inherit (self) python numpy boost; + }); - globus-sdk = callPackage ../development/python-modules/globus-sdk { }; + cairocffi = if isPy3k then + callPackage ../development/python-modules/cairocffi { } + else + callPackage ../development/python-modules/cairocffi/0_9.nix { }; - glymur = callPackage ../development/python-modules/glymur { }; + cairosvg = if isPy3k then + callPackage ../development/python-modules/cairosvg { } + else + callPackage ../development/python-modules/cairosvg/1_x.nix { }; - glob2 = callPackage ../development/python-modules/glob2 { }; + caldav = callPackage ../development/python-modules/caldav { }; - globre = callPackage ../development/python-modules/globre { }; + can = callPackage ../development/python-modules/can { }; - glom = callPackage ../development/python-modules/glom { }; + canmatrix = callPackage ../development/python-modules/canmatrix { }; - gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { - inherit (self) python; - enablePython = true; - })); + canonicaljson = callPackage ../development/python-modules/canonicaljson { }; - goocalendar = callPackage ../development/python-modules/goocalendar { }; + canopen = callPackage ../development/python-modules/canopen { }; - grandalf = callPackage ../development/python-modules/grandalf { }; + capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; }; - gprof2dot = callPackage ../development/python-modules/gprof2dot { - inherit (pkgs) graphviz; - }; + capturer = callPackage ../development/python-modules/capturer { }; - gsd = if isPy27 then - callPackage ../development/python-modules/gsd/1.7.nix { } - else - callPackage ../development/python-modules/gsd { }; + carbon = callPackage ../development/python-modules/carbon { }; - gssapi = callPackage ../development/python-modules/gssapi { - inherit (pkgs) darwin krb5Full; - }; + carrot = callPackage ../development/python-modules/carrot { }; - guestfs = callPackage ../development/python-modules/guestfs { }; + cartopy = callPackage ../development/python-modules/cartopy { }; - gumath = callPackage ../development/python-modules/gumath { }; + casbin = callPackage ../development/python-modules/casbin { }; - h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; + case = callPackage ../development/python-modules/case { }; - h5py = callPackage ../development/python-modules/h5py { - hdf5 = pkgs.hdf5; - }; + cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; - h5py-mpi = self.h5py.override { - hdf5 = pkgs.hdf5-mpi; - }; + casttube = callPackage ../development/python-modules/casttube { }; - h5netcdf = callPackage ../development/python-modules/h5netcdf { }; + catalogue = callPackage ../development/python-modules/catalogue { }; - ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; + cbeams = callPackage ../misc/cbeams { }; - habanero = callPackage ../development/python-modules/habanero { }; + cbor2 = callPackage ../development/python-modules/cbor2 { }; - handout = callPackage ../development/python-modules/handout { }; + cbor = callPackage ../development/python-modules/cbor { }; - HAP-python = callPackage ../development/python-modules/HAP-python { }; + cccolutils = callPackage ../development/python-modules/cccolutils { }; - helper = callPackage ../development/python-modules/helper { }; + cchardet = callPackage ../development/python-modules/cchardet { }; - hdmedians = callPackage ../development/python-modules/hdmedians { }; + CDDB = callPackage ../development/python-modules/cddb { }; - hdlparse = callPackage ../development/python-modules/hdlparse { }; + cdecimal = callPackage ../development/python-modules/cdecimal { }; - hiyapyco = callPackage ../development/python-modules/hiyapyco { }; + celery = callPackage ../development/python-modules/celery { }; - hocr-tools = callPackage ../development/python-modules/hocr-tools { }; + cement = callPackage ../development/python-modules/cement { }; - holidays = callPackage ../development/python-modules/holidays { }; + cerberus = callPackage ../development/python-modules/cerberus { }; - holoviews = callPackage ../development/python-modules/holoviews { }; + certbot = callPackage ../development/python-modules/certbot { }; - hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { - inherit python; - }); + certbot-dns-cloudflare = callPackage ../development/python-modules/certbot-dns-cloudflare { }; - hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; + certbot-dns-rfc2136 = callPackage ../development/python-modules/certbot-dns-rfc2136 { }; - http-ece = callPackage ../development/python-modules/http-ece { }; + certbot-dns-route53 = callPackage ../development/python-modules/certbot-dns-route53 { }; - httpsig = callPackage ../development/python-modules/httpsig { }; + certifi = callPackage ../development/python-modules/certifi { }; - httptools = callPackage ../development/python-modules/httptools { }; + certipy = callPackage ../development/python-modules/certipy { }; - hwi = callPackage ../development/python-modules/hwi { }; + cffi = callPackage ../development/python-modules/cffi { }; - i3ipc = callPackage ../development/python-modules/i3ipc { }; + cfgv = callPackage ../development/python-modules/cfgv { }; - ignite = callPackage ../development/python-modules/ignite { }; + cfn-flip = callPackage ../development/python-modules/cfn-flip { }; - ihatemoney = callPackage ../development/python-modules/ihatemoney { }; + cfn-lint = callPackage ../development/python-modules/cfn-lint { }; - imutils = callPackage ../development/python-modules/imutils { }; + cftime = callPackage ../development/python-modules/cftime { }; - inotify-simple = callPackage ../development/python-modules/inotify-simple { }; + cgen = callPackage ../development/python-modules/cgen { }; - intake = callPackage ../development/python-modules/intake { }; + cgroup-utils = callPackage ../development/python-modules/cgroup-utils { }; - intelhex = callPackage ../development/python-modules/intelhex { }; + chai = callPackage ../development/python-modules/chai { }; - inquirer = callPackage ../development/python-modules/inquirer { }; + chainer = callPackage ../development/python-modules/chainer { cudaSupport = pkgs.config.cudaSupport or false; }; - ipympl = callPackage ../development/python-modules/ipympl { }; + chainmap = callPackage ../development/python-modules/chainmap { }; - itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; + chalice = callPackage ../development/python-modules/chalice { }; - itemadapter = callPackage ../development/python-modules/itemadapter { }; + chameleon = callPackage ../development/python-modules/chameleon { }; - itemloaders = callPackage ../development/python-modules/itemloaders { }; + channels = callPackage ../development/python-modules/channels { }; - iterm2 = callPackage ../development/python-modules/iterm2 { }; + channels-redis = callPackage ../development/python-modules/channels-redis { }; - janus = callPackage ../development/python-modules/janus { }; + characteristic = callPackage ../development/python-modules/characteristic { }; - jc = callPackage ../development/python-modules/jc { }; + chardet = callPackage ../development/python-modules/chardet { }; - jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; + chart-studio = callPackage ../development/python-modules/chart-studio { }; - jira = callPackage ../development/python-modules/jira { }; + check-manifest = callPackage ../development/python-modules/check-manifest { }; - jsonpath = callPackage ../development/python-modules/jsonpath { }; + cheetah3 = callPackage ../development/python-modules/cheetah3 { }; - junit-xml = callPackage ../development/python-modules/junit-xml { }; + cheetah = callPackage ../development/python-modules/cheetah { }; - junitparser = callPackage ../development/python-modules/junitparser { }; + cheroot = callPackage ../development/python-modules/cheroot { }; - jwcrypto = callPackage ../development/python-modules/jwcrypto { }; + cherrypy = if isPy3k then + callPackage ../development/python-modules/cherrypy { } + else + callPackage ../development/python-modules/cherrypy/17.nix { }; - kconfiglib = callPackage ../development/python-modules/kconfiglib { }; + chevron = callPackage ../development/python-modules/chevron { }; - kinparse = callPackage ../development/python-modules/kinparse { }; + ci-info = callPackage ../development/python-modules/ci-info { }; - labelbox = callPackage ../development/python-modules/labelbox { }; + ci-py = callPackage ../development/python-modules/ci-py { }; - lammps-cython = callPackage ../development/python-modules/lammps-cython { - mpi = pkgs.openmpi; - }; + cirq = callPackage ../development/python-modules/cirq { }; - langdetect = callPackage ../development/python-modules/langdetect { }; + ciso8601 = callPackage ../development/python-modules/ciso8601 { }; - launchpadlib = callPackage ../development/python-modules/launchpadlib { }; + citeproc-py = callPackage ../development/python-modules/citeproc-py { }; - lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; + cjson = callPackage ../development/python-modules/cjson { }; - lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; + ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; - lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; + cld2-cffi = callPackage ../development/python-modules/cld2-cffi { }; - lazr-uri = callPackage ../development/python-modules/lazr-uri { }; + cleo = callPackage ../development/python-modules/cleo { }; - libmr = callPackage ../development/python-modules/libmr { }; + clf = callPackage ../development/python-modules/clf { }; - limitlessled = callPackage ../development/python-modules/limitlessled { }; + cliapp = callPackage ../development/python-modules/cliapp { }; - livelossplot = callPackage ../development/python-modules/livelossplot { }; + click = callPackage ../development/python-modules/click { }; - lmtpd = callPackage ../development/python-modules/lmtpd { }; + clickclick = callPackage ../development/python-modules/clickclick { }; - logster = callPackage ../development/python-modules/logster { }; + click-completion = callPackage ../development/python-modules/click-completion { }; - loguru = callPackage ../development/python-modules/loguru { }; + click-datetime = callPackage ../development/python-modules/click-datetime { }; - logzero = callPackage ../development/python-modules/logzero { }; + click-default-group = callPackage ../development/python-modules/click-default-group { }; - mac_alias = callPackage ../development/python-modules/mac_alias { }; + click-didyoumean = callPackage ../development/python-modules/click-didyoumean { }; - macropy = callPackage ../development/python-modules/macropy { }; + click-log = callPackage ../development/python-modules/click-log { }; - mail-parser = callPackage ../development/python-modules/mail-parser { }; + click-plugins = callPackage ../development/python-modules/click-plugins { }; - mailman = callPackage ../servers/mail/mailman { }; + click-repl = callPackage ../development/python-modules/click-repl { }; - mailman-web = callPackage ../servers/mail/mailman/web.nix { }; + click-threading = callPackage ../development/python-modules/click-threading { }; - mailmanclient = callPackage ../development/python-modules/mailmanclient { }; + cliff = callPackage ../development/python-modules/cliff { }; - mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; + clifford = callPackage ../development/python-modules/clifford { }; - manhole = callPackage ../development/python-modules/manhole { }; + cligj = callPackage ../development/python-modules/cligj { }; - mapbox = callPackage ../development/python-modules/mapbox { }; + cli-helpers = callPackage ../development/python-modules/cli-helpers { }; - markerlib = callPackage ../development/python-modules/markerlib { }; + clikit = callPackage ../development/python-modules/clikit { }; - mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; + clint = callPackage ../development/python-modules/clint { }; - matchpy = callPackage ../development/python-modules/matchpy { }; + clize = callPackage ../development/python-modules/clize { }; - maxminddb = callPackage ../development/python-modules/maxminddb { }; + closure-linter = callPackage ../development/python-modules/closure-linter { }; - mininet-python = (toPythonModule (pkgs.mininet.override{ inherit python; })).py; + cloudflare = callPackage ../development/python-modules/cloudflare { }; - mkl-service = callPackage ../development/python-modules/mkl-service { }; + cloudpickle = callPackage ../development/python-modules/cloudpickle { }; - mnist = callPackage ../development/python-modules/mnist { }; + clustershell = callPackage ../development/python-modules/clustershell { }; - monkeyhex = callPackage ../development/python-modules/monkeyhex { }; + cma = callPackage ../development/python-modules/cma { }; - monty = callPackage ../development/python-modules/monty { }; + cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; - mpi4py = callPackage ../development/python-modules/mpi4py { - mpi = pkgs.openmpi; - }; + cmd2 = callPackage ../development/python-modules/cmd2 { }; - pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; + cmdline = callPackage ../development/python-modules/cmdline { }; - python-baseconv = callPackage ../development/python-modules/python-baseconv { }; + cmdtest = callPackage ../development/python-modules/cmdtest { }; - pycognito = callPackage ../development/python-modules/pycognito { }; + cntk = callPackage ../development/python-modules/cntk { }; - python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; + cnvkit = callPackage ../development/python-modules/cnvkit { }; - mortgage = callPackage ../development/python-modules/mortgage { }; + cocotb = callPackage ../development/python-modules/cocotb { }; - msal = callPackage ../development/python-modules/msal { }; + codecov = callPackage ../development/python-modules/codecov { }; - msal-extensions = callPackage ../development/python-modules/msal-extensions { }; + codespell = callPackage ../development/python-modules/codespell { }; - msrest = callPackage ../development/python-modules/msrest { }; + cogapp = callPackage ../development/python-modules/cogapp { }; - msrestazure = callPackage ../development/python-modules/msrestazure { }; + coilmq = callPackage ../development/python-modules/coilmq { }; - multiset = callPackage ../development/python-modules/multiset { }; + coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; - mwclient = callPackage ../development/python-modules/mwclient { }; + ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; - mwoauth = callPackage ../development/python-modules/mwoauth { }; + colander = callPackage ../development/python-modules/colander { }; - nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; + colorama = callPackage ../development/python-modules/colorama { }; - nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + colorcet = callPackage ../development/python-modules/colorcet { }; - nassl = callPackage ../development/python-modules/nassl { }; + colorclass = callPackage ../development/python-modules/colorclass { }; - nbsmoke = callPackage ../development/python-modules/nbsmoke { }; + colored = callPackage ../development/python-modules/colored { }; - nbsphinx = callPackage ../development/python-modules/nbsphinx { }; + coloredlogs = callPackage ../development/python-modules/coloredlogs { }; - nbval = callPackage ../development/python-modules/nbval { }; + colorful = callPackage ../development/python-modules/colorful { }; - ndtypes = callPackage ../development/python-modules/ndtypes { }; + colorlog = callPackage ../development/python-modules/colorlog { }; - neo = callPackage ../development/python-modules/neo { }; + colorlover = callPackage ../development/python-modules/colorlover { }; - nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; + colormath = callPackage ../development/python-modules/colormath { }; - neuron = pkgs.neuron.override { - inherit python; - }; + colorspacious = callPackage ../development/python-modules/colorspacious { }; - neuron-mpi = pkgs.neuron-mpi.override { - inherit python; - }; + colour = callPackage ../development/python-modules/colour { }; - nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; + CommonMark = callPackage ../development/python-modules/commonmark { }; - nixpart = callPackage ../tools/filesystems/nixpart { }; + compiledb = callPackage ../development/python-modules/compiledb { }; - # This is used for NixOps to make sure we won't break it with the next major - # version of nixpart. - nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; + conda = callPackage ../development/python-modules/conda { }; - nltk = callPackage ../development/python-modules/nltk { }; + ConfigArgParse = callPackage ../development/python-modules/configargparse { }; - ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; + configobj = callPackage ../development/python-modules/configobj { }; - nvchecker = callPackage ../development/python-modules/nvchecker { }; + configparser = if pythonOlder "3.6" then + callPackage ../development/python-modules/configparser/4.nix { } + else + callPackage ../development/python-modules/configparser { }; - numericalunits = callPackage ../development/python-modules/numericalunits { }; + configshell = callPackage ../development/python-modules/configshell { }; - nunavut = callPackage ../development/python-modules/nunavut { }; + confluent-kafka = callPackage ../development/python-modules/confluent-kafka { }; - oath = callPackage ../development/python-modules/oath { }; + connexion = callPackage ../development/python-modules/connexion { }; - oauthenticator = callPackage ../development/python-modules/oauthenticator { }; + consonance = callPackage ../development/python-modules/consonance { }; - onnx = callPackage ../development/python-modules/onnx { }; + constantly = callPackage ../development/python-modules/constantly { }; - ordered-set = callPackage ../development/python-modules/ordered-set { }; + construct = callPackage ../development/python-modules/construct { }; - orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; + consul = callPackage ../development/python-modules/consul { }; - ortools = (toPythonModule (pkgs.or-tools.override { - inherit (self) python; - })).python; + contexter = callPackage ../development/python-modules/contexter { }; - osmnx = callPackage ../development/python-modules/osmnx { }; + contextlib2 = callPackage ../development/python-modules/contextlib2 { }; - osmpythontools = callPackage ../development/python-modules/osmpythontools { }; + contextvars = callPackage ../development/python-modules/contextvars { }; - outcome = callPackage ../development/python-modules/outcome {}; + convertdate = callPackage ../development/python-modules/convertdate { }; - ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { - pythonPackages = self; - }); + cookiecutter = callPackage ../development/python-modules/cookiecutter { }; - palettable = callPackage ../development/python-modules/palettable { }; + cookies = callPackage ../development/python-modules/cookies { }; - papermill = callPackage ../development/python-modules/papermill { }; + coordinates = callPackage ../development/python-modules/coordinates { }; - parsley = callPackage ../development/python-modules/parsley { }; + coreapi = callPackage ../development/python-modules/coreapi { }; - pastel = callPackage ../development/python-modules/pastel { }; + coreschema = callPackage ../development/python-modules/coreschema { }; - pathlib = callPackage ../development/python-modules/pathlib { }; + cornice = callPackage ../development/python-modules/cornice { }; - pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); + cot = callPackage ../development/python-modules/cot { }; - pcpp = callPackage ../development/python-modules/pcpp { }; + covCore = callPackage ../development/python-modules/cov-core { }; - pdf2image = callPackage ../development/python-modules/pdf2image { }; + coverage = callPackage ../development/python-modules/coverage { }; - pdfminer = callPackage ../development/python-modules/pdfminer_six { }; + coveralls = callPackage ../development/python-modules/coveralls { }; - pdfposter = callPackage ../development/python-modules/pdfposter { }; + cozy = callPackage ../development/python-modules/cozy { }; - pdftotext = callPackage ../development/python-modules/pdftotext { }; + cppy = callPackage ../development/python-modules/cppy { }; - pdfx = callPackage ../development/python-modules/pdfx { }; + cram = callPackage ../development/python-modules/cram { }; - pushover-complete = callPackage ../development/python-modules/pushover-complete { }; + crashtest = callPackage ../development/python-modules/crashtest { }; - pyicloud = callPackage ../development/python-modules/pyicloud { }; + crayons = callPackage ../development/python-modules/crayons { }; - pyperf = callPackage ../development/python-modules/pyperf { }; + crc16 = callPackage ../development/python-modules/crc16 { }; - pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; + crc32c = callPackage ../development/python-modules/crc32c { }; - pefile = callPackage ../development/python-modules/pefile { }; + crccheck = callPackage ../development/python-modules/crccheck { }; - perfplot = callPackage ../development/python-modules/perfplot { }; + crcmod = callPackage ../development/python-modules/crcmod { }; - phonopy = callPackage ../development/python-modules/phonopy { }; + credstash = callPackage ../development/python-modules/credstash { }; - phik = callPackage ../development/python-modules/phik {}; + croniter = callPackage ../development/python-modules/croniter { }; - piccata = callPackage ../development/python-modules/piccata {}; + cryptacular = callPackage ../development/python-modules/cryptacular { }; - pims = callPackage ../development/python-modules/pims { }; + cryptography = if isPy27 then + callPackage ../development/python-modules/cryptography/2.9.nix { } + else + callPackage ../development/python-modules/cryptography { }; - poetry = callPackage ../development/python-modules/poetry { }; + cryptography_vectors = if isPy27 then + callPackage ../development/python-modules/cryptography/vectors-2.9.nix { } + else + callPackage ../development/python-modules/cryptography/vectors.nix { }; - poetry-core = callPackage ../development/python-modules/poetry-core { }; + csscompressor = callPackage ../development/python-modules/csscompressor { }; - polyline = callPackage ../development/python-modules/polyline { }; + cssmin = callPackage ../development/python-modules/cssmin { }; - postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); + css-parser = callPackage ../development/python-modules/css-parser { }; - pplpy = callPackage ../development/python-modules/pplpy { }; + cssselect2 = callPackage ../development/python-modules/cssselect2 { }; - pprintpp = callPackage ../development/python-modules/pprintpp { }; + cssselect = callPackage ../development/python-modules/cssselect { }; - progress = callPackage ../development/python-modules/progress { }; + cssutils = callPackage ../development/python-modules/cssutils { }; - proglog = callPackage ../development/python-modules/proglog { }; + csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; - pulsectl = callPackage ../development/python-modules/pulsectl { }; + cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; - pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; + cufflinks = callPackage ../development/python-modules/cufflinks { }; - purl = callPackage ../development/python-modules/purl { }; + cupy = callPackage ../development/python-modules/cupy { + cudatoolkit = pkgs.cudatoolkit_10_0; + cudnn = pkgs.cudnn_cudatoolkit_10_0; + nccl = pkgs.nccl_cudatoolkit_10; + }; - pyclipper = callPackage ../development/python-modules/pyclipper { }; + curio = callPackage ../development/python-modules/curio { }; - pymystem3 = callPackage ../development/python-modules/pymystem3 { }; + curtsies = callPackage ../development/python-modules/curtsies { }; - pymysql = callPackage ../development/python-modules/pymysql { }; + curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; - pymupdf = callPackage ../development/python-modules/pymupdf { }; + cvxopt = callPackage ../development/python-modules/cvxopt { }; - pynamecheap = callPackage ../development/python-modules/pynamecheap { }; + cvxpy = callPackage ../development/python-modules/cvxpy { }; - Pmw = callPackage ../development/python-modules/Pmw { }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze { }; - py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; + cx_oracle = callPackage ../development/python-modules/cx_oracle { }; - pyaes = callPackage ../development/python-modules/pyaes { }; + cycler = callPackage ../development/python-modules/cycler { }; - pyairvisual = callPackage ../development/python-modules/pyairvisual { }; + cymem = callPackage ../development/python-modules/cymem { }; - pyamf = callPackage ../development/python-modules/pyamf { }; + cypari2 = callPackage ../development/python-modules/cypari2 { }; - pyarrow = callPackage ../development/python-modules/pyarrow { - inherit (pkgs) arrow-cpp cmake pkgconfig; - }; + cysignals = callPackage ../development/python-modules/cysignals { }; - pyannotate = callPackage ../development/python-modules/pyannotate { }; + cython = callPackage ../development/python-modules/Cython { }; - pyatspi = callPackage ../development/python-modules/pyatspi { - inherit (pkgs) pkgconfig; - }; + cytoolz = callPackage ../development/python-modules/cytoolz { }; - pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; + d2to1 = callPackage ../development/python-modules/d2to1 { }; - pybids = callPackage ../development/python-modules/pybids { }; + daemonize = callPackage ../development/python-modules/daemonize { }; - pybind11 = callPackage ../development/python-modules/pybind11 { }; + daphne = callPackage ../development/python-modules/daphne { }; - py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); + darcsver = callPackage ../development/python-modules/darcsver { }; - pybullet = callPackage ../development/python-modules/pybullet { }; + dash = callPackage ../development/python-modules/dash { }; - pycairo = callPackage ../development/python-modules/pycairo { - inherit (pkgs) meson pkgconfig; - }; + dash-core-components = callPackage ../development/python-modules/dash-core-components { }; - pycategories = callPackage ../development/python-modules/pycategories { }; + dash-html-components = callPackage ../development/python-modules/dash-html-components { }; - pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { - inherit (pkgs) pkgconfig; - }); + dash-renderer = callPackage ../development/python-modules/dash-renderer { }; - pycrc = callPackage ../development/python-modules/pycrc { }; + dash-table = callPackage ../development/python-modules/dash-table { }; - pycrypto = callPackage ../development/python-modules/pycrypto { }; + dask = callPackage ../development/python-modules/dask { }; - pycryptodome = callPackage ../development/python-modules/pycryptodome { }; + dask-gateway = callPackage ../development/python-modules/dask-gateway { }; - pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; + dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { inherit (pkgs) go; }; - PyChromecast = callPackage ../development/python-modules/pychromecast { }; + dask-glm = callPackage ../development/python-modules/dask-glm { }; - pycm = callPackage ../development/python-modules/pycm { }; + dask-image = callPackage ../development/python-modules/dask-image { }; - py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; + dask-jobqueue = callPackage ../development/python-modules/dask-jobqueue { }; - py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; + dask-ml = callPackage ../development/python-modules/dask-ml { }; - py-multibase = callPackage ../development/python-modules/py-multibase { }; + dask-mpi = callPackage ../development/python-modules/dask-mpi { }; - py-multihash = callPackage ../development/python-modules/py-multihash { }; + dask-xgboost = callPackage ../development/python-modules/dask-xgboost { }; - py-radix = callPackage ../development/python-modules/py-radix { }; + databases = callPackage ../development/python-modules/databases { }; - pydbus = callPackage ../development/python-modules/pydbus { }; + databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - pydicom = callPackage ../development/python-modules/pydicom { }; + databricks-connect = callPackage ../development/python-modules/databricks-connect { inherit (pkgs) jdk; }; - pydocstyle = - if isPy27 then - callPackage ../development/python-modules/pydocstyle/2.nix { } - else - callPackage ../development/python-modules/pydocstyle { }; + dataclasses = callPackage ../development/python-modules/dataclasses { }; - pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; + dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; - pydrive = callPackage ../development/python-modules/pydrive { }; + datadiff = callPackage ../development/python-modules/datadiff { }; - pydy = callPackage ../development/python-modules/pydy { }; + datadog = callPackage ../development/python-modules/datadog { }; - pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 {})); + datamodeldict = callPackage ../development/python-modules/datamodeldict { }; - py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; + datasette = callPackage ../development/python-modules/datasette { }; - pyfakefs = callPackage ../development/python-modules/pyfakefs {}; + datashader = callPackage ../development/python-modules/datashader { }; - pyfaidx = callPackage ../development/python-modules/pyfaidx { }; + datashape = callPackage ../development/python-modules/datashape { }; - pyfcm = callPackage ../development/python-modules/pyfcm { }; + datatable = + callPackage ../development/python-modules/datatable { inherit (pkgs.llvmPackages) openmp libcxx libcxxabi; }; - pyfttt = callPackage ../development/python-modules/pyfttt { }; + dateparser = callPackage ../development/python-modules/dateparser { }; - pyftdi = callPackage ../development/python-modules/pyftdi { }; + datrie = callPackage ../development/python-modules/datrie { }; - pygame = callPackage ../development/python-modules/pygame { }; + dbf = callPackage ../development/python-modules/dbf { }; - pygbm = callPackage ../development/python-modules/pygbm { }; + dbfread = callPackage ../development/python-modules/dbfread { }; - pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; + dbus-python = callPackage ../development/python-modules/dbus { inherit (pkgs) dbus pkgconfig; }; - pygdbmi = callPackage ../development/python-modules/pygdbmi { }; + dcmstack = callPackage ../development/python-modules/dcmstack { }; - pygmo = callPackage ../development/python-modules/pygmo { }; + ddt = callPackage ../development/python-modules/ddt { }; - pygobject2 = callPackage ../development/python-modules/pygobject { - inherit (pkgs) pkgconfig; - }; + deap = callPackage ../development/python-modules/deap { }; - pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { - inherit (pkgs) meson pkgconfig; - }; + debian = callPackage ../development/python-modules/debian { }; - pygtail = callPackage ../development/python-modules/pygtail { }; + debts = callPackage ../development/python-modules/debts { }; - pygtk = callPackage ../development/python-modules/pygtk { - inherit (pkgs) pkgconfig; - libglade = null; - }; + debugpy = callPackage ../development/python-modules/debugpy { }; - pygtksourceview = callPackage ../development/python-modules/pygtksourceview { - inherit (pkgs) pkgconfig; - }; + decorator = callPackage ../development/python-modules/decorator { }; - pyGtkGlade = self.pygtk.override { - libglade = pkgs.gnome2.libglade; - }; + deepdiff = callPackage ../development/python-modules/deepdiff { }; - pyjwkest = callPackage ../development/python-modules/pyjwkest { }; + deepmerge = callPackage ../development/python-modules/deepmerge { }; - pykdtree = callPackage ../development/python-modules/pykdtree { - inherit (pkgs.llvmPackages) openmp; - }; + deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; - pykerberos = callPackage ../development/python-modules/pykerberos { }; + defcon = callPackage ../development/python-modules/defcon { }; - pykeepass = callPackage ../development/python-modules/pykeepass { }; + deform = callPackage ../development/python-modules/deform { }; - pylev = callPackage ../development/python-modules/pylev { }; + defusedxml = callPackage ../development/python-modules/defusedxml { }; - pylibftdi = callPackage ../development/python-modules/pylibftdi { - inherit (pkgs) libusb1; - }; + delegator-py = callPackage ../development/python-modules/delegator-py { }; - pymatgen = callPackage ../development/python-modules/pymatgen { }; + deluge-client = callPackage ../development/python-modules/deluge-client { }; - pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; + demjson = callPackage ../development/python-modules/demjson { }; - pymavlink = callPackage ../development/python-modules/pymavlink { }; + dendropy = callPackage ../development/python-modules/dendropy { }; - pymeeus = callPackage ../development/python-modules/pymeeus { }; + denonavr = callPackage ../development/python-modules/denonavr { }; - pymsgbox = callPackage ../development/python-modules/pymsgbox { }; + dependency-injector = callPackage ../development/python-modules/dependency-injector { }; - pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; + deprecated = callPackage ../development/python-modules/deprecated { }; - pynisher = callPackage ../development/python-modules/pynisher { }; + deprecation = callPackage ../development/python-modules/deprecation { }; - pynput = callPackage ../development/python-modules/pynput { }; + derpconf = callPackage ../development/python-modules/derpconf { }; - pyparser = callPackage ../development/python-modules/pyparser { }; + descartes = callPackage ../development/python-modules/descartes { }; - pyres = callPackage ../development/python-modules/pyres { }; + deskcon = callPackage ../development/python-modules/deskcon { }; - PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; + detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { - inherit (pkgs) pkgconfig; - }; + devpi-common = callPackage ../development/python-modules/devpi-common { }; - pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { - pythonPackages = self; - }; + dftfit = callPackage ../development/python-modules/dftfit { }; - /* - `pyqt5_with_qtwebkit` should not be used by python libraries in - pkgs/development/python-modules/*. Putting this attribute in - `propagatedBuildInputs` may cause collisions. - */ - pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + diceware = callPackage ../development/python-modules/diceware { }; - pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + dicom2nifti = callPackage ../development/python-modules/dicom2nifti { }; - pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { - pythonPackages = self; - }; + dict2xml = callPackage ../development/python-modules/dict2xml { }; - pysc2 = callPackage ../development/python-modules/pysc2 { }; + dictionaries = callPackage ../development/python-modules/dictionaries { }; - pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + dicttoxml = callPackage ../development/python-modules/dicttoxml { }; - pyschedule = callPackage ../development/python-modules/pyschedule { }; + diff_cover = callPackage ../development/python-modules/diff_cover { }; - pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; + diff-match-patch = callPackage ../development/python-modules/diff-match-patch { }; - pydsdl = callPackage ../development/python-modules/pydsdl { }; + digital-ocean = callPackage ../development/python-modules/digitalocean { }; - pyside = callPackage ../development/python-modules/pyside { - inherit (pkgs) mesa; - }; + digi-xbee = callPackage ../development/python-modules/digi-xbee { }; - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { - inherit (pkgs) libxml2 libxslt; # Do not need the Python bindings. - }; + dill = callPackage ../development/python-modules/dill { }; - pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; + diofant = callPackage ../development/python-modules/diofant { }; - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { - inherit (pkgs) cmake qt5 ninja; - }); + dipy = callPackage ../development/python-modules/dipy { }; - shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 { - inherit (pkgs) cmake qt5 llvmPackages; - }); + discid = callPackage ../development/python-modules/discid { }; - simplefix = callPackage ../development/python-modules/simplefix { }; + discogs_client = callPackage ../development/python-modules/discogs_client { }; - pyscrypt = callPackage ../development/python-modules/pyscrypt { }; + discordpy = callPackage ../development/python-modules/discordpy { }; - pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools { - inherit (pkgs) cmake qt5; - }); + diskcache = callPackage ../development/python-modules/diskcache { }; - pyslurm = callPackage ../development/python-modules/pyslurm { - slurm = pkgs.slurm; - }; + dissononce = callPackage ../development/python-modules/dissononce { }; - pysmb = callPackage ../development/python-modules/pysmb { }; + distlib = callPackage ../development/python-modules/distlib { }; - pysmf = callPackage ../development/python-modules/pysmf { }; + distorm3 = callPackage ../development/python-modules/distorm3 { }; - pyspinel = callPackage ../development/python-modules/pyspinel {}; + distributed = callPackage ../development/python-modules/distributed { }; - pyssim = callPackage ../development/python-modules/pyssim { }; + distro = callPackage ../development/python-modules/distro { }; - pystache = callPackage ../development/python-modules/pystache { }; + distutils_extra = callPackage ../development/python-modules/distutils_extra { }; - pystray = callPackage ../development/python-modules/pystray { }; + django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; - pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; + django-allauth = callPackage ../development/python-modules/django-allauth { }; - pytesseract = callPackage ../development/python-modules/pytesseract { }; + django-anymail = callPackage ../development/python-modules/django-anymail { }; - pytest-bdd = callPackage ../development/python-modules/pytest-bdd { }; + django_appconf = callPackage ../development/python-modules/django_appconf { }; - pytest-black = callPackage ../development/python-modules/pytest-black { }; + django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; - pytest-click = callPackage ../development/python-modules/pytest-click { }; + django-cache-url = callPackage ../development/python-modules/django-cache-url { }; - pytest-check = callPackage ../development/python-modules/pytest-check { }; + django_classytags = callPackage ../development/python-modules/django_classytags { }; - pytest-env = callPackage ../development/python-modules/pytest-env { }; + django-cleanup = callPackage ../development/python-modules/django-cleanup { }; - pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { }; + django_colorful = callPackage ../development/python-modules/django_colorful { }; - pytest-flask = callPackage ../development/python-modules/pytest-flask { }; + django_compat = callPackage ../development/python-modules/django-compat { }; - pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; + django_compressor = callPackage ../development/python-modules/django_compressor { }; - pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; + django-configurations = callPackage ../development/python-modules/django-configurations { }; - pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; + django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; - pytest-qt = callPackage ../development/python-modules/pytest-qt { }; + django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; - pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; + django-csp = callPackage ../development/python-modules/django-csp { }; - pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; + django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; - pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { }; + django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { }; - pytest-trio = callPackage ../development/python-modules/pytest-trio { }; + django_environ = callPackage ../development/python-modules/django_environ { }; - pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; + django_evolution = callPackage ../development/python-modules/django_evolution { }; - pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; + django_extensions = callPackage ../development/python-modules/django-extensions { }; - pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; + django-filter = callPackage ../development/python-modules/django-filter { }; - pytmx = callPackage ../development/python-modules/pytmx { }; + django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { }; - pythonmagick = callPackage ../development/python-modules/pythonmagick { }; + django_guardian = callPackage ../development/python-modules/django_guardian { }; - python-binance = callPackage ../development/python-modules/python-binance { }; + django-haystack = callPackage ../development/python-modules/django-haystack { }; - python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; + django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; - python-dotenv = callPackage ../development/python-modules/python-dotenv { }; + django_hijack = callPackage ../development/python-modules/django-hijack + { }; # This package may need an older version of Django. Override the package set and set e.g. `django = super.django_1_9`. See the Nixpkgs manual for examples on how to override the package set. - python-engineio = callPackage ../development/python-modules/python-engineio { }; + django-ipware = callPackage ../development/python-modules/django-ipware { }; - python-hosts = callPackage ../development/python-modules/python-hosts { }; + django-jinja = callPackage ../development/python-modules/django-jinja2 { }; - python-lz4 = callPackage ../development/python-modules/python-lz4 { }; - lz4 = self.python-lz4; # alias 2018-12-05 + django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; - python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; + django_lts = self.django_2_2; - python-mnist = callPackage ../development/python-modules/python-mnist { }; + django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; - pythonocc-core = toPythonModule (callPackage ../development/python-modules/pythonocc-core { - inherit (pkgs.xorg) libX11; - }); + django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; - python-igraph = callPackage ../development/python-modules/python-igraph { - pkgconfig = pkgs.pkgconfig; - igraph = pkgs.igraph; - }; + django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; - python-olm = callPackage ../development/python-modules/python-olm { }; + django_nose = callPackage ../development/python-modules/django_nose { }; - python3-openid = callPackage ../development/python-modules/python3-openid { }; + django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; - python-packer = callPackage ../development/python-modules/python-packer { }; + django-paintstore = callPackage ../development/python-modules/django-paintstore { }; - python-periphery = callPackage ../development/python-modules/python-periphery { }; + django-pglocks = callPackage ../development/python-modules/django-pglocks { }; - python-prctl = callPackage ../development/python-modules/python-prctl { }; + django-picklefield = callPackage ../development/python-modules/django-picklefield { }; - python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; + django_pipeline = callPackage ../development/python-modules/django-pipeline { }; - python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; + django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; - python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; + django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; - python-sql = callPackage ../development/python-modules/python-sql { }; + django-q = callPackage ../development/python-modules/django-q { }; - python-snappy = callPackage ../development/python-modules/python-snappy { - inherit (pkgs) snappy; - }; + djangoql = callPackage ../development/python-modules/djangoql { }; - python-stdnum = callPackage ../development/python-modules/python-stdnum { }; + django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; - python-socketio = callPackage ../development/python-modules/python-socketio { }; + django-raster = callPackage ../development/python-modules/django-raster { }; - python-utils = callPackage ../development/python-modules/python-utils { }; + django_redis = callPackage ../development/python-modules/django_redis { }; - python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; + django-rest-auth = callPackage ../development/python-modules/django-rest-auth { }; - pytimeparse = callPackage ../development/python-modules/pytimeparse { }; + djangorestframework = callPackage ../development/python-modules/djangorestframework { }; - pytricia = callPackage ../development/python-modules/pytricia { }; + djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; - pytrends = callPackage ../development/python-modules/pytrends { }; + djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; - py-vapid = callPackage ../development/python-modules/py-vapid { }; + django_reversion = callPackage ../development/python-modules/django_reversion { }; - PyWebDAV = callPackage ../development/python-modules/pywebdav { }; + django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; - pywebpush = callPackage ../development/python-modules/pywebpush { }; + django = self.django_lts; - pywebview = callPackage ../development/python-modules/pywebview { }; + django-sesame = callPackage ../development/python-modules/django-sesame { }; - pywick = callPackage ../development/python-modules/pywick { }; + django_silk = callPackage ../development/python-modules/django_silk { }; - pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml{ }); + django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { }; - pyvcd = callPackage ../development/python-modules/pyvcd { }; + django-sites = callPackage ../development/python-modules/django-sites { }; - pyvcf = callPackage ../development/python-modules/pyvcf { }; + django-sr = callPackage ../development/python-modules/django-sr { }; - pyvoro = callPackage ../development/python-modules/pyvoro { }; + django-storages = callPackage ../development/python-modules/django-storages { }; - radish-bdd = callPackage ../development/python-modules/radish-bdd { }; + django_tagging = callPackage ../development/python-modules/django_tagging { }; - relatorio = callPackage ../development/python-modules/relatorio { }; + django_taggit = callPackage ../development/python-modules/django_taggit { }; - reproject = callPackage ../development/python-modules/reproject { }; + django_treebeard = callPackage ../development/python-modules/django_treebeard { }; - remotecv = callPackage ../development/python-modules/remotecv { }; + django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; - pyzufall = callPackage ../development/python-modules/pyzufall { }; + django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; - rig = callPackage ../development/python-modules/rig { }; + django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; - rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {}); + dj-database-url = callPackage ../development/python-modules/dj-database-url { }; - rlp = callPackage ../development/python-modules/rlp { }; + dj-email-url = callPackage ../development/python-modules/dj-email-url { }; - rq = callPackage ../development/python-modules/rq { }; + djmail = callPackage ../development/python-modules/djmail { }; - rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; + dj-search-url = callPackage ../development/python-modules/dj-search-url { }; - rx = callPackage ../development/python-modules/rx { }; + dkimpy = callPackage ../development/python-modules/dkimpy { }; - sabyenc = callPackage ../development/python-modules/sabyenc { }; + dlib = callPackage ../development/python-modules/dlib { inherit (pkgs) dlib; }; - salmon-mail = callPackage ../development/python-modules/salmon-mail { }; + dlx = callPackage ../development/python-modules/dlx { }; - sanic-auth = callPackage ../development/python-modules/sanic-auth { }; + dmenu-python = callPackage ../development/python-modules/dmenu { }; - sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; + dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; - seekpath = callPackage ../development/python-modules/seekpath { }; + dnslib = callPackage ../development/python-modules/dnslib { }; - selectors2 = callPackage ../development/python-modules/selectors2 { }; + dnspython = callPackage ../development/python-modules/dnspython { }; + dns = self.dnspython; # Alias for compatibility, 2017-12-10 - sacremoses = callPackage ../development/python-modules/sacremoses { }; + doc8 = callPackage ../development/python-modules/doc8 { }; - sentencepiece = callPackage ../development/python-modules/sentencepiece { - inherit (pkgs) sentencepiece pkgconfig; - }; + docker = callPackage ../development/python-modules/docker { }; - tokenizers = disabledIf (!isPy3k) - (toPythonModule (callPackage ../development/python-modules/tokenizers { })); + dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse { }; - towncrier = callPackage ../development/python-modules/towncrier { - inherit (pkgs) git; - }; + dockerpty = callPackage ../development/python-modules/dockerpty { }; - transformers = callPackage ../development/python-modules/transformers { }; + docker_pycreds = callPackage ../development/python-modules/docker-pycreds { }; - transforms3d = callPackage ../development/python-modules/transforms3d { }; + docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py { }); - trimesh = callPackage ../development/python-modules/trimesh {}; + dockerspawner = callPackage ../development/python-modules/dockerspawner { }; - sentinel = callPackage ../development/python-modules/sentinel { }; + docloud = callPackage ../development/python-modules/docloud { }; - sentry-sdk = callPackage ../development/python-modules/sentry-sdk {}; + docopt = callPackage ../development/python-modules/docopt { }; - sepaxml = callPackage ../development/python-modules/sepaxml { }; + docplex = callPackage ../development/python-modules/docplex { }; - serversyncstorage = callPackage ../development/python-modules/serversyncstorage {}; + docrep = callPackage ../development/python-modules/docrep { }; - shellingham = callPackage ../development/python-modules/shellingham {}; + doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; - simpleaudio = callPackage ../development/python-modules/simpleaudio { }; + docutils = callPackage ../development/python-modules/docutils { }; - simpleeval = callPackage ../development/python-modules/simpleeval { }; + dodgy = callPackage ../development/python-modules/dodgy { }; - simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; + dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; - singledispatch = callPackage ../development/python-modules/singledispatch { }; + dogpile_core = callPackage ../development/python-modules/dogpile.core { }; - sip = callPackage ../development/python-modules/sip { }; + dogtail = callPackage ../development/python-modules/dogtail { }; - sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; + dominate = callPackage ../development/python-modules/dominate { }; - sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; + dopy = callPackage ../development/python-modules/dopy { }; - skorch = callPackage ../development/python-modules/skorch { }; + dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; - slackclient = callPackage ../development/python-modules/slackclient { }; + dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { inherit (pkgs) substituteAll dotnet-sdk; }; - slicedimage = callPackage ../development/python-modules/slicedimage { }; + dparse = callPackage ../development/python-modules/dparse { }; - slicerator = callPackage ../development/python-modules/slicerator { }; + dpath = callPackage ../development/python-modules/dpath { }; - slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; + dpkt = callPackage ../development/python-modules/dpkt { }; - sly = callPackage ../development/python-modules/sly { }; + drf-yasg = callPackage ../development/python-modules/drf-yasg { }; - snapcast = callPackage ../development/python-modules/snapcast { }; + drms = callPackage ../development/python-modules/drms { }; - soapysdr = toPythonModule (pkgs.soapysdr.override { - python = self.python; - usePython = true; - }); + dropbox = callPackage ../development/python-modules/dropbox { }; - soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { - python = self.python; - usePython = true; - }); + ds4drv = callPackage ../development/python-modules/ds4drv { inherit (pkgs) fetchFromGitHub bluez; }; - softlayer = callPackage ../development/python-modules/softlayer { }; + dtopt = callPackage ../development/python-modules/dtopt { }; - sparse = callPackage ../development/python-modules/sparse { }; + duckdb = callPackage ../development/python-modules/duckdb { duckdb = pkgs.duckdb; }; - spglib = callPackage ../development/python-modules/spglib { }; + duecredit = callPackage ../development/python-modules/duecredit { }; - spidev = callPackage ../development/python-modules/spidev { }; + dugong = callPackage ../development/python-modules/dugong { }; - srvlookup = callPackage ../development/python-modules/srvlookup { }; + dulwich = if isPy3k then + callPackage ../development/python-modules/dulwich { } + else + callPackage ../development/python-modules/dulwich/0_19.nix { }; - sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; + dyn = callPackage ../development/python-modules/dyn { }; - sshtunnel = callPackage ../development/python-modules/sshtunnel { }; + dynd = callPackage ../development/python-modules/dynd { }; - sslib = callPackage ../development/python-modules/sslib { }; + easydict = callPackage ../development/python-modules/easydict { }; - sslyze = callPackage ../development/python-modules/sslyze { }; + easygui = callPackage ../development/python-modules/easygui { }; - statistics = callPackage ../development/python-modules/statistics { }; + EasyProcess = callPackage ../development/python-modules/easyprocess { }; - stm32loader = callPackage ../development/python-modules/stm32loader { }; + easysnmp = callPackage ../development/python-modules/easysnmp { + openssl = pkgs.openssl; + net-snmp = pkgs.net-snmp; + }; - stumpy = callPackage ../development/python-modules/stumpy { }; + easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; - stups-cli-support = callPackage ../development/python-modules/stups-cli-support { }; + easywatch = callPackage ../development/python-modules/easywatch { }; - stups-fullstop = callPackage ../development/python-modules/stups-fullstop { }; + eccodes = toPythonModule (pkgs.eccodes.override { + enablePython = true; + pythonPackages = self; + }); - stups-pierone = callPackage ../development/python-modules/stups-pierone { }; + ecdsa = callPackage ../development/python-modules/ecdsa { }; - stups-tokens = callPackage ../development/python-modules/stups-tokens { }; + ecos = callPackage ../development/python-modules/ecos { }; - stups-zign = callPackage ../development/python-modules/stups-zign { }; + ecpy = callPackage ../development/python-modules/ecpy { }; - sumo = callPackage ../development/python-modules/sumo { }; + ed25519 = callPackage ../development/python-modules/ed25519 { }; - supervise_api = callPackage ../development/python-modules/supervise_api { }; + editorconfig = callPackage ../development/python-modules/editorconfig { }; - tables = if isPy3k then callPackage ../development/python-modules/tables { - hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; - } else callPackage ../development/python-modules/tables/3.5.nix { - hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; - }; + edward = callPackage ../development/python-modules/edward { }; - tag-expressions = callPackage ../development/python-modules/tag-expressions { }; + effect = callPackage ../development/python-modules/effect { }; - tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; + eggdeps = callPackage ../development/python-modules/eggdeps { }; - tesserocr = callPackage ../development/python-modules/tesserocr { }; + elasticsearch = callPackage ../development/python-modules/elasticsearch { }; - tls-parser = callPackage ../development/python-modules/tls-parser { }; + elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; - trueskill = callPackage ../development/python-modules/trueskill { }; + elasticsearchdsl = self.elasticsearch-dsl; # alias - trustme = callPackage ../development/python-modules/trustme {}; + elementpath = callPackage ../development/python-modules/elementpath { }; - trio = callPackage ../development/python-modules/trio {}; + eliot = callPackage ../development/python-modules/eliot { }; - sniffio = callPackage ../development/python-modules/sniffio { }; + emailthreads = callPackage ../development/python-modules/emailthreads { }; - spyder-kernels = callPackage ../development/python-modules/spyder-kernels {}; - spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix {}; + email_validator = callPackage ../development/python-modules/email-validator { }; - spyder = callPackage ../development/python-modules/spyder {}; - spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; + emcee = callPackage ../development/python-modules/emcee { }; - tenacity = callPackage ../development/python-modules/tenacity { }; + emoji = callPackage ../development/python-modules/emoji { }; - tokenserver = callPackage ../development/python-modules/tokenserver {}; + enaml = callPackage ../development/python-modules/enaml { }; - toml = callPackage ../development/python-modules/toml { }; + enamlx = callPackage ../development/python-modules/enamlx { }; - tomlkit = callPackage ../development/python-modules/tomlkit { }; + entrance = callPackage ../development/python-modules/entrance { routerFeatures = false; }; - toggl-cli = callPackage ../development/python-modules/toggl-cli { }; + entrance-with-router-features = callPackage ../development/python-modules/entrance { routerFeatures = true; }; - uamqp = callPackage ../development/python-modules/uamqp { - inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; - }; + entrypoints = callPackage ../development/python-modules/entrypoints { }; - unifi = callPackage ../development/python-modules/unifi { }; + enum34 = callPackage ../development/python-modules/enum34 { }; - uvcclient = callPackage ../development/python-modules/uvcclient { }; + enum = callPackage ../development/python-modules/enum { }; - uvloop = callPackage ../development/python-modules/uvloop { - inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; - }; + enum-compat = callPackage ../development/python-modules/enum-compat { }; - pyuavcan = callPackage ../development/python-modules/pyuavcan { - # this version pinpoint to anold version is necessary due to a regression - nunavut = self.nunavut.overridePythonAttrs ( old: rec { - version = "0.2.3"; - src = old.src.override { - inherit version; - sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; - }; - }); - }; + envisage = callPackage ../development/python-modules/envisage { }; - pyunifi = callPackage ../development/python-modules/pyunifi { }; + envs = callPackage ../development/python-modules/envs { }; - vdf = callPackage ../development/python-modules/vdf { }; + enzyme = callPackage ../development/python-modules/enzyme { }; - vdirsyncer = callPackage ../development/python-modules/vdirsyncer { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; - inherit (pkgs) pkg-config openssl rustPlatform; - }; + epc = callPackage ../development/python-modules/epc { }; - vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; + ephem = callPackage ../development/python-modules/ephem { }; - vidstab = callPackage ../development/python-modules/vidstab { }; + eradicate = callPackage ../development/python-modules/eradicate { }; - webapp2 = callPackage ../development/python-modules/webapp2 { }; + escapism = callPackage ../development/python-modules/escapism { }; - webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; + etcd = callPackage ../development/python-modules/etcd { }; - wordcloud = callPackage ../development/python-modules/wordcloud { }; + etelemetry = callPackage ../development/python-modules/etelemetry { }; - wrf-python = callPackage ../development/python-modules/wrf-python { }; + etesync = callPackage ../development/python-modules/etesync { }; - pyunbound = callPackage ../tools/networking/unbound/python.nix { }; + eth-hash = callPackage ../development/python-modules/eth-hash { }; - WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; + eth-typing = callPackage ../development/python-modules/eth-typing { }; - yarg = callPackage ../development/python-modules/yarg { }; + eth-utils = callPackage ../development/python-modules/eth-utils { }; - yt = callPackage ../development/python-modules/yt { }; + et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; - # packages defined here + evdev = callPackage ../development/python-modules/evdev { }; - aafigure = callPackage ../development/python-modules/aafigure { }; + eve = callPackage ../development/python-modules/eve { }; - addic7ed-cli = callPackage ../development/python-modules/addic7ed-cli { }; + eventlet = callPackage ../development/python-modules/eventlet { }; - algebraic-data-types = callPackage ../development/python-modules/algebraic-data-types { }; + eventlib = callPackage ../development/python-modules/eventlib { }; - altair = callPackage ../development/python-modules/altair { }; + events = callPackage ../development/python-modules/events { }; - vega = callPackage ../development/python-modules/vega { }; + evernote = callPackage ../development/python-modules/evernote { }; - accupy = callPackage ../development/python-modules/accupy { }; + ewmh = callPackage ../development/python-modules/ewmh { }; - acme = callPackage ../development/python-modules/acme { }; + exchangelib = callPackage ../development/python-modules/exchangelib { }; - acme-tiny = callPackage ../development/python-modules/acme-tiny { }; + execnet = callPackage ../development/python-modules/execnet { }; - actdiag = callPackage ../development/python-modules/actdiag { }; + executing = callPackage ../development/python-modules/executing { }; - adal = callPackage ../development/python-modules/adal { }; + executor = callPackage ../development/python-modules/executor { }; - affine = callPackage ../development/python-modules/affine { }; + exifread = callPackage ../development/python-modules/exifread { }; - aioconsole = callPackage ../development/python-modules/aioconsole { }; + extension-helpers = callPackage ../development/python-modules/extension-helpers { }; - aiodns = callPackage ../development/python-modules/aiodns { }; + extras = callPackage ../development/python-modules/extras { }; - aiofiles = callPackage ../development/python-modules/aiofiles { }; + eyeD3 = callPackage ../development/python-modules/eyed3 { }; - aioh2 = callPackage ../development/python-modules/aioh2 { }; + ezdxf = callPackage ../development/python-modules/ezdxf { }; - aioftp = callPackage ../development/python-modules/aioftp { }; + Fabric = callPackage ../development/python-modules/Fabric { }; - aioharmony = callPackage ../development/python-modules/aioharmony { }; + facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; - aiohttp = callPackage ../development/python-modules/aiohttp { }; + face = callPackage ../development/python-modules/face { }; - aiohttp-cors = callPackage ../development/python-modules/aiohttp-cors { }; + facedancer = callPackage ../development/python-modules/facedancer { }; - aiohttp-jinja2 = callPackage ../development/python-modules/aiohttp-jinja2 { }; + face_recognition = callPackage ../development/python-modules/face_recognition { }; - aiohttp-remotes = callPackage ../development/python-modules/aiohttp-remotes { }; + face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; - aiohttp-socks = callPackage ../development/python-modules/aiohttp-socks { }; + factory_boy = callPackage ../development/python-modules/factory_boy { }; - aiohttp-swagger = callPackage ../development/python-modules/aiohttp-swagger { }; + fake_factory = callPackage ../development/python-modules/fake_factory { }; - aiomysql = callPackage ../development/python-modules/aiomysql { }; + faker = callPackage ../development/python-modules/faker { }; - aioprocessing = callPackage ../development/python-modules/aioprocessing { }; + fake-useragent = callPackage ../development/python-modules/fake-useragent { }; - aioresponses = callPackage ../development/python-modules/aioresponses { }; + falcon = callPackage ../development/python-modules/falcon { }; - aiosqlite = callPackage ../development/python-modules/aiosqlite { }; + fastapi = callPackage ../development/python-modules/fastapi { }; - aiorpcx = callPackage ../development/python-modules/aiorpcx { }; + fastcache = callPackage ../development/python-modules/fastcache { }; - aiosmtpd = callPackage ../development/python-modules/aiosmtpd { }; + fastdtw = callPackage ../development/python-modules/fastdtw { }; - aiounifi = callPackage ../development/python-modules/aiounifi { }; + fasteners = callPackage ../development/python-modules/fasteners { }; - aiounittest = callPackage ../development/python-modules/aiounittest { }; + fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; - aiozeroconf = callPackage ../development/python-modules/aiozeroconf { }; + fastimport = callPackage ../development/python-modules/fastimport { }; - ajpy = callPackage ../development/python-modules/ajpy { }; + fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; - alabaster = callPackage ../development/python-modules/alabaster {}; + fastpair = callPackage ../development/python-modules/fastpair { }; - alarmdecoder = callPackage ../development/python-modules/alarmdecoder {}; + fastparquet = callPackage ../development/python-modules/fastparquet { }; - alembic = callPackage ../development/python-modules/alembic {}; + fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; - allpairspy = callPackage ../development/python-modules/allpairspy { }; + fastrlock = callPackage ../development/python-modules/fastrlock { }; - annexremote = callPackage ../development/python-modules/annexremote { }; + fasttext = callPackage ../development/python-modules/fasttext { }; - ansible = callPackage ../development/python-modules/ansible { }; + faulthandler = if !isPy3k then + callPackage ../development/python-modules/faulthandler { } + else + throw "faulthandler is built into ${python.executable}"; - ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; + favicon = callPackage ../development/python-modules/favicon { }; - ansible-lint = callPackage ../development/python-modules/ansible-lint { }; + fb-re2 = callPackage ../development/python-modules/fb-re2 { }; - ansible-runner = callPackage ../development/python-modules/ansible-runner { }; + fdint = callPackage ../development/python-modules/fdint { }; - ansicolors = callPackage ../development/python-modules/ansicolors {}; + feedgen = callPackage ../development/python-modules/feedgen { }; - aniso8601 = callPackage ../development/python-modules/aniso8601 {}; + feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; }; - anonip = callPackage ../development/python-modules/anonip { }; + feedparser = callPackage ../development/python-modules/feedparser { }; - asgiref = callPackage ../development/python-modules/asgiref { }; + fenics = callPackage ../development/libraries/science/math/fenics { + inherit (pkgs) pkg-config; + mpi = pkgs.openmpi; + pytest = self.pytest_4; + }; - python-editor = callPackage ../development/python-modules/python-editor { }; + ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; - python-gnupg = callPackage ../development/python-modules/python-gnupg {}; + fido2 = callPackage ../development/python-modules/fido2 { }; - python-uinput = callPackage ../development/python-modules/python-uinput {}; + filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; - python-sybase = callPackage ../development/python-modules/sybase {}; + filebytes = callPackage ../development/python-modules/filebytes { }; - alot = callPackage ../development/python-modules/alot {}; + filelock = callPackage ../development/python-modules/filelock { }; - anyjson = callPackage ../development/python-modules/anyjson {}; + filemagic = callPackage ../development/python-modules/filemagic { }; - amqp = callPackage ../development/python-modules/amqp {}; + filetype = callPackage ../development/python-modules/filetype { }; - amqplib = callPackage ../development/python-modules/amqplib {}; + filterpy = callPackage ../development/python-modules/filterpy { }; - antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; + finalfusion = callPackage ../development/python-modules/finalfusion { }; - antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + fints = callPackage ../development/python-modules/fints { }; - apache-airflow = callPackage ../development/python-modules/apache-airflow { }; + fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; - apipkg = callPackage ../development/python-modules/apipkg {}; + fipy = callPackage ../development/python-modules/fipy { }; - apispec = callPackage ../development/python-modules/apispec {}; + fire = callPackage ../development/python-modules/fire { }; - appdirs = callPackage ../development/python-modules/appdirs { }; + firetv = callPackage ../development/python-modules/firetv { }; - appleseed = disabledIf isPy3k - (toPythonModule (pkgs.appleseed.override { - inherit (self) python; - })); + first = callPackage ../development/python-modules/first { }; - application = callPackage ../development/python-modules/application { }; + fitbit = callPackage ../development/python-modules/fitbit { }; - applicationinsights = callPackage ../development/python-modules/applicationinsights { }; + fixtures = callPackage ../development/python-modules/fixtures { }; - appnope = callPackage ../development/python-modules/appnope { }; + flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; - approvaltests = callPackage ../development/python-modules/approvaltests { }; + flake8 = callPackage ../development/python-modules/flake8 { }; - apptools = callPackage ../development/python-modules/apptools {}; + flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; - apsw = callPackage ../development/python-modules/apsw {}; + flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; - astor = callPackage ../development/python-modules/astor {}; + flake8-import-order = callPackage ../development/python-modules/flake8-import-order { }; - asyncpg = callPackage ../development/python-modules/asyncpg { }; + flake8-polyfill = callPackage ../development/python-modules/flake8-polyfill { }; - asyncssh = callPackage ../development/python-modules/asyncssh { }; + flaky = callPackage ../development/python-modules/flaky { }; - atpublic = callPackage ../development/python-modules/atpublic { }; + flammkuchen = callPackage ../development/python-modules/flammkuchen { }; - python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; + flask-admin = callPackage ../development/python-modules/flask-admin { }; - funcsigs = callPackage ../development/python-modules/funcsigs { }; + flask-api = callPackage ../development/python-modules/flask-api { }; - APScheduler = callPackage ../development/python-modules/APScheduler { }; + flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { }; - args = callPackage ../development/python-modules/args { }; + flask_assets = callPackage ../development/python-modules/flask-assets { }; - argcomplete = callPackage ../development/python-modules/argcomplete { }; + flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; - area = callPackage ../development/python-modules/area { }; + flask-babel = callPackage ../development/python-modules/flask-babel { }; - arxiv2bib = callPackage ../development/python-modules/arxiv2bib { }; + flaskbabel = callPackage ../development/python-modules/flaskbabel { }; - chai = callPackage ../development/python-modules/chai { }; + flask-babelex = callPackage ../development/python-modules/flask-babelex { }; - chainmap = callPackage ../development/python-modules/chainmap { }; + flask-bcrypt = callPackage ../development/python-modules/flask-bcrypt { }; - arelle = callPackage ../development/python-modules/arelle { - gui = true; - }; + flask-bootstrap = callPackage ../development/python-modules/flask-bootstrap { }; - arelle-headless = callPackage ../development/python-modules/arelle { - gui = false; - }; + flask-caching = callPackage ../development/python-modules/flask-caching { }; - delegator-py = callPackage ../development/python-modules/delegator-py { }; + flask = callPackage ../development/python-modules/flask { }; - deluge-client = callPackage ../development/python-modules/deluge-client { }; + flask-common = callPackage ../development/python-modules/flask-common { }; - arrow = callPackage ../development/python-modules/arrow { }; + flask-compress = callPackage ../development/python-modules/flask-compress { }; - asynctest = callPackage ../development/python-modules/asynctest { }; + flask-cors = callPackage ../development/python-modules/flask-cors { }; - async-timeout = callPackage ../development/python-modules/async_timeout { }; + flask_elastic = callPackage ../development/python-modules/flask-elastic { }; - async_generator = callPackage ../development/python-modules/async_generator { }; + flask-httpauth = callPackage ../development/python-modules/flask-httpauth { }; - async-upnp-client = callPackage ../development/python-modules/async-upnp-client { }; + flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; - asn1ate = callPackage ../development/python-modules/asn1ate { }; + flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; - atlassian-python-api = callPackage ../development/python-modules/atlassian-python-api { }; + flask-limiter = callPackage ../development/python-modules/flask-limiter { }; - atomiclong = callPackage ../development/python-modules/atomiclong { }; + flask_login = callPackage ../development/python-modules/flask-login { }; - atomicwrites = callPackage ../development/python-modules/atomicwrites { }; + flask_mail = callPackage ../development/python-modules/flask-mail { }; - astroid = if isPy3k then callPackage ../development/python-modules/astroid { } - else callPackage ../development/python-modules/astroid/1.6.nix { }; + flask_marshmallow = callPackage ../development/python-modules/flask-marshmallow { }; - attrdict = callPackage ../development/python-modules/attrdict { }; + flask_migrate = callPackage ../development/python-modules/flask-migrate { }; - attrs = callPackage ../development/python-modules/attrs { }; + flask-mongoengine = callPackage ../development/python-modules/flask-mongoengine { }; - atsim_potentials = callPackage ../development/python-modules/atsim_potentials { }; + flask-openid = callPackage ../development/python-modules/flask-openid { }; - audio-metadata = callPackage ../development/python-modules/audio-metadata { }; + flask-paginate = callPackage ../development/python-modules/flask-paginate { }; - audioread = callPackage ../development/python-modules/audioread { }; + flask_principal = callPackage ../development/python-modules/flask-principal { }; - audiotools = callPackage ../development/python-modules/audiotools { }; + flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; - autopep8 = callPackage ../development/python-modules/autopep8 { }; + flask-restful = callPackage ../development/python-modules/flask-restful { }; - av = callPackage ../development/python-modules/av { - inherit (pkgs) pkgconfig; - }; + flask-restplus = callPackage ../development/python-modules/flask-restplus { }; - avro = callPackage ../development/python-modules/avro {}; + flask-restx = callPackage ../development/python-modules/flask-restx { }; - avro3k = callPackage ../development/python-modules/avro3k {}; + flask-reverse-proxy-fix = callPackage ../development/python-modules/flask-reverse-proxy-fix { }; - avro-python3 = callPackage ../development/python-modules/avro-python3 {}; + flask_script = callPackage ../development/python-modules/flask-script { }; - aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { }; + flask-silk = callPackage ../development/python-modules/flask-silk { }; - python-slugify = callPackage ../development/python-modules/python-slugify { }; + flask-socketio = callPackage ../development/python-modules/flask-socketio { }; - awesome-slugify = callPackage ../development/python-modules/awesome-slugify {}; + flask-sockets = callPackage ../development/python-modules/flask-sockets { }; - noise = callPackage ../development/python-modules/noise {}; + flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; - backcall = callPackage ../development/python-modules/backcall { }; + flask-swagger = callPackage ../development/python-modules/flask-swagger { }; - backoff = callPackage ../development/python-modules/backoff { }; + flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { }; - backports_abc = callPackage ../development/python-modules/backports_abc { }; + flask_testing = callPackage ../development/python-modules/flask-testing { }; - backports_functools_lru_cache = callPackage ../development/python-modules/backports_functools_lru_cache { }; + flask-versioned = callPackage ../development/python-modules/flask-versioned { }; - backports_os = callPackage ../development/python-modules/backports_os { }; + flask_wtf = callPackage ../development/python-modules/flask-wtf { }; - backports_shutil_get_terminal_size = callPackage ../development/python-modules/backports_shutil_get_terminal_size { }; + flexmock = callPackage ../development/python-modules/flexmock { }; - backports_ssl_match_hostname = if !(pythonOlder "3.5") then null else - callPackage ../development/python-modules/backports_ssl_match_hostname { }; + flickrapi = callPackage ../development/python-modules/flickrapi { }; - backports_lzma = callPackage ../development/python-modules/backports_lzma { }; + flit = callPackage ../development/python-modules/flit { }; - backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; + flit-core = callPackage ../development/python-modules/flit-core { }; - backports_unittest-mock = callPackage ../development/python-modules/backports_unittest-mock {}; + flower = callPackage ../development/python-modules/flower { }; - babelfish = callPackage ../development/python-modules/babelfish {}; + flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; - bandit = callPackage ../development/python-modules/bandit {}; + fluent-logger = callPackage ../development/python-modules/fluent-logger { }; - basiciw = callPackage ../development/python-modules/basiciw { - inherit (pkgs) gcc wirelesstools; - }; + flufl_bounce = callPackage ../development/python-modules/flufl/bounce.nix { }; - base58 = callPackage ../development/python-modules/base58 {}; + flufl_i18n = callPackage ../development/python-modules/flufl/i18n.nix { }; - batchgenerators = callPackage ../development/python-modules/batchgenerators { }; + flufl_lock = callPackage ../development/python-modules/flufl/lock.nix { }; - batinfo = callPackage ../development/python-modules/batinfo {}; + flup = callPackage ../development/python-modules/flup { }; - bcdoc = callPackage ../development/python-modules/bcdoc {}; + flux-led = callPackage ../development/python-modules/flux-led { }; - beancount = callPackage ../development/python-modules/beancount { }; + fn = callPackage ../development/python-modules/fn { }; - beautifulsoup4 = callPackage ../development/python-modules/beautifulsoup4 { }; + folium = callPackage ../development/python-modules/folium { }; - beaker = callPackage ../development/python-modules/beaker { }; + fontforge = disabledIf (!isPy3k) (toPythonModule (pkgs.fontforge.override { + withPython = true; + inherit python; + })); - bespon = callPackage ../development/python-modules/bespon { }; + fontmath = callPackage ../development/python-modules/fontmath { }; - betamax = callPackage ../development/python-modules/betamax {}; + fontparts = callPackage ../development/python-modules/fontparts { }; - betamax-matchers = callPackage ../development/python-modules/betamax-matchers { }; + fontpens = callPackage ../development/python-modules/fontpens { }; - betamax-serializers = callPackage ../development/python-modules/betamax-serializers { }; + fonttools = callPackage ../development/python-modules/fonttools { }; - bibtexparser = callPackage ../development/python-modules/bibtexparser { }; + foolscap = callPackage ../development/python-modules/foolscap { }; - bidict = callPackage ../development/python-modules/bidict { }; + forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; - bids-validator = callPackage ../development/python-modules/bids-validator { }; + FormEncode = callPackage ../development/python-modules/FormEncode { }; - binwalk = callPackage ../development/python-modules/binwalk { - pyqtgraph = null; - matplotlib = null; - }; + foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; + foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; + foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; + foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; - binwalk-full = appendToName "full" (self.binwalk.override { - pyqtgraph = self.pyqtgraph; - matplotlib = self.matplotlib; - }); + foxdot = callPackage ../development/python-modules/foxdot { }; - bitmath = callPackage ../development/python-modules/bitmath { }; + fpdf = callPackage ../development/python-modules/fpdf { }; - bitstruct = callPackage ../development/python-modules/bitstruct { }; + fpylll = callPackage ../development/python-modules/fpylll { }; - caldav = callPackage ../development/python-modules/caldav { }; + freetype-py = callPackage ../development/python-modules/freetype-py { }; - biopython = callPackage ../development/python-modules/biopython { }; + freezegun = callPackage ../development/python-modules/freezegun { }; - bedup = callPackage ../development/python-modules/bedup { }; + fritzconnection = callPackage ../development/python-modules/fritzconnection { }; - blessed = callPackage ../development/python-modules/blessed {}; + frozendict = callPackage ../development/python-modules/frozendict { }; - block-io = callPackage ../development/python-modules/block-io {}; + fs = callPackage ../development/python-modules/fs { }; - # Build boost for this specific Python version - # TODO: use separate output for libboost_python.so - boost = toPythonModule (pkgs.boost.override { - inherit (self) python numpy; - enablePython = true; - }); + fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; - boltztrap2 = callPackage ../development/python-modules/boltztrap2 { }; + fsspec = callPackage ../development/python-modules/fsspec { }; - boolean-py = callPackage ../development/python-modules/boolean-py { }; + ftfy = callPackage ../development/python-modules/ftfy { }; - bumps = callPackage ../development/python-modules/bumps {}; + ftputil = callPackage ../development/python-modules/ftputil { }; - bx-python = callPackage ../development/python-modules/bx-python { - inherit (pkgs) zlib; - }; + fudge = callPackage ../development/python-modules/fudge { }; - cached-property = callPackage ../development/python-modules/cached-property { }; + funcparserlib = callPackage ../development/python-modules/funcparserlib { }; - caffe = toPythonModule (pkgs.caffe.override { - pythonSupport = true; - inherit (self) python numpy boost; - }); + funcsigs = callPackage ../development/python-modules/funcsigs { }; - capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; }; + functools32 = callPackage ../development/python-modules/functools32 { }; - capturer = callPackage ../development/python-modules/capturer { }; + funcy = callPackage ../development/python-modules/funcy { }; - cement = callPackage ../development/python-modules/cement {}; + furl = callPackage ../development/python-modules/furl { }; - cgen = callPackage ../development/python-modules/cgen { }; + fuse = callPackage ../development/python-modules/fuse-python { inherit (pkgs) fuse pkgconfig; }; - cgroup-utils = callPackage ../development/python-modules/cgroup-utils {}; + fusepy = callPackage ../development/python-modules/fusepy { }; - chainer = callPackage ../development/python-modules/chainer { - cudaSupport = pkgs.config.cudaSupport or false; - }; + future = callPackage ../development/python-modules/future { }; - channels = callPackage ../development/python-modules/channels {}; + future-fstrings = callPackage ../development/python-modules/future-fstrings { }; - cheroot = callPackage ../development/python-modules/cheroot {}; + futures = callPackage ../development/python-modules/futures { }; - chevron = callPackage ../development/python-modules/chevron {}; + fuzzywuzzy = callPackage ../development/python-modules/fuzzywuzzy { }; - ci-info = callPackage ../development/python-modules/ci-info { }; + fx2 = callPackage ../development/python-modules/fx2 { }; - ci-py = callPackage ../development/python-modules/ci-py { }; + gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { + pythonPackages = self; + pythonSupport = true; + })); # gaia isn't supported with python3 and it's not available from pypi - cli-helpers = callPackage ../development/python-modules/cli-helpers {}; + galario = toPythonModule (pkgs.galario.override { + enablePython = true; + pythonPackages = self; + }); - cmarkgfm = callPackage ../development/python-modules/cmarkgfm { }; + gast = callPackage ../development/python-modules/gast { }; - cirq = callPackage ../development/python-modules/cirq { }; + gateone = callPackage ../development/python-modules/gateone { }; - citeproc-py = callPackage ../development/python-modules/citeproc-py { }; + gcovr = callPackage ../development/python-modules/gcovr { }; - colorcet = callPackage ../development/python-modules/colorcet { }; + gdal = toPythonModule (pkgs.gdal.override { pythonPackages = self; }); - coloredlogs = callPackage ../development/python-modules/coloredlogs { }; + gdata = callPackage ../development/python-modules/gdata { }; - colorclass = callPackage ../development/python-modules/colorclass {}; + gdcm = disabledIf isPy27 (toPythonModule (pkgs.gdcm.override { + inherit (self) python; + enablePython = true; + })); - colorful = callPackage ../development/python-modules/colorful {}; + gdown = callPackage ../development/python-modules/gdown { }; - colorlog = callPackage ../development/python-modules/colorlog { }; + gdrivefs = callPackage ../development/python-modules/gdrivefs { }; - colorspacious = callPackage ../development/python-modules/colorspacious { }; + geant4 = disabledIf (!isPy3k) (toPythonModule (pkgs.geant4.override { + enablePython = true; + python3 = python; + })); - colour = callPackage ../development/python-modules/colour {}; + geeknote = callPackage ../development/python-modules/geeknote { }; - colormath = callPackage ../development/python-modules/colormath {}; + genanki = callPackage ../development/python-modules/genanki { }; - configshell = callPackage ../development/python-modules/configshell { }; + genpy = callPackage ../development/python-modules/genpy { }; - consonance = callPackage ../development/python-modules/consonance { }; + genshi = callPackage ../development/python-modules/genshi { }; - constantly = callPackage ../development/python-modules/constantly { }; + gensim = callPackage ../development/python-modules/gensim { }; - cornice = callPackage ../development/python-modules/cornice { }; + gentools = callPackage ../development/python-modules/gentools { }; - crashtest = callPackage ../development/python-modules/crashtest { }; + genzshcomp = callPackage ../development/python-modules/genzshcomp { }; - cram = callPackage ../development/python-modules/cram { }; + geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { }; - crc16 = callPackage ../development/python-modules/crc16 { }; + geographiclib = callPackage ../development/python-modules/geographiclib { }; - crccheck = callPackage ../development/python-modules/crccheck { }; + geoip2 = callPackage ../development/python-modules/geoip2 { }; - croniter = callPackage ../development/python-modules/croniter { }; + GeoIP = callPackage ../development/python-modules/GeoIP { }; - csscompressor = callPackage ../development/python-modules/csscompressor {}; + geojson = callPackage ../development/python-modules/geojson { }; - csvs-to-sqlite = callPackage ../development/python-modules/csvs-to-sqlite { }; + geopandas = callPackage ../development/python-modules/geopandas { }; - cufflinks = callPackage ../development/python-modules/cufflinks { }; + geopy = if isPy3k then + callPackage ../development/python-modules/geopy { } + else + callPackage ../development/python-modules/geopy/2.nix { }; - cupy = callPackage ../development/python-modules/cupy { - cudatoolkit = pkgs.cudatoolkit_10_0; - cudnn = pkgs.cudnn_cudatoolkit_10_0; - nccl = pkgs.nccl_cudatoolkit_10; - }; + getmac = callPackage ../development/python-modules/getmac { }; - cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; + gevent = callPackage ../development/python-modules/gevent { }; - cx_oracle = callPackage ../development/python-modules/cx_oracle {}; + geventhttpclient = callPackage ../development/python-modules/geventhttpclient { }; - cvxopt = callPackage ../development/python-modules/cvxopt { }; + gevent-socketio = callPackage ../development/python-modules/gevent-socketio { }; - cvxpy = callPackage ../development/python-modules/cvxpy { }; + gevent-websocket = callPackage ../development/python-modules/gevent-websocket { }; - cycler = callPackage ../development/python-modules/cycler { }; + gflags = callPackage ../development/python-modules/gflags { }; - cysignals = callPackage ../development/python-modules/cysignals { }; + ghdiff = callPackage ../development/python-modules/ghdiff { }; - cypari2 = callPackage ../development/python-modules/cypari2 { }; + gidgethub = callPackage ../development/python-modules/gidgethub { }; - dlib = callPackage ../development/python-modules/dlib { - inherit (pkgs) dlib; - }; + gin-config = callPackage ../development/python-modules/gin-config { }; - datadog = callPackage ../development/python-modules/datadog {}; + gipc = callPackage ../development/python-modules/gipc { }; - dataclasses = callPackage ../development/python-modules/dataclasses { }; + git-annex-adapter = + callPackage ../development/python-modules/git-annex-adapter { inherit (pkgs.gitAndTools) git-annex; }; - dataclasses-json = callPackage ../development/python-modules/dataclasses-json { }; + gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 - debian = callPackage ../development/python-modules/debian {}; + gitdb = callPackage ../development/python-modules/gitdb { }; - defusedxml = callPackage ../development/python-modules/defusedxml {}; + github3_py = callPackage ../development/python-modules/github3_py { }; - dodgy = callPackage ../development/python-modules/dodgy { }; + github-webhook = callPackage ../development/python-modules/github-webhook { }; - duecredit = callPackage ../development/python-modules/duecredit { }; + GitPython = callPackage ../development/python-modules/GitPython { }; - dugong = callPackage ../development/python-modules/dugong {}; + git-revise = callPackage ../development/python-modules/git-revise { }; - easysnmp = callPackage ../development/python-modules/easysnmp { - openssl = pkgs.openssl; - net-snmp = pkgs.net-snmp; - }; + git-sweep = callPackage ../development/python-modules/git-sweep { }; - iowait = callPackage ../development/python-modules/iowait {}; + glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 - responses = callPackage ../development/python-modules/responses {}; + glasgow = callPackage ../development/python-modules/glasgow { }; - rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; + glob2 = callPackage ../development/python-modules/glob2 { }; - proboscis = callPackage ../development/python-modules/proboscis {}; + globre = callPackage ../development/python-modules/globre { }; - poster3 = callPackage ../development/python-modules/poster3 { }; + globus-sdk = callPackage ../development/python-modules/globus-sdk { }; - py4j = callPackage ../development/python-modules/py4j { }; + glom = callPackage ../development/python-modules/glom { }; - pyechonest = callPackage ../development/python-modules/pyechonest { }; + glymur = callPackage ../development/python-modules/glymur { }; - pyepsg = callPackage ../development/python-modules/pyepsg { }; + gmpy2 = callPackage ../development/python-modules/gmpy2 { }; - billiard = callPackage ../development/python-modules/billiard { }; + gmpy = callPackage ../development/python-modules/gmpy { }; - binaryornot = callPackage ../development/python-modules/binaryornot { }; + gmusicapi = callPackage ../development/python-modules/gmusicapi { }; - bitbucket_api = callPackage ../development/python-modules/bitbucket-api { }; + gnureadline = callPackage ../development/python-modules/gnureadline { }; - bitbucket-cli = callPackage ../development/python-modules/bitbucket-cli { }; + gnutls = callPackage ../development/python-modules/gnutls { }; - bitstring = callPackage ../development/python-modules/bitstring { }; + goobook = callPackage ../development/python-modules/goobook { }; - html5-parser = callPackage ../development/python-modules/html5-parser { - inherit (pkgs) pkgconfig; - }; + goocalendar = callPackage ../development/python-modules/goocalendar { }; - HTSeq = callPackage ../development/python-modules/HTSeq { }; + google_api_core = callPackage ../development/python-modules/google_api_core { }; - httpserver = callPackage ../development/python-modules/httpserver {}; + google_api_python_client = + let google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; + in if isPy3k then + google_api_python_client + else # Python 2.7 support was deprecated but is still needed by weboob and duplicity + google_api_python_client.overridePythonAttrs (old: rec { + version = "1.7.6"; + src = old.src.override { + inherit version; + sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; + }; + }); - bleach = callPackage ../development/python-modules/bleach { }; + googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; - bleak = callPackage ../development/python-modules/bleak { }; + google_apputils = callPackage ../development/python-modules/google_apputils { }; - blinker = callPackage ../development/python-modules/blinker { }; + google_auth = callPackage ../development/python-modules/google_auth { }; - blockdiag = callPackage ../development/python-modules/blockdiag { }; + google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; - blockdiagcontrib-cisco = callPackage ../development/python-modules/blockdiagcontrib-cisco { }; + google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; - bpython = callPackage ../development/python-modules/bpython {}; + google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; - bsddb3 = callPackage ../development/python-modules/bsddb3 { }; + google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; - bsdiff4 = callPackage ../development/python-modules/bsdiff4 { }; + google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { }; - bkcharts = callPackage ../development/python-modules/bkcharts { }; + google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { }; - bokeh = callPackage ../development/python-modules/bokeh { }; + google_cloud_bigtable = callPackage ../development/python-modules/google_cloud_bigtable { }; - boto = callPackage ../development/python-modules/boto { }; + google_cloud_container = callPackage ../development/python-modules/google_cloud_container { }; - boto3 = callPackage ../development/python-modules/boto3 { }; + google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; - botocore = callPackage ../development/python-modules/botocore { }; + google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { }; - bottle = callPackage ../development/python-modules/bottle { }; + google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { }; - box2d = callPackage ../development/python-modules/box2d { }; + google_cloud_dlp = callPackage ../development/python-modules/google_cloud_dlp { }; - branca = callPackage ../development/python-modules/branca { }; + google_cloud_dns = callPackage ../development/python-modules/google_cloud_dns { }; - bugwarrior = callPackage ../development/python-modules/bugwarrior { }; + google_cloud_error_reporting = callPackage ../development/python-modules/google_cloud_error_reporting { }; - bugz = callPackage ../development/python-modules/bugz { }; + google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { }; - bugzilla = callPackage ../development/python-modules/bugzilla { }; + google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { }; - buildbot = callPackage ../development/python-modules/buildbot { }; - buildbot-plugins = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/buildbot/plugins.nix { }); - buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); - buildbot-worker = callPackage ../development/python-modules/buildbot/worker.nix { }; - buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; + google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { }; - check-manifest = callPackage ../development/python-modules/check-manifest { }; + google_cloud_language = callPackage ../development/python-modules/google_cloud_language { }; - devpi-common = callPackage ../development/python-modules/devpi-common { }; - # A patched version of buildout, useful for buildout based development on Nix - zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; + google_cloud_logging = callPackage ../development/python-modules/google_cloud_logging { }; - zc_buildout = self.zc_buildout221; + google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { }; - zc_buildout221 = callPackage ../development/python-modules/buildout { }; + google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { }; - z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; + google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { }; - bunch = callPackage ../development/python-modules/bunch { }; + google_cloud_resource_manager = callPackage ../development/python-modules/google_cloud_resource_manager { }; - can = callPackage ../development/python-modules/can {}; + google_cloud_runtimeconfig = callPackage ../development/python-modules/google_cloud_runtimeconfig { }; - canopen = callPackage ../development/python-modules/canopen {}; + google_cloud_secret_manager = callPackage ../development/python-modules/google_cloud_secret_manager { }; - canmatrix = callPackage ../development/python-modules/canmatrix {}; + google_cloud_securitycenter = callPackage ../development/python-modules/google_cloud_securitycenter { }; + google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; - cairocffi = if isPy3k then - callPackage ../development/python-modules/cairocffi {} - else - callPackage ../development/python-modules/cairocffi/0_9.nix {}; + google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; - cairosvg = if isPy3k then - callPackage ../development/python-modules/cairosvg {} - else - callPackage ../development/python-modules/cairosvg/1_x.nix {}; + google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; - carrot = callPackage ../development/python-modules/carrot {}; + google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { }; - cartopy = callPackage ../development/python-modules/cartopy {}; + google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { }; - casbin = callPackage ../development/python-modules/casbin { }; + google_cloud_texttospeech = callPackage ../development/python-modules/google_cloud_texttospeech { }; - case = callPackage ../development/python-modules/case {}; + google_cloud_trace = callPackage ../development/python-modules/google_cloud_trace { }; - cbor = callPackage ../development/python-modules/cbor {}; + google_cloud_translate = callPackage ../development/python-modules/google_cloud_translate { }; - cbor2 = callPackage ../development/python-modules/cbor2 {}; + google_cloud_videointelligence = callPackage ../development/python-modules/google_cloud_videointelligence { }; - cassandra-driver = callPackage ../development/python-modules/cassandra-driver { }; + google_cloud_vision = callPackage ../development/python-modules/google_cloud_vision { }; - cccolutils = callPackage ../development/python-modules/cccolutils {}; + google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { }; - cchardet = callPackage ../development/python-modules/cchardet { }; + google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; - CDDB = callPackage ../development/python-modules/cddb { }; + google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; - cntk = callPackage ../development/python-modules/cntk { }; + google-music = callPackage ../development/python-modules/google-music { }; - celery = callPackage ../development/python-modules/celery { }; + google-music-proto = callPackage ../development/python-modules/google-music-proto { }; - cerberus = callPackage ../development/python-modules/cerberus { }; + google-music-utils = callPackage ../development/python-modules/google-music-utils { }; - certifi = callPackage ../development/python-modules/certifi { }; + google-pasta = callPackage ../development/python-modules/google-pasta { }; - certipy = callPackage ../development/python-modules/certipy {}; + google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; - characteristic = callPackage ../development/python-modules/characteristic { }; + googletrans = callPackage ../development/python-modules/googletrans { }; - chart-studio = callPackage ../development/python-modules/chart-studio { }; + gorilla = callPackage ../development/python-modules/gorilla { }; - cheetah = callPackage ../development/python-modules/cheetah { }; + gpapi = callPackage ../development/python-modules/gpapi { }; + gplaycli = callPackage ../development/python-modules/gplaycli { }; - cheetah3 = callPackage ../development/python-modules/cheetah3 { }; + gpgme = toPythonModule (pkgs.gpgme.override { + pythonSupport = true; + inherit python; + }); - cherrypy = if isPy3k then - callPackage ../development/python-modules/cherrypy { } - else - callPackage ../development/python-modules/cherrypy/17.nix { }; + gphoto2 = callPackage ../development/python-modules/gphoto2 { inherit (pkgs) pkgconfig; }; - cfgv = callPackage ../development/python-modules/cfgv { }; + gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; - cfn-lint = callPackage ../development/python-modules/cfn-lint { }; + gpsoauth = callPackage ../development/python-modules/gpsoauth { }; - cftime = callPackage ../development/python-modules/cftime {}; + gpxpy = callPackage ../development/python-modules/gpxpy { }; - cjson = callPackage ../development/python-modules/cjson { }; + gpy = callPackage ../development/python-modules/gpy { }; - cld2-cffi = callPackage ../development/python-modules/cld2-cffi {}; + gpyopt = callPackage ../development/python-modules/gpyopt { }; - clf = callPackage ../development/python-modules/clf {}; + grammalecte = callPackage ../development/python-modules/grammalecte { }; - click = callPackage ../development/python-modules/click {}; + grandalf = callPackage ../development/python-modules/grandalf { }; - click-completion = callPackage ../development/python-modules/click-completion {}; + graphite_api = callPackage ../development/python-modules/graphite-api { }; - click-datetime = callPackage ../development/python-modules/click-datetime { }; + graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; - click-default-group = callPackage ../development/python-modules/click-default-group { }; + graphite-web = callPackage ../development/python-modules/graphite-web { }; - click-didyoumean = callPackage ../development/python-modules/click-didyoumean {}; + graph_nets = callPackage ../development/python-modules/graph_nets { }; - click-log = callPackage ../development/python-modules/click-log {}; + graphql-core = callPackage ../development/python-modules/graphql-core { }; - click-plugins = callPackage ../development/python-modules/click-plugins {}; + graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; - click-repl = callPackage ../development/python-modules/click-repl { }; + graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { inherit (pkgs) pkg-config; }; - click-threading = callPackage ../development/python-modules/click-threading {}; + graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; }; - cligj = callPackage ../development/python-modules/cligj { }; + grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; - closure-linter = callPackage ../development/python-modules/closure-linter { }; + graspy = callPackage ../development/python-modules/graspy { }; - cloudflare = callPackage ../development/python-modules/cloudflare { }; + greatfet = callPackage ../development/python-modules/greatfet { }; - cloudpickle = callPackage ../development/python-modules/cloudpickle { }; + green = callPackage ../development/python-modules/green { }; - cmdline = callPackage ../development/python-modules/cmdline { }; + greenlet = callPackage ../development/python-modules/greenlet { }; - codecov = callPackage ../development/python-modules/codecov {}; + grequests = callPackage ../development/python-modules/grequests { }; - cogapp = callPackage ../development/python-modules/cogapp {}; + grib-api = disabledIf (!isPy27) (toPythonModule (pkgs.grib-api.override { + enablePython = true; + pythonPackages = self; + })); - colorama = callPackage ../development/python-modules/colorama { }; + grip = callPackage ../development/python-modules/grip { }; - colorlover = callPackage ../development/python-modules/colorlover { }; + grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; - CommonMark = callPackage ../development/python-modules/commonmark { }; + grpcio = callPackage ../development/python-modules/grpcio { }; - coilmq = callPackage ../development/python-modules/coilmq { }; + grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; - colander = callPackage ../development/python-modules/colander { }; + grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; - # Backported version of the ConfigParser library of Python 3.3 - configparser = if pythonOlder "3.6" then - callPackage ../development/python-modules/configparser/4.nix { } + gsd = if isPy27 then + callPackage ../development/python-modules/gsd/1.7.nix { } else - callPackage ../development/python-modules/configparser { }; + callPackage ../development/python-modules/gsd { }; - ColanderAlchemy = callPackage ../development/python-modules/colanderalchemy { }; + gspread = callPackage ../development/python-modules/gspread { }; - conda = callPackage ../development/python-modules/conda { }; + gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; - configobj = callPackage ../development/python-modules/configobj { }; - - confluent-kafka = callPackage ../development/python-modules/confluent-kafka {}; + gst-python = callPackage ../development/python-modules/gst-python { + inherit (pkgs) meson pkgconfig; + gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; + }; - kafka-python = callPackage ../development/python-modules/kafka-python {}; + gtimelog = callPackage ../development/python-modules/gtimelog { }; - construct = callPackage ../development/python-modules/construct {}; + gtts = callPackage ../development/python-modules/gtts { }; - consul = callPackage ../development/python-modules/consul { }; + gtts-token = callPackage ../development/python-modules/gtts-token { }; - contexter = callPackage ../development/python-modules/contexter { }; + guessit = callPackage ../development/python-modules/guessit { }; - contextvars = callPackage ../development/python-modules/contextvars {}; + guestfs = callPackage ../development/python-modules/guestfs { }; - contextlib2 = callPackage ../development/python-modules/contextlib2 { }; + gumath = callPackage ../development/python-modules/gumath { }; - cookiecutter = callPackage ../development/python-modules/cookiecutter { }; + gunicorn = if isPy27 then + callPackage ../development/python-modules/gunicorn/19.nix { } + else + callPackage ../development/python-modules/gunicorn { }; - cookies = callPackage ../development/python-modules/cookies { }; + gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then + callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; } + else if stdenv.hostPlatform.system == "x86_64-linux" then + callPackage ../development/python-modules/gurobipy/linux.nix { } + else + throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; - coreapi = callPackage ../development/python-modules/coreapi { }; + guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; - coreschema = callPackage ../development/python-modules/coreschema { }; + gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { + pythonSupport = true; + pythonPackages = self; + })); - coveralls = callPackage ../development/python-modules/coveralls { }; + gym = callPackage ../development/python-modules/gym { }; - coverage = callPackage ../development/python-modules/coverage { }; + gyp = callPackage ../development/python-modules/gyp { }; - covCore = callPackage ../development/python-modules/cov-core { }; + h11 = callPackage ../development/python-modules/h11 { }; - crcmod = callPackage ../development/python-modules/crcmod { }; + h2 = callPackage ../development/python-modules/h2 { }; - credstash = callPackage ../development/python-modules/credstash { }; + h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; - cython = callPackage ../development/python-modules/Cython { }; + h5netcdf = callPackage ../development/python-modules/h5netcdf { }; - cytoolz = callPackage ../development/python-modules/cytoolz { }; + h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; - cppy = callPackage ../development/python-modules/cppy { }; + h5py-mpi = self.h5py.override { hdf5 = pkgs.hdf5-mpi; }; - cryptacular = callPackage ../development/python-modules/cryptacular { }; + habanero = callPackage ../development/python-modules/habanero { }; - cryptography = if isPy27 then - callPackage ../development/python-modules/cryptography/2.9.nix { } - else - callPackage ../development/python-modules/cryptography { }; + ha-ffmpeg = callPackage ../development/python-modules/ha-ffmpeg { }; - cryptography_vectors = if isPy27 then - callPackage ../development/python-modules/cryptography/vectors-2.9.nix { } - else - callPackage ../development/python-modules/cryptography/vectors.nix { }; + handout = callPackage ../development/python-modules/handout { }; - curtsies = callPackage ../development/python-modules/curtsies { }; + HAP-python = callPackage ../development/python-modules/HAP-python { }; - envs = callPackage ../development/python-modules/envs { }; + hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; - enaml = callPackage ../development/python-modules/enaml { }; + hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; - enamlx = callPackage ../development/python-modules/enamlx { }; + hbmqtt = callPackage ../development/python-modules/hbmqtt { }; - etelemetry = callPackage ../development/python-modules/etelemetry { }; + hcloud = callPackage ../development/python-modules/hcloud { }; - eth-hash = callPackage ../development/python-modules/eth-hash { }; + hcs_utils = callPackage ../development/python-modules/hcs_utils { }; - eth-typing = callPackage ../development/python-modules/eth-typing { }; + hdbscan = callPackage ../development/python-modules/hdbscan { }; - eth-utils = callPackage ../development/python-modules/eth-utils { }; + hdlparse = callPackage ../development/python-modules/hdlparse { }; - gwyddion = disabledIf isPy3k (toPythonModule (pkgs.gwyddion.override { - pythonSupport = true; - pythonPackages = self; - })); + hdmedians = callPackage ../development/python-modules/hdmedians { }; - impacket = callPackage ../development/python-modules/impacket { }; + heapdict = callPackage ../development/python-modules/heapdict { }; - img2pdf = callPackage ../development/python-modules/img2pdf { }; + helpdev = callPackage ../development/python-modules/helpdev { }; - jsonlines = callPackage ../development/python-modules/jsonlines { }; + helper = callPackage ../development/python-modules/helper { }; - json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; + hepmc3 = toPythonModule (pkgs.hepmc3.override { inherit python; }); - jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; + hetzner = callPackage ../development/python-modules/hetzner { }; - jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; + heudiconv = callPackage ../development/python-modules/heudiconv { }; - jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; + hg-evolve = callPackage ../development/python-modules/hg-evolve { }; - hepmc3 = toPythonModule (pkgs.hepmc3.override { - inherit python; - }); + hg-git = callPackage ../development/python-modules/hg-git { }; - onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; + hglib = callPackage ../development/python-modules/hglib { }; - tablib = callPackage ../development/python-modules/tablib { }; + hgsvn = callPackage ../development/python-modules/hgsvn { }; - wakeonlan = callPackage ../development/python-modules/wakeonlan { }; + hickle = callPackage ../development/python-modules/hickle { }; - openant = callPackage ../development/python-modules/openant { }; + hidapi = callPackage ../development/python-modules/hidapi { inherit (pkgs) udev libusb1; }; - opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { - enablePython = true; - pythonPackages = self; - })); + hieroglyph = callPackage ../development/python-modules/hieroglyph { }; - opencv3 = toPythonModule (pkgs.opencv3.override { - enablePython = true; - pythonPackages = self; - }); + hiredis = callPackage ../development/python-modules/hiredis { }; - opencv4 = toPythonModule (pkgs.opencv4.override { - enablePython = true; - pythonPackages = self; - }); + hiro = callPackage ../development/python-modules/hiro { }; - opentracing = callPackage ../development/python-modules/opentracing { }; + hiyapyco = callPackage ../development/python-modules/hiyapyco { }; - openidc-client = callPackage ../development/python-modules/openidc-client {}; + hkdf = callPackage ../development/python-modules/hkdf { }; - openwebifpy = callPackage ../development/python-modules/openwebifpy {}; + hmmlearn = callPackage ../development/python-modules/hmmlearn { }; - optuna = callPackage ../development/python-modules/optuna { }; + hocr-tools = callPackage ../development/python-modules/hocr-tools { }; - idna = callPackage ../development/python-modules/idna { }; + holidays = callPackage ../development/python-modules/holidays { }; - mahotas = callPackage ../development/python-modules/mahotas { }; + holoviews = callPackage ../development/python-modules/holoviews { }; - MDP = callPackage ../development/python-modules/mdp {}; + homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; - minidb = callPackage ../development/python-modules/minidb { }; + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); - miniupnpc = callPackage ../development/python-modules/miniupnpc {}; + hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; - mixpanel = callPackage ../development/python-modules/mixpanel { }; + howdoi = callPackage ../development/python-modules/howdoi { }; - mpyq = callPackage ../development/python-modules/mpyq { }; + hpack = callPackage ../development/python-modules/hpack { }; - mxnet = callPackage ../development/python-modules/mxnet { }; + hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; - nplusone = callPackage ../development/python-modules/nplusone { }; + hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; - parsy = callPackage ../development/python-modules/parsy { }; + hstspreload = callPackage ../development/python-modules/hstspreload { }; - portalocker = callPackage ../development/python-modules/portalocker { }; + html2text = if isPy3k then + callPackage ../development/python-modules/html2text { } + else + callPackage ../development/python-modules/html2text/2018.nix { }; - portpicker = callPackage ../development/python-modules/portpicker { }; + html5lib = callPackage ../development/python-modules/html5lib { }; - pkginfo = callPackage ../development/python-modules/pkginfo { }; + html5-parser = callPackage ../development/python-modules/html5-parser { inherit (pkgs) pkgconfig; }; - pre-commit = callPackage ../development/python-modules/pre-commit { }; + htmllaundry = callPackage ../development/python-modules/htmllaundry { }; - pretend = callPackage ../development/python-modules/pretend { }; + htmlmin = callPackage ../development/python-modules/htmlmin { }; - detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04 + html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; - pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; + htmltreediff = callPackage ../development/python-modules/htmltreediff { }; - bcrypt = callPackage ../development/python-modules/bcrypt { }; + HTSeq = callPackage ../development/python-modules/HTSeq { }; - cffi = callPackage ../development/python-modules/cffi { }; + httmock = callPackage ../development/python-modules/httmock { }; - pyavm = callPackage ../development/python-modules/pyavm { }; + httpauth = callPackage ../development/python-modules/httpauth { }; - pycollada = callPackage ../development/python-modules/pycollada { }; + httpbin = callPackage ../development/python-modules/httpbin { }; - pycontracts = callPackage ../development/python-modules/pycontracts { }; + http-ece = callPackage ../development/python-modules/http-ece { }; - pycparser = callPackage ../development/python-modules/pycparser { }; + httplib2 = callPackage ../development/python-modules/httplib2 { }; - pydub = callPackage ../development/python-modules/pydub {}; + httpretty = if isPy3k then + callPackage ../development/python-modules/httpretty { } + else + callPackage ../development/python-modules/httpretty/0.nix { }; - pyjade = callPackage ../development/python-modules/pyjade {}; + httpserver = callPackage ../development/python-modules/httpserver { }; - pyjet = callPackage ../development/python-modules/pyjet {}; + httpsig = callPackage ../development/python-modules/httpsig { }; - pyjks = callPackage ../development/python-modules/pyjks {}; + http_signature = callPackage ../development/python-modules/http_signature { }; - PyLD = callPackage ../development/python-modules/PyLD { }; + httptools = callPackage ../development/python-modules/httptools { }; - pysingleton = callPackage ../development/python-modules/pysingleton { }; + httpx = callPackage ../development/python-modules/httpx { }; - python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; + huey = callPackage ../development/python-modules/huey { }; - python-jose = callPackage ../development/python-modules/python-jose {}; + hug = callPackage ../development/python-modules/hug { }; - python-json-logger = callPackage ../development/python-modules/python-json-logger { }; + humanfriendly = callPackage ../development/python-modules/humanfriendly { }; - python-ly = callPackage ../development/python-modules/python-ly {}; + humanize = callPackage ../development/python-modules/humanize { }; - pyhcl = callPackage ../development/python-modules/pyhcl { }; + hupper = callPackage ../development/python-modules/hupper { }; - pyhs100 = callPackage ../development/python-modules/pyhs100 { }; + hvac = callPackage ../development/python-modules/hvac { }; - pyrealsense2 = toPythonModule (pkgs.librealsense.override { - enablePython = true; - pythonPackages = self; - }); + hvplot = callPackage ../development/python-modules/hvplot { }; - pyrealsense2WithCuda = toPythonModule (pkgs.librealsenseWithCuda.override { - enablePython = true; - pythonPackages = self; - }); + hwi = callPackage ../development/python-modules/hwi { }; - pyrealsense2WithoutCuda = toPythonModule (pkgs.librealsenseWithoutCuda.override { - enablePython = true; - pythonPackages = self; - }); + hydra = callPackage ../development/python-modules/hydra { }; - pytest = if isPy3k then self.pytest_5 else self.pytest_4; + hydra-check = callPackage ../development/python-modules/hydra-check { }; - pytest_5 = callPackage ../development/python-modules/pytest { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; + hypchat = callPackage ../development/python-modules/hypchat { }; - pytest_4 = callPackage ../development/python-modules/pytest/4.nix { - # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; - }; + hyperframe = callPackage ../development/python-modules/hyperframe { }; - pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; + hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; - pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; + hyperlink = callPackage ../development/python-modules/hyperlink { }; - pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; + hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix + { }; # File name is called 2.nix because this one will need to remain for Python 2. - pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; + hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; - pytest-ansible = callPackage ../development/python-modules/pytest-ansible { }; + hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4; - pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; + i3ipc = callPackage ../development/python-modules/i3ipc { }; - pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; + i3-py = callPackage ../development/python-modules/i3-py { }; - pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; + iapws = callPackage ../development/python-modules/iapws { }; - pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; + ibis = callPackage ../development/python-modules/ibis { }; - pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; + ibis-framework = callPackage ../development/python-modules/ibis-framework { }; - pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; + icalendar = callPackage ../development/python-modules/icalendar { }; - pytestcache = callPackage ../development/python-modules/pytestcache { }; + icecream = callPackage ../development/python-modules/icecream { }; - pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; + ics = callPackage ../development/python-modules/ics { }; - pytest-cram = callPackage ../development/python-modules/pytest-cram { }; + identify = callPackage ../development/python-modules/identify { }; - pytest-datadir = callPackage ../development/python-modules/pytest-datadir { }; + idna = callPackage ../development/python-modules/idna { }; - pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; + idna-ssl = callPackage ../development/python-modules/idna-ssl { }; - pytest-dependency = callPackage ../development/python-modules/pytest-dependency { }; + ifaddr = callPackage ../development/python-modules/ifaddr { }; - pytest-django = callPackage ../development/python-modules/pytest-django { }; + ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; - pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; + ignite = callPackage ../development/python-modules/ignite { }; - pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; + ihatemoney = callPackage ../development/python-modules/ihatemoney { }; - pytest-forked = callPackage ../development/python-modules/pytest-forked { }; + ijson = callPackage ../development/python-modules/ijson { }; - pytest-html = callPackage ../development/python-modules/pytest-html { }; + imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); - pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; + imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; - pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; + imageio = callPackage ../development/python-modules/imageio { }; - pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; + imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; - pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; + image-match = callPackage ../development/python-modules/image-match { }; - pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; + imagesize = callPackage ../development/python-modules/imagesize { }; - pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; + IMAPClient = callPackage ../development/python-modules/imapclient { }; - pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; + imaplib2 = callPackage ../development/python-modules/imaplib2 { }; - pytest-isort = callPackage ../development/python-modules/pytest-isort { }; + imbalanced-learn = if isPy27 then + callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } + else + callPackage ../development/python-modules/imbalanced-learn { }; - pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; + img2pdf = callPackage ../development/python-modules/img2pdf { }; - pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; + imgaug = callPackage ../development/python-modules/imgaug { }; - pytest-mock = if isPy3k then - callPackage ../development/python-modules/pytest-mock { } - else - callPackage ../development/python-modules/pytest-mock/2.nix { }; + immutables = callPackage ../development/python-modules/immutables { }; - pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; + impacket = callPackage ../development/python-modules/impacket { }; - pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; + importlib-metadata = callPackage ../development/python-modules/importlib-metadata { }; - pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; + importlib-resources = callPackage ../development/python-modules/importlib-resources { }; - pytest-watch = callPackage ../development/python-modules/pytest-watch { }; + importmagic = callPackage ../development/python-modules/importmagic { }; - pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; + imread = + callPackage ../development/python-modules/imread { inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; }; - pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; + imutils = callPackage ../development/python-modules/imutils { }; - pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; + incremental = callPackage ../development/python-modules/incremental { }; - pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; + inflect = callPackage ../development/python-modules/inflect { }; - pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; + inflection = callPackage ../development/python-modules/inflection { }; - pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; + influxdb = callPackage ../development/python-modules/influxdb { }; - pytestrunner = callPackage ../development/python-modules/pytestrunner { }; + influxdb-client = callPackage ../development/python-modules/influxdb-client { }; - pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; + influxgraph = callPackage ../development/python-modules/influxgraph { }; - pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; + infoqscraper = callPackage ../development/python-modules/infoqscraper { }; - pytest-services = callPackage ../development/python-modules/pytest-services { }; + iniconfig = callPackage ../development/python-modules/iniconfig { }; - pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; + inifile = callPackage ../development/python-modules/inifile { }; - pytest-socket = callPackage ../development/python-modules/pytest-socket { }; + iniparse = callPackage ../development/python-modules/iniparse { }; - pytestcov = callPackage ../development/python-modules/pytest-cov { }; + inotify-simple = callPackage ../development/python-modules/inotify-simple { }; - pytest-expect = callPackage ../development/python-modules/pytest-expect { }; + inquirer = callPackage ../development/python-modules/inquirer { }; - pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; + intake = callPackage ../development/python-modules/intake { }; - pytest_xdist = callPackage ../development/python-modules/pytest-xdist { }; + intelhex = callPackage ../development/python-modules/intelhex { }; - pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; + internetarchive = callPackage ../development/python-modules/internetarchive { }; - pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; + interruptingcow = callPackage ../development/python-modules/interruptingcow { }; - pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; + intervaltree = callPackage ../development/python-modules/intervaltree { }; - tinycss = callPackage ../development/python-modules/tinycss { }; + intreehooks = callPackage ../development/python-modules/intreehooks { }; - tinycss2 = callPackage ../development/python-modules/tinycss2 { }; + invoke = callPackage ../development/python-modules/invoke { }; - cssselect = callPackage ../development/python-modules/cssselect { }; + iocapture = callPackage ../development/python-modules/iocapture { }; - cssselect2 = callPackage ../development/python-modules/cssselect2 { }; + iowait = callPackage ../development/python-modules/iowait { }; - cssutils = callPackage ../development/python-modules/cssutils { }; + ipaddr = callPackage ../development/python-modules/ipaddr { }; - css-parser = callPackage ../development/python-modules/css-parser { }; + ipaddress = callPackage ../development/python-modules/ipaddress { }; - darcsver = callPackage ../development/python-modules/darcsver { }; + ipdb = callPackage ../development/python-modules/ipdb { }; - dask = callPackage ../development/python-modules/dask { }; + ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; - dask-gateway = callPackage ../development/python-modules/dask-gateway { }; + ipfsapi = callPackage ../development/python-modules/ipfsapi { }; - dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { - inherit (pkgs) go; - }; + iptools = callPackage ../development/python-modules/iptools { }; - dask-glm = callPackage ../development/python-modules/dask-glm { }; + ipy = callPackage ../development/python-modules/IPy { }; - dask-image = callPackage ../development/python-modules/dask-image { }; + ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; - dask-jobqueue = callPackage ../development/python-modules/dask-jobqueue { }; + ipykernel = if pythonOlder "3.4" then + callPackage ../development/python-modules/ipykernel/4.nix { } + else + callPackage ../development/python-modules/ipykernel { }; - dask-ml = callPackage ../development/python-modules/dask-ml { }; + ipympl = callPackage ../development/python-modules/ipympl { }; - dask-mpi = callPackage ../development/python-modules/dask-mpi { }; + ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - dask-xgboost = callPackage ../development/python-modules/dask-xgboost { }; + ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; - datrie = callPackage ../development/python-modules/datrie { }; + ipython = if isPy27 then + callPackage ../development/python-modules/ipython/5.nix { } + else + callPackage ../development/python-modules/ipython { }; - heapdict = callPackage ../development/python-modules/heapdict { }; + ipyvue = callPackage ../development/python-modules/ipyvue { }; - zict = callPackage ../development/python-modules/zict { }; + ipyvuetify = callPackage ../development/python-modules/ipyvuetify { }; - zigpy = callPackage ../development/python-modules/zigpy { }; + ipywidgets = callPackage ../development/python-modules/ipywidgets { }; - zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; + irc = callPackage ../development/python-modules/irc { }; - zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; + isbnlib = callPackage ../development/python-modules/isbnlib { }; - zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; + islpy = callPackage ../development/python-modules/islpy { }; - zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; + iso3166 = callPackage ../development/python-modules/iso3166 { }; - digital-ocean = callPackage ../development/python-modules/digitalocean { }; + iso-639 = callPackage ../development/python-modules/iso-639 { }; - digi-xbee = callPackage ../development/python-modules/digi-xbee { }; + iso8601 = callPackage ../development/python-modules/iso8601 { }; - leather = callPackage ../development/python-modules/leather { }; + isodate = callPackage ../development/python-modules/isodate { }; - libais = callPackage ../development/python-modules/libais { }; + isort = callPackage ../development/python-modules/isort { }; - libevdev = callPackage ../development/python-modules/libevdev { }; + isoweek = callPackage ../development/python-modules/isoweek { }; - libfdt = toPythonModule (pkgs.dtc.override { - inherit python; - pythonSupport = true; - }); + itanium_demangler = callPackage ../development/python-modules/itanium_demangler { }; - libtmux = callPackage ../development/python-modules/libtmux { }; + itemadapter = callPackage ../development/python-modules/itemadapter { }; - libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; + itemloaders = callPackage ../development/python-modules/itemloaders { }; - linuxfd = callPackage ../development/python-modules/linuxfd { }; + iterm2 = callPackage ../development/python-modules/iterm2 { }; - locket = callPackage ../development/python-modules/locket { }; + itsdangerous = callPackage ../development/python-modules/itsdangerous { }; - loo-py = callPackage ../development/python-modules/loo-py { }; + itypes = callPackage ../development/python-modules/itypes { }; - tblib = callPackage ../development/python-modules/tblib { }; + j2cli = callPackage ../development/python-modules/j2cli { }; - s3fs = callPackage ../development/python-modules/s3fs { }; + jabberbot = callPackage ../development/python-modules/jabberbot { }; - datashape = callPackage ../development/python-modules/datashape { }; + janus = callPackage ../development/python-modules/janus { }; - requests-cache = callPackage ../development/python-modules/requests-cache { }; + jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; - requests-file = callPackage ../development/python-modules/requests-file { }; + jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; - requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; + jaraco_functools = if pythonOlder "3.6" then + callPackage ../development/python-modules/jaraco_functools/2.nix { } + else + callPackage ../development/python-modules/jaraco_functools { }; - requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket {}; + jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; - requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; + jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; - howdoi = callPackage ../development/python-modules/howdoi {}; + jaraco_stream = if pythonOlder "3.6" then + callPackage ../development/python-modules/jaraco_stream/2.nix { } + else + callPackage ../development/python-modules/jaraco_stream { }; - jdatetime = callPackage ../development/python-modules/jdatetime {}; + jaraco_text = callPackage ../development/python-modules/jaraco_text { }; - daphne = callPackage ../development/python-modules/daphne { }; + javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; - dash = callPackage ../development/python-modules/dash { }; + javaproperties = callPackage ../development/python-modules/javaproperties { }; - dash-core-components = callPackage ../development/python-modules/dash-core-components { }; + JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi { }; - dash-html-components = callPackage ../development/python-modules/dash-html-components { }; + jc = callPackage ../development/python-modules/jc { }; - dash-renderer = callPackage ../development/python-modules/dash-renderer { }; + jdatetime = callPackage ../development/python-modules/jdatetime { }; - dash-table = callPackage ../development/python-modules/dash-table { }; + jdcal = callPackage ../development/python-modules/jdcal { }; - dateparser = callPackage ../development/python-modules/dateparser { }; + jedi = callPackage ../development/python-modules/jedi { }; - # Actual name of package - python-dateutil = callPackage ../development/python-modules/dateutil { }; - # Alias that we should deprecate - dateutil = self.python-dateutil; + jeepney = callPackage ../development/python-modules/jeepney { }; - debugpy = callPackage ../development/python-modules/debugpy { - django = if isPy27 then self.django_1_11 else self.django; - }; + jellyfin-apiclient-python = callPackage ../development/python-modules/jellyfin-apiclient-python { }; - decorator = callPackage ../development/python-modules/decorator { }; + jellyfish = callPackage ../development/python-modules/jellyfish { }; - deform = callPackage ../development/python-modules/deform { }; + jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; - demjson = callPackage ../development/python-modules/demjson { }; + jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; - deprecated = callPackage ../development/python-modules/deprecated { }; + jieba = callPackage ../development/python-modules/jieba { }; - deprecation = callPackage ../development/python-modules/deprecation { }; + jinja2 = callPackage ../development/python-modules/jinja2 { }; - derpconf = callPackage ../development/python-modules/derpconf { }; + jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; - deskcon = callPackage ../development/python-modules/deskcon { }; + jinja2_time = callPackage ../development/python-modules/jinja2_time { }; - dill = callPackage ../development/python-modules/dill { }; + jira = callPackage ../development/python-modules/jira { }; - discogs_client = callPackage ../development/python-modules/discogs_client { }; + jmespath = callPackage ../development/python-modules/jmespath { }; - dlx = callPackage ../development/python-modules/dlx { }; + joblib = callPackage ../development/python-modules/joblib { }; - dmenu-python = callPackage ../development/python-modules/dmenu { }; + josepy = callPackage ../development/python-modules/josepy { }; - dnslib = callPackage ../development/python-modules/dnslib { }; + journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; }; - dnspython = callPackage ../development/python-modules/dnspython { }; - dns = self.dnspython; # Alias for compatibility, 2017-12-10 + jpylyzer = callPackage ../development/python-modules/jpylyzer { }; - docker = callPackage ../development/python-modules/docker {}; + JPype1 = callPackage ../development/python-modules/JPype1 { }; - dockerfile-parse = callPackage ../development/python-modules/dockerfile-parse {}; + jq = callPackage ../development/python-modules/jq { inherit (pkgs) jq; }; - docker-py = disabledIf isPy27 (callPackage ../development/python-modules/docker-py {}); + jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; - dockerpty = callPackage ../development/python-modules/dockerpty {}; + jsmin = callPackage ../development/python-modules/jsmin { }; - dockerspawner = callPackage ../development/python-modules/dockerspawner {}; + jsondate = callPackage ../development/python-modules/jsondate { }; - docker_pycreds = callPackage ../development/python-modules/docker-pycreds {}; + jsondiff = callPackage ../development/python-modules/jsondiff { }; - docloud = callPackage ../development/python-modules/docloud { }; + jsonlines = callPackage ../development/python-modules/jsonlines { }; - docplex = callPackage ../development/python-modules/docplex { }; + jsonmerge = callPackage ../development/python-modules/jsonmerge { }; - docopt = callPackage ../development/python-modules/docopt { }; + json-merge-patch = callPackage ../development/python-modules/json-merge-patch { }; - doctest-ignore-unicode = callPackage ../development/python-modules/doctest-ignore-unicode { }; + jsonnet = buildPythonPackage { inherit (pkgs.jsonnet) name src; }; - dogpile_cache = callPackage ../development/python-modules/dogpile.cache { }; + jsonpatch = callPackage ../development/python-modules/jsonpatch { }; - dogpile_core = callPackage ../development/python-modules/dogpile.core { }; + jsonpath = callPackage ../development/python-modules/jsonpath { }; - dopy = callPackage ../development/python-modules/dopy { }; + jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; - dpath = callPackage ../development/python-modules/dpath { }; + jsonpickle = callPackage ../development/python-modules/jsonpickle { }; - dparse = callPackage ../development/python-modules/dparse { }; + jsonpointer = callPackage ../development/python-modules/jsonpointer { }; - dpkt = callPackage ../development/python-modules/dpkt {}; + jsonref = callPackage ../development/python-modules/jsonref { }; - urllib3 = callPackage ../development/python-modules/urllib3 {}; + jsonrpc-async = callPackage ../development/python-modules/jsonrpc-async { }; - varint = callPackage ../development/python-modules/varint {}; + jsonrpc-base = callPackage ../development/python-modules/jsonrpc-base { }; - drf-yasg = callPackage ../development/python-modules/drf-yasg { }; + jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; - dropbox = callPackage ../development/python-modules/dropbox {}; + jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix { }; - drms = callPackage ../development/python-modules/drms { }; + jsonrpc-websocket = callPackage ../development/python-modules/jsonrpc-websocket { }; - ds4drv = callPackage ../development/python-modules/ds4drv { - inherit (pkgs) fetchFromGitHub bluez; - }; + jsonschema = callPackage ../development/python-modules/jsonschema { }; - dyn = callPackage ../development/python-modules/dyn { }; + jsonwatch = callPackage ../development/python-modules/jsonwatch { }; - easydict = callPackage ../development/python-modules/easydict { }; + jug = callPackage ../development/python-modules/jug { }; - easygui = callPackage ../development/python-modules/easygui { }; + junitparser = callPackage ../development/python-modules/junitparser { }; - EasyProcess = callPackage ../development/python-modules/easyprocess { }; + junit-xml = callPackage ../development/python-modules/junit-xml { }; - easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; + junos-eznc = callPackage ../development/python-modules/junos-eznc { }; - eccodes = toPythonModule (pkgs.eccodes.override { - enablePython = true; - pythonPackages = self; - }); + jupyter = callPackage ../development/python-modules/jupyter { }; - edward = callPackage ../development/python-modules/edward { }; + jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; - elasticsearch = callPackage ../development/python-modules/elasticsearch { }; + jupyter_client = if isPy3k then + callPackage ../development/python-modules/jupyter_client { } + else + callPackage ../development/python-modules/jupyter_client/5.nix { }; - elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; - # alias - elasticsearchdsl = self.elasticsearch-dsl; + jupyter_console = if pythonOlder "3.5" then + callPackage ../development/python-modules/jupyter_console/5.nix { } + else + callPackage ../development/python-modules/jupyter_console { }; - elementpath = callPackage ../development/python-modules/elementpath { }; + jupyter_core = callPackage ../development/python-modules/jupyter_core { }; - entrypoints = callPackage ../development/python-modules/entrypoints { }; + jupyterhub = callPackage ../development/python-modules/jupyterhub { }; - envisage = callPackage ../development/python-modules/envisage { }; + jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; - enzyme = callPackage ../development/python-modules/enzyme {}; + jupyterhub-systemdspawner = + callPackage ../development/python-modules/jupyterhub-systemdspawner { inherit (pkgs) bash; }; - escapism = callPackage ../development/python-modules/escapism { }; + jupyterhub-tmpauthenticator = callPackage ../development/python-modules/jupyterhub-tmpauthenticator { }; - etcd = callPackage ../development/python-modules/etcd { }; + jupyterlab = callPackage ../development/python-modules/jupyterlab { }; - evdev = callPackage ../development/python-modules/evdev {}; + jupyterlab-git = callPackage ../development/python-modules/jupyterlab-git { }; - eve = callPackage ../development/python-modules/eve {}; + jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; - eventlib = callPackage ../development/python-modules/eventlib { }; + jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; - events = callPackage ../development/python-modules/events { }; + jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; - eyeD3 = callPackage ../development/python-modules/eyed3 { }; + jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; - execnet = callPackage ../development/python-modules/execnet { }; + jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { }; - executor = callPackage ../development/python-modules/executor { }; + jupytext = callPackage ../development/python-modules/jupytext { }; - ezdxf = callPackage ../development/python-modules/ezdxf {}; + jwcrypto = callPackage ../development/python-modules/jwcrypto { }; - facebook-sdk = callPackage ../development/python-modules/facebook-sdk { }; + k5test = callPackage ../development/python-modules/k5test { inherit (pkgs) krb5Full findutils which; }; - face_recognition = callPackage ../development/python-modules/face_recognition { }; + kaa-base = callPackage ../development/python-modules/kaa-base { }; - face_recognition_models = callPackage ../development/python-modules/face_recognition_models { }; + kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; - faker = callPackage ../development/python-modules/faker { }; + kafka-python = callPackage ../development/python-modules/kafka-python { }; - fake_factory = callPackage ../development/python-modules/fake_factory { }; + kaggle = callPackage ../development/python-modules/kaggle { }; - fake-useragent = callPackage ../development/python-modules/fake-useragent { }; + kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; - factory_boy = callPackage ../development/python-modules/factory_boy { }; + Kajiki = callPackage ../development/python-modules/kajiki { }; - Fabric = callPackage ../development/python-modules/Fabric { }; + kaptan = callPackage ../development/python-modules/kaptan { }; - fastdtw = callPackage ../development/python-modules/fastdtw { }; + kazoo = callPackage ../development/python-modules/kazoo { }; - fastjsonschema = callPackage ../development/python-modules/fastjsonschema { }; + kconfiglib = callPackage ../development/python-modules/kconfiglib { }; - faulthandler = if ! isPy3k - then callPackage ../development/python-modules/faulthandler {} - else throw "faulthandler is built into ${python.executable}"; + keep = callPackage ../development/python-modules/keep { }; - fb-re2 = callPackage ../development/python-modules/fb-re2 { }; + keepalive = callPackage ../development/python-modules/keepalive { }; - ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { }; + keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; - fenics = callPackage ../development/libraries/science/math/fenics { - inherit (pkgs) pkg-config; - mpi = pkgs.openmpi; - pytest = self.pytest_4; - }; + keepkey = callPackage ../development/python-modules/keepkey { }; - filetype = callPackage ../development/python-modules/filetype { }; + keras-applications = callPackage ../development/python-modules/keras-applications { }; - flammkuchen = callPackage ../development/python-modules/flammkuchen { }; + Keras = callPackage ../development/python-modules/keras { }; - flexmock = callPackage ../development/python-modules/flexmock { }; + keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - flit = callPackage ../development/python-modules/flit { }; + kerberos = callPackage ../development/python-modules/kerberos { inherit (pkgs) kerberos; }; - flit-core = callPackage ../development/python-modules/flit-core { }; + keyring = if isPy3k then + callPackage ../development/python-modules/keyring { } + else + callPackage ../development/python-modules/keyring/2.nix { }; - flowlogs_reader = callPackage ../development/python-modules/flowlogs_reader { }; + keyrings-alt = callPackage ../development/python-modules/keyrings-alt { }; - fluent-logger = callPackage ../development/python-modules/fluent-logger {}; + keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; - flux-led = callPackage ../development/python-modules/flux-led { }; + kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src); - python-forecastio = callPackage ../development/python-modules/python-forecastio { }; + kinparse = callPackage ../development/python-modules/kinparse { }; - fpdf = callPackage ../development/python-modules/fpdf { }; + kitchen = callPackage ../development/python-modules/kitchen { }; - fpylll = callPackage ../development/python-modules/fpylll { }; + kiwisolver = if isPy3k then + callPackage ../development/python-modules/kiwisolver { } + else + callPackage ../development/python-modules/kiwisolver/1_1.nix { }; - fritzconnection = callPackage ../development/python-modules/fritzconnection { }; + klaus = callPackage ../development/python-modules/klaus { }; - frozendict = callPackage ../development/python-modules/frozendict { }; + klein = callPackage ../development/python-modules/klein { }; - ftputil = callPackage ../development/python-modules/ftputil { }; + kmapper = callPackage ../development/python-modules/kmapper { }; - fudge = callPackage ../development/python-modules/fudge { }; + kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { + inherit (pkgs.kmsxx) stdenv; + inherit (pkgs) pkgconfig; + withPython = true; + }).overrideAttrs (oldAttrs: { name = "${python.libPrefix}-${pkgs.kmsxx.name}"; })); - funcparserlib = callPackage ../development/python-modules/funcparserlib { }; + knack = callPackage ../development/python-modules/knack { }; - fastcache = callPackage ../development/python-modules/fastcache { }; + koji = callPackage ../development/python-modules/koji { }; - fastentrypoints = callPackage ../development/python-modules/fastentrypoints { }; + kombu = callPackage ../development/python-modules/kombu { }; - functools32 = callPackage ../development/python-modules/functools32 { }; + konfig = callPackage ../development/python-modules/konfig { }; - future-fstrings = callPackage ../development/python-modules/future-fstrings { }; + kubernetes = callPackage ../development/python-modules/kubernetes { }; - fx2 = callPackage ../development/python-modules/fx2 { }; + labelbox = callPackage ../development/python-modules/labelbox { }; - # gaia isn't supported with python3 and it's not available from pypi - gaia = disabledIf (isPyPy || isPy3k) (toPythonModule (pkgs.gaia.override { - pythonPackages = self; - pythonSupport = true; - })); + lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.openmpi; }; - gateone = callPackage ../development/python-modules/gateone { }; + langcodes = callPackage ../development/python-modules/langcodes { }; - GeoIP = callPackage ../development/python-modules/GeoIP { }; + langdetect = callPackage ../development/python-modules/langdetect { }; - glasgow = callPackage ../development/python-modules/glasgow { }; + larch = callPackage ../development/python-modules/larch { }; - gmpy = callPackage ../development/python-modules/gmpy { }; + lark-parser = callPackage ../development/python-modules/lark-parser { }; - gmpy2 = callPackage ../development/python-modules/gmpy2 { }; + Lasagne = callPackage ../development/python-modules/lasagne { }; - gmusicapi = callPackage ../development/python-modules/gmusicapi { }; + latexcodec = callPackage ../development/python-modules/latexcodec { }; - gnureadline = callPackage ../development/python-modules/gnureadline { }; + launchpadlib = callPackage ../development/python-modules/launchpadlib { }; - gnutls = callPackage ../development/python-modules/gnutls { }; + lazr_config = callPackage ../development/python-modules/lazr/config.nix { }; - gpy = callPackage ../development/python-modules/gpy { }; + lazr_delegates = callPackage ../development/python-modules/lazr/delegates.nix { }; - gpyopt = callPackage ../development/python-modules/gpyopt { }; + lazr-restfulclient = callPackage ../development/python-modules/lazr-restfulclient { }; - gitdb = callPackage ../development/python-modules/gitdb { }; + lazr-uri = callPackage ../development/python-modules/lazr-uri { }; - gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 + lazy = callPackage ../development/python-modules/lazy { }; - GitPython = callPackage ../development/python-modules/GitPython { }; + lazy_import = callPackage ../development/python-modules/lazy_import { }; - git-annex-adapter = callPackage ../development/python-modules/git-annex-adapter { - inherit (pkgs.gitAndTools) git-annex; - }; + lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; - python-gitlab = callPackage ../development/python-modules/python-gitlab { }; + ldap3 = callPackage ../development/python-modules/ldap3 { }; - google-compute-engine = callPackage ../tools/virtualization/google-compute-engine { }; + ldap = callPackage ../development/python-modules/ldap { inherit (pkgs) openldap cyrus_sasl; }; - google-music = callPackage ../development/python-modules/google-music { }; + ldappool = callPackage ../development/python-modules/ldappool { }; - google-music-proto = callPackage ../development/python-modules/google-music-proto { }; + ldaptor = callPackage ../development/python-modules/ldaptor { }; - google-music-utils = callPackage ../development/python-modules/google-music-utils { }; + leather = callPackage ../development/python-modules/leather { }; - google-pasta = callPackage ../development/python-modules/google-pasta { }; + le = callPackage ../development/python-modules/le { }; - googletrans = callPackage ../development/python-modules/googletrans { }; + ledger_agent = callPackage ../development/python-modules/ledger_agent { }; - gdown = callPackage ../development/python-modules/gdown { }; + ledgerblue = callPackage ../development/python-modules/ledgerblue { }; - gpapi = callPackage ../development/python-modules/gpapi { }; - gplaycli = callPackage ../development/python-modules/gplaycli { }; + lektor = callPackage ../development/python-modules/lektor { }; - gpsoauth = callPackage ../development/python-modules/gpsoauth { }; + leveldb = callPackage ../development/python-modules/leveldb { }; - gpxpy = callPackage ../development/python-modules/gpxpy { }; + libagent = callPackage ../development/python-modules/libagent { }; - grip = callPackage ../development/python-modules/grip { }; + libais = callPackage ../development/python-modules/libais { }; - gst-python = callPackage ../development/python-modules/gst-python { - inherit (pkgs) meson pkgconfig; - gst-plugins-base = pkgs.gst_all_1.gst-plugins-base; - }; + libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; }; - gtimelog = callPackage ../development/python-modules/gtimelog { }; + libarchive = self.python-libarchive; # The latter is the name upstream uses - gtts = callPackage ../development/python-modules/gtts { }; + libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; - gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" - then callPackage ../development/python-modules/gurobipy/darwin.nix { - inherit (pkgs.darwin) cctools insert_dylib; - } - else if stdenv.hostPlatform.system == "x86_64-linux" - then callPackage ../development/python-modules/gurobipy/linux.nix {} - else throw "gurobipy not yet supported on ${stdenv.hostPlatform.system}"; + libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns pkgconfig; }; - hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { }; + libcloud = if isPy27 then + callPackage ../development/python-modules/libcloud/2.nix { } + else + callPackage ../development/python-modules/libcloud { }; - hbmqtt = callPackage ../development/python-modules/hbmqtt { }; + libevdev = callPackage ../development/python-modules/libevdev { }; - helpdev = callPackage ../development/python-modules/helpdev { }; + libfdt = toPythonModule (pkgs.dtc.override { + inherit python; + pythonSupport = true; + }); - heudiconv = callPackage ../development/python-modules/heudiconv { }; + libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { + enablePython = true; + python3 = python; + })); - hickle = callPackage ../development/python-modules/hickle { }; + libgpuarray = callPackage ../development/python-modules/libgpuarray { + clblas = pkgs.clblas.override { boost = self.boost; }; + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + }; - hiro = callPackage ../development/python-modules/hiro {}; + libiio = (toPythonModule (pkgs.libiio.override { inherit python; })).python; - hglib = callPackage ../development/python-modules/hglib {}; + libkeepass = callPackage ../development/python-modules/libkeepass { }; - huey = callPackage ../development/python-modules/huey { }; + liblarch = callPackage ../development/python-modules/liblarch { }; - humanize = callPackage ../development/python-modules/humanize { }; + libmodulemd = pipe pkgs.libmodulemd [ + toPythonModule + (p: + p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; # The package always builds python3 bindings + broken = (super.meta.broken or false) || !isPy3k; + }; + })) + (p: p.override { python3 = python; }) + (p: p.py) + ]; - humanfriendly = callPackage ../development/python-modules/humanfriendly { }; + libmr = callPackage ../development/python-modules/libmr { }; - hupper = callPackage ../development/python-modules/hupper {}; + libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; }; - hsaudiotag = callPackage ../development/python-modules/hsaudiotag { }; + libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override { + pythonSupport = true; + inherit python; + })).py; - hsaudiotag3k = callPackage ../development/python-modules/hsaudiotag3k { }; + libplist = disabledIf isPy3k (toPythonModule (pkgs.libplist.override { + enablePython = true; + inherit python; + })).py; - hstspreload = callPackage ../development/python-modules/hstspreload { }; + libredwg = toPythonModule (pkgs.libredwg.override { + enablePython = true; + inherit (self) python libxml2; + }); - htmlmin = callPackage ../development/python-modules/htmlmin {}; + librepo = pipe pkgs.librepo [ + toPythonModule + (p: p.overrideAttrs (super: { meta = super.meta // { outputsToInstall = [ "py" ]; }; })) + (p: p.override { inherit python; }) + (p: p.py) + ]; - httpauth = callPackage ../development/python-modules/httpauth { }; + librosa = callPackage ../development/python-modules/librosa { }; - httpx = callPackage ../development/python-modules/httpx { }; + libsavitar = callPackage ../development/python-modules/libsavitar { }; - idna-ssl = callPackage ../development/python-modules/idna-ssl { }; + libselinux = pipe pkgs.libselinux [ + toPythonModule + (p: + p.overrideAttrs (super: { + meta = super.meta // { + outputsToInstall = [ "py" ]; + broken = (super.meta.broken or false) || pythonAtLeast "3.8"; + }; + })) + (p: + p.override { + enablePython = true; + inherit python; + }) + (p: p.py) + ]; - identify = callPackage ../development/python-modules/identify { }; + libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; - ijson = callPackage ../development/python-modules/ijson {}; + libthumbor = callPackage ../development/python-modules/libthumbor { }; - imagecodecs-lite = disabledIf (!isPy3k) (callPackage ../development/python-modules/imagecodecs-lite { }); + libtmux = callPackage ../development/python-modules/libtmux { }; - imagesize = callPackage ../development/python-modules/imagesize { }; + libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { inherit python; })).python; - image-match = callPackage ../development/python-modules/image-match { }; + libusb1 = callPackage ../development/python-modules/libusb1 { inherit (pkgs) libusb1; }; - imbalanced-learn = - if isPy27 then - callPackage ../development/python-modules/imbalanced-learn/0.4.nix { } - else - callPackage ../development/python-modules/imbalanced-learn { }; + libversion = callPackage ../development/python-modules/libversion { inherit (pkgs) libversion pkgconfig; }; - immutables = callPackage ../development/python-modules/immutables {}; + libvirt = if isPy3k then + (callPackage ../development/python-modules/libvirt { inherit (pkgs) libvirt pkgconfig; }) + else + (callPackage ../development/python-modules/libvirt/5.9.0.nix { + inherit (pkgs) pkgconfig; + libvirt = pkgs.libvirt_5_9_0; + }); - imread = callPackage ../development/python-modules/imread { - inherit (pkgs) pkgconfig libjpeg libpng libtiff libwebp; - }; + libxml2 = (toPythonModule (pkgs.libxml2.override { + pythonSupport = true; + inherit python; + })).py; - imaplib2 = callPackage ../development/python-modules/imaplib2 { }; + libxslt = (toPythonModule (pkgs.libxslt.override { + pythonSupport = true; + inherit python; + inherit (self) libxml2; + })).py; - ipfsapi = callPackage ../development/python-modules/ipfsapi { }; + license-expression = callPackage ../development/python-modules/license-expression { }; - isbnlib = callPackage ../development/python-modules/isbnlib { }; + lightblue = callPackage ../development/python-modules/lightblue { }; - islpy = callPackage ../development/python-modules/islpy { }; + lightgbm = callPackage ../development/python-modules/lightgbm { }; - itsdangerous = callPackage ../development/python-modules/itsdangerous { }; + lightning = callPackage ../development/python-modules/lightning { }; - itypes = callPackage ../development/python-modules/itypes { }; + lightparam = callPackage ../development/python-modules/lightparam { }; - iniparse = callPackage ../development/python-modules/iniparse { }; + limitlessled = callPackage ../development/python-modules/limitlessled { }; - intreehooks = callPackage ../development/python-modules/intreehooks { }; + limits = callPackage ../development/python-modules/limits { }; - i3-py = callPackage ../development/python-modules/i3-py { }; + limnoria = callPackage ../development/python-modules/limnoria { }; - JayDeBeApi = callPackage ../development/python-modules/JayDeBeApi {}; + linecache2 = callPackage ../development/python-modules/linecache2 { }; - jdcal = callPackage ../development/python-modules/jdcal { }; + line_profiler = callPackage ../development/python-modules/line_profiler { }; - jieba = callPackage ../development/python-modules/jieba { }; + linode-api = callPackage ../development/python-modules/linode-api { }; - internetarchive = callPackage ../development/python-modules/internetarchive {}; + linode = callPackage ../development/python-modules/linode { }; - JPype1 = callPackage ../development/python-modules/JPype1 {}; + linuxfd = callPackage ../development/python-modules/linuxfd { }; - jpylyzer = callPackage ../development/python-modules/jpylyzer {}; + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; })); - josepy = callPackage ../development/python-modules/josepy {}; + livelossplot = callPackage ../development/python-modules/livelossplot { }; - jsbeautifier = callPackage ../development/python-modules/jsbeautifier {}; + livereload = callPackage ../development/python-modules/livereload { }; - jug = callPackage ../development/python-modules/jug {}; + livestreamer = callPackage ../development/python-modules/livestreamer { }; - jsmin = callPackage ../development/python-modules/jsmin { }; + livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; - jsonmerge = callPackage ../development/python-modules/jsonmerge { }; + llfuse = callPackage ../development/python-modules/llfuse { + inherit (pkgs) fuse pkgconfig; + }; # use "real" fuse and pkgconfig, not the python modules - jsonpatch = callPackage ../development/python-modules/jsonpatch { }; + llvmlite = callPackage ../development/python-modules/llvmlite { + llvm = pkgs.llvm_9; + }; # llvmlite always requires a specific version of llvm. - jsonpickle = callPackage ../development/python-modules/jsonpickle { }; + lmdb = callPackage ../development/python-modules/lmdb { }; - jsonpointer = callPackage ../development/python-modules/jsonpointer { }; + lml = callPackage ../development/python-modules/lml { }; - jsonrpclib = callPackage ../development/python-modules/jsonrpclib { }; + lmtpd = callPackage ../development/python-modules/lmtpd { }; - jsonrpclib-pelix = callPackage ../development/python-modules/jsonrpclib-pelix {}; + localzone = callPackage ../development/python-modules/localzone { }; - jsonwatch = callPackage ../development/python-modules/jsonwatch { }; + locket = callPackage ../development/python-modules/locket { }; - kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { - python3 = python; - }).src); + lockfile = callPackage ../development/python-modules/lockfile { }; - latexcodec = callPackage ../development/python-modules/latexcodec {}; + locustio = callPackage ../development/python-modules/locustio { }; - lazy = callPackage ../development/python-modules/lazy { }; + Logbook = callPackage ../development/python-modules/Logbook { }; - libmodulemd = pipe pkgs.libmodulemd [ - toPythonModule + logfury = callPackage ../development/python-modules/logfury { }; - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - # The package always builds python3 bindings - broken = (super.meta.broken or false) || !isPy3k; - }; - })) + logilab_astng = callPackage ../development/python-modules/logilab_astng { }; - (p: p.override { - python3 = python; - }) + logilab_common = callPackage ../development/python-modules/logilab/common.nix { }; - (p: p.py) - ]; + logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix { }; - libselinux = pipe pkgs.libselinux [ - toPythonModule + logster = callPackage ../development/python-modules/logster { }; - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - broken = (super.meta.broken or false) || pythonAtLeast "3.8"; - }; - })) + loguru = callPackage ../development/python-modules/loguru { }; - (p: p.override { - enablePython = true; - inherit python; - }) + logutils = callPackage ../development/python-modules/logutils { }; - (p: p.py) - ]; + logzero = callPackage ../development/python-modules/logzero { }; - libsoundtouch = callPackage ../development/python-modules/libsoundtouch { }; + loo-py = callPackage ../development/python-modules/loo-py { }; - libthumbor = callPackage ../development/python-modules/libthumbor { }; + lpod = callPackage ../development/python-modules/lpod { }; - license-expression = callPackage ../development/python-modules/license-expression { }; + lsi = callPackage ../development/python-modules/lsi { }; - lightblue = callPackage ../development/python-modules/lightblue { }; + ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; - lightgbm = callPackage ../development/python-modules/lightgbm { }; + luftdaten = callPackage ../development/python-modules/luftdaten { }; - lightning = callPackage ../development/python-modules/lightning { }; + lxc = callPackage ../development/python-modules/lxc { }; - lightparam = callPackage ../development/python-modules/lightparam { }; + lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; - jupyter = callPackage ../development/python-modules/jupyter { }; + lz4 = self.python-lz4; # alias 2018-12-05 - jupyter-c-kernel = callPackage ../development/python-modules/jupyter-c-kernel { }; + lzstring = callPackage ../development/python-modules/lzstring { }; - jupyter_console = if pythonOlder "3.5" then - callPackage ../development/python-modules/jupyter_console/5.nix { } - else - callPackage ../development/python-modules/jupyter_console { }; + m2crypto = callPackage ../development/python-modules/m2crypto { }; - jupyterlab_launcher = callPackage ../development/python-modules/jupyterlab_launcher { }; + m2r = callPackage ../development/python-modules/m2r { }; - jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; + m3u8 = callPackage ../development/python-modules/m3u8 { }; - jupyterlab = callPackage ../development/python-modules/jupyterlab {}; + mac_alias = callPackage ../development/python-modules/mac_alias { }; - jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; + macfsevents = callPackage ../development/python-modules/macfsevents { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; + }; - jupytext = callPackage ../development/python-modules/jupytext { }; + macropy = callPackage ../development/python-modules/macropy { }; - PyLTI = callPackage ../development/python-modules/pylti { }; + maestral = callPackage ../development/python-modules/maestral { }; - lmdb = callPackage ../development/python-modules/lmdb { }; + magic = callPackage ../development/python-modules/magic { }; - logilab_astng = callPackage ../development/python-modules/logilab_astng { }; + magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; - lpod = callPackage ../development/python-modules/lpod { }; + magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; - ludios_wpull = callPackage ../development/python-modules/ludios_wpull { }; + magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; - luftdaten = callPackage ../development/python-modules/luftdaten { }; + mahotas = callPackage ../development/python-modules/mahotas { }; - m2r = callPackage ../development/python-modules/m2r { }; + mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; mailchimp = callPackage ../development/python-modules/mailchimp { }; - python-mapnik = callPackage ../development/python-modules/python-mapnik { }; + maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; - measurement = callPackage ../development/python-modules/measurement {}; + mailman = callPackage ../servers/mail/mailman { }; - mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { - python3Packages = self; - })); + mailmanclient = callPackage ../development/python-modules/mailmanclient { }; - midiutil = callPackage ../development/python-modules/midiutil {}; + mailman-hyperkitty = callPackage ../development/python-modules/mailman-hyperkitty { }; - mido = callPackage ../development/python-modules/mido { }; + mailman-web = callPackage ../servers/mail/mailman/web.nix { }; - misaka = callPackage ../development/python-modules/misaka {}; + mail-parser = callPackage ../development/python-modules/mail-parser { }; - mlrose = callPackage ../development/python-modules/mlrose { }; + Mako = callPackage ../development/python-modules/Mako { }; - mlflow = callPackage ../development/python-modules/mlflow { }; + managesieve = callPackage ../development/python-modules/managesieve { }; - mt-940 = callPackage ../development/python-modules/mt-940 { }; + manhole = callPackage ../development/python-modules/manhole { }; - mwlib = callPackage ../development/python-modules/mwlib { }; + manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix { }; - mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; + manuel = callPackage ../development/python-modules/manuel { }; - mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; + mapbox = callPackage ../development/python-modules/mapbox { }; - myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; + mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; - natsort = callPackage ../development/python-modules/natsort { }; + marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix { }; - naturalsort = callPackage ../development/python-modules/naturalsort { }; + marionette-harness = callPackage ../development/python-modules/marionette-harness { }; - ncclient = callPackage ../development/python-modules/ncclient {}; + marisa = callPackage ../development/python-modules/marisa { marisa = pkgs.marisa; }; - logfury = callPackage ../development/python-modules/logfury { }; + marisa-trie = callPackage ../development/python-modules/marisa-trie { }; - ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; + markdown2 = callPackage ../development/python-modules/markdown2 { }; - netcdf4 = callPackage ../development/python-modules/netcdf4 { }; + markdown = if isPy3k then + callPackage ../development/python-modules/markdown { } + else + callPackage ../development/python-modules/markdown/3_1.nix { }; - netdisco = callPackage ../development/python-modules/netdisco { }; + markdown-macros = callPackage ../development/python-modules/markdown-macros { }; - Nikola = callPackage ../development/python-modules/Nikola { }; + markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript { }; - nmigen = callPackage ../development/python-modules/nmigen { }; + markerlib = callPackage ../development/python-modules/markerlib { }; - nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; + markupsafe = callPackage ../development/python-modules/markupsafe { }; - nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; + Markups = callPackage ../development/python-modules/Markups { }; - nxt-python = callPackage ../development/python-modules/nxt-python { }; + marshmallow = callPackage ../development/python-modules/marshmallow { }; - odfpy = callPackage ../development/python-modules/odfpy { }; + marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; - openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; - openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; + marshmallow-polyfield = callPackage ../development/python-modules/marshmallow-polyfield { }; - oset = callPackage ../development/python-modules/oset { }; + marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { }; - oscrypto = callPackage ../development/python-modules/oscrypto { }; + mask-rcnn = callPackage ../development/python-modules/mask-rcnn { }; - osqp = callPackage ../development/python-modules/osqp { }; + matchpy = callPackage ../development/python-modules/matchpy { }; - oyaml = callPackage ../development/python-modules/oyaml { }; + mathlibtools = callPackage ../development/python-modules/mathlibtools { }; - pam = callPackage ../development/python-modules/pam { - inherit (pkgs) pam; + matplotlib = let + path = if isPy3k then + ../development/python-modules/matplotlib/default.nix + else + ../development/python-modules/matplotlib/2.nix; + in callPackage path { + stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; + inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; + inherit (pkgs) pkgconfig; }; - pamela = callPackage ../development/python-modules/pamela { }; + matrix-client = callPackage ../development/python-modules/matrix-client { }; - paperspace = callPackage ../development/python-modules/paperspace { }; + matrix-nio = callPackage ../development/python-modules/matrix-nio { }; - paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; + mautrix = callPackage ../development/python-modules/mautrix { }; - papis = callPackage ../development/python-modules/papis { }; + mautrix-appservice = self.mautrix; # alias 2019-12-28 - papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; + maxminddb = callPackage ../development/python-modules/maxminddb { }; - pathspec = callPackage ../development/python-modules/pathspec { }; + maya = callPackage ../development/python-modules/maya { }; - pathtools = callPackage ../development/python-modules/pathtools { }; + mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { + inherit buildPythonPackage isPy27 fetchPypi; + inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; + }; - paver = callPackage ../development/python-modules/paver { }; + mccabe = callPackage ../development/python-modules/mccabe { }; - passlib = callPackage ../development/python-modules/passlib { }; + MDP = callPackage ../development/python-modules/mdp { }; - path-and-address = callPackage ../development/python-modules/path-and-address { }; + measurement = callPackage ../development/python-modules/measurement { }; - peppercorn = callPackage ../development/python-modules/peppercorn { }; + mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; - pex = callPackage ../development/python-modules/pex { }; + MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup { }; - phe = callPackage ../development/python-modules/phe { }; + mechanize = callPackage ../development/python-modules/mechanize { }; - phpserialize = callPackage ../development/python-modules/phpserialize { }; + meinheld = callPackage ../development/python-modules/meinheld { }; - plaid-python = callPackage ../development/python-modules/plaid-python { }; + meld3 = callPackage ../development/python-modules/meld3 { }; - plaster = callPackage ../development/python-modules/plaster {}; + meliae = callPackage ../development/python-modules/meliae { }; - plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy {}; + memcached = callPackage ../development/python-modules/memcached { }; - playsound = callPackage ../development/python-modules/playsound { }; + memory_profiler = callPackage ../development/python-modules/memory_profiler { }; - plexapi = callPackage ../development/python-modules/plexapi { }; + mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { python3Packages = self; })); - plexauth = callPackage ../development/python-modules/plexauth { }; + merkletools = callPackage ../development/python-modules/merkletools { }; - plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; + mesa = callPackage ../development/python-modules/mesa { }; - plotly = callPackage ../development/python-modules/plotly { }; + meshlabxml = callPackage ../development/python-modules/meshlabxml { }; - plyfile = callPackage ../development/python-modules/plyfile { }; + meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { python3 = python; }).overrideAttrs + (oldAttrs: { # We do not want the setup hook in Python packages because the build is performed differently. + setupHook = null; + }))); - podcastparser = callPackage ../development/python-modules/podcastparser { }; + mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; - podcats = callPackage ../development/python-modules/podcats { }; + metaphone = callPackage ../development/python-modules/metaphone { }; - pomegranate = callPackage ../development/python-modules/pomegranate { }; + mezzanine = callPackage ../development/python-modules/mezzanine { }; - poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { - inherit (pkgs.qt5) qtbase; - inherit (pkgs.libsForQt5) poppler; - inherit (pkgs) pkgconfig; - }; + micawber = callPackage ../development/python-modules/micawber { }; - poyo = callPackage ../development/python-modules/poyo { }; + midiutil = callPackage ../development/python-modules/midiutil { }; - priority = callPackage ../development/python-modules/priority { }; + mido = callPackage ../development/python-modules/mido { }; - privacyidea = callPackage ../development/python-modules/privacyidea { }; - privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; + milksnake = callPackage ../development/python-modules/milksnake { }; - prov = callPackage ../development/python-modules/prov { }; + minidb = callPackage ../development/python-modules/minidb { }; - pudb = callPackage ../development/python-modules/pudb { }; + minimock = callPackage ../development/python-modules/minimock { }; - pybtex = callPackage ../development/python-modules/pybtex {}; + mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py; - pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils {}; + minio = callPackage ../development/python-modules/minio { }; - pycallgraph = callPackage ../development/python-modules/pycallgraph { }; + miniupnpc = callPackage ../development/python-modules/miniupnpc { }; - pycassa = callPackage ../development/python-modules/pycassa { }; + misaka = callPackage ../development/python-modules/misaka { }; - lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { - python3 = python; - })); + mistune = callPackage ../development/python-modules/mistune { }; - pyblake2 = callPackage ../development/python-modules/pyblake2 { }; + mixpanel = callPackage ../development/python-modules/mixpanel { }; - pybluez = callPackage ../development/python-modules/pybluez { }; + mkl-service = callPackage ../development/python-modules/mkl-service { }; - pycares = callPackage ../development/python-modules/pycares { }; + mlflow = callPackage ../development/python-modules/mlflow { }; - pycuda = callPackage ../development/python-modules/pycuda { - cudatoolkit = pkgs.cudatoolkit; - inherit (pkgs.stdenv) mkDerivation; - }; + mlrose = callPackage ../development/python-modules/mlrose { }; - pydotplus = callPackage ../development/python-modules/pydotplus { }; + mmh3 = callPackage ../development/python-modules/mmh3 { }; - pyfxa = callPackage ../development/python-modules/pyfxa { }; + mmpython = callPackage ../development/python-modules/mmpython { }; - pygls = callPackage ../development/python-modules/pygls {}; + mnemonic = callPackage ../development/python-modules/mnemonic { }; - pyhomematic = callPackage ../development/python-modules/pyhomematic { }; + mnist = callPackage ../development/python-modules/mnist { }; - pylama = callPackage ../development/python-modules/pylama { }; + mocket = callPackage ../development/python-modules/mocket { }; - pylatexenc = callPackage ../development/python-modules/pylatexenc { }; + mock = if pythonOlder "3.6" then + callPackage ../development/python-modules/mock/2.nix { } + else + callPackage ../development/python-modules/mock { }; - pymbolic = callPackage ../development/python-modules/pymbolic { }; + mockito = callPackage ../development/python-modules/mockito { }; - pymediainfo = callPackage ../development/python-modules/pymediainfo { }; + mock-open = callPackage ../development/python-modules/mock-open { }; - pyphen = callPackage ../development/python-modules/pyphen {}; + modeled = callPackage ../development/python-modules/modeled { }; - pypoppler = callPackage ../development/python-modules/pypoppler { }; + moderngl = callPackage ../development/python-modules/moderngl { }; - pypillowfight = callPackage ../development/python-modules/pypillowfight { }; + moderngl-window = callPackage ../development/python-modules/moderngl_window { }; - pyprind = callPackage ../development/python-modules/pyprind { }; + modestmaps = callPackage ../development/python-modules/modestmaps { }; - python-axolotl = callPackage ../development/python-modules/python-axolotl { }; + moinmoin = callPackage ../development/python-modules/moinmoin + { }; # Needed here because moinmoin is loaded as a Python library. - python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; + mongodict = callPackage ../development/python-modules/mongodict { }; - python-pam = callPackage ../development/python-modules/python-pam { }; + mongoengine = callPackage ../development/python-modules/mongoengine { }; - pythonix = callPackage ../development/python-modules/pythonix { - inherit (pkgs) meson pkgconfig; - }; + monkeyhex = callPackage ../development/python-modules/monkeyhex { }; - python-lzf = callPackage ../development/python-modules/python-lzf { }; + monosat = disabledIf (!isPy3k) (pkgs.monosat.python { + inherit buildPythonPackage; + inherit (self) cython; + }); - pyramid = callPackage ../development/python-modules/pyramid { }; + monotonic = callPackage ../development/python-modules/monotonic { }; - pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; + monty = callPackage ../development/python-modules/monty { }; - pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; + more-itertools = if isPy27 then + callPackage ../development/python-modules/more-itertools/2.7.nix { } + else + callPackage ../development/python-modules/more-itertools { }; - pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; + moretools = callPackage ../development/python-modules/moretools { }; - pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; + morphys = callPackage ../development/python-modules/morphys { }; - peewee = callPackage ../development/python-modules/peewee { }; + mortgage = callPackage ../development/python-modules/mortgage { }; - pyroma = callPackage ../development/python-modules/pyroma { }; + moto = callPackage ../development/python-modules/moto { }; - pyroute2 = callPackage ../development/python-modules/pyroute2 { }; + moviepy = callPackage ../development/python-modules/moviepy { }; - pyspf = callPackage ../development/python-modules/pyspf { }; + mox3 = callPackage ../development/python-modules/mox3 { }; - pysptk = callPackage ../development/python-modules/pysptk { }; + mox = callPackage ../development/python-modules/mox { }; - pysrim = callPackage ../development/python-modules/pysrim { }; + mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix { }; - pysrt = callPackage ../development/python-modules/pysrt { }; + mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix { }; - pytools = callPackage ../development/python-modules/pytools { }; + mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix { }; - python-constraint = callPackage ../development/python-modules/python-constraint { }; + mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix { }; - python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; + mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix { }; - python-lzo = callPackage ../development/python-modules/python-lzo { - inherit (pkgs) lzo; - }; + mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix { }; - pxml = callPackage ../development/python-modules/pxml { }; + moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix { }; - junos-eznc = callPackage ../development/python-modules/junos-eznc {}; + mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix { }; - raven = callPackage ../development/python-modules/raven { }; + mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix { }; - rawkit = callPackage ../development/python-modules/rawkit { }; + mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix { }; - joblib = callPackage ../development/python-modules/joblib { }; + mozsvc = callPackage ../development/python-modules/mozsvc { }; - sarge = callPackage ../development/python-modules/sarge { }; + mozterm = callPackage ../development/python-modules/mozterm { }; - subliminal = callPackage ../development/python-modules/subliminal {}; + moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix { }; - sunpy = callPackage ../development/python-modules/sunpy { }; + mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix { }; - hyperkitty = callPackage ../servers/mail/mailman/hyperkitty.nix { }; + mpd2 = callPackage ../development/python-modules/mpd2 { }; - robot-detection = callPackage ../development/python-modules/robot-detection {}; + mpd = callPackage ../development/python-modules/mpd { }; - cssmin = callPackage ../development/python-modules/cssmin {}; + mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; - django-paintstore = callPackage ../development/python-modules/django-paintstore {}; + mplleaflet = callPackage ../development/python-modules/mplleaflet { }; - django-q = callPackage ../development/python-modules/django-q {}; + mpmath = callPackage ../development/python-modules/mpmath { }; - hyperlink = callPackage ../development/python-modules/hyperlink {}; + mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; }; - zope_copy = callPackage ../development/python-modules/zope_copy {}; + mpyq = callPackage ../development/python-modules/mpyq { }; - s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; + mrbob = callPackage ../development/python-modules/mrbob { }; - py3status = callPackage ../development/python-modules/py3status {}; + msal = callPackage ../development/python-modules/msal { }; - pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; + msal-extensions = callPackage ../development/python-modules/msal-extensions { }; - scandir = callPackage ../development/python-modules/scandir { }; + msgpack = callPackage ../development/python-modules/msgpack { }; - schema = callPackage ../development/python-modules/schema {}; + msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy { }; - simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server {}; + msrestazure = callPackage ../development/python-modules/msrestazure { }; - stem = callPackage ../development/python-modules/stem { }; + msrest = callPackage ../development/python-modules/msrest { }; - svg-path = callPackage ../development/python-modules/svg-path { }; + msrplib = callPackage ../development/python-modules/msrplib { }; - r2pipe = callPackage ../development/python-modules/r2pipe { }; + mt-940 = callPackage ../development/python-modules/mt-940 { }; - regex = callPackage ../development/python-modules/regex { }; + multidict = callPackage ../development/python-modules/multidict { }; - pygrok = callPackage ../development/python-modules/pygrok { }; + multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; - regional = callPackage ../development/python-modules/regional { }; + multipledispatch = callPackage ../development/python-modules/multipledispatch { }; - ratelimiter = callPackage ../development/python-modules/ratelimiter { }; + multiprocess = callPackage ../development/python-modules/multiprocess { }; - pywatchman = callPackage ../development/python-modules/pywatchman { }; + multiset = callPackage ../development/python-modules/multiset { }; - pywavelets = callPackage ../development/python-modules/pywavelets { }; + multitasking = callPackage ../development/python-modules/multitasking { }; - vcrpy = callPackage ../development/python-modules/vcrpy { }; + munch = callPackage ../development/python-modules/munch { }; - descartes = callPackage ../development/python-modules/descartes { }; + munkres = callPackage ../development/python-modules/munkres { }; - chardet = callPackage ../development/python-modules/chardet { }; + murmurhash = callPackage ../development/python-modules/murmurhash { }; - pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; + musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; - pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; + mutag = callPackage ../development/python-modules/mutag { }; - pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; + mutagen = if isPy27 then + callPackage ../development/python-modules/mutagen/1.43.nix { } + else + callPackage ../development/python-modules/mutagen { }; - pytun = callPackage ../development/python-modules/pytun { }; + mutatormath = callPackage ../development/python-modules/mutatormath { }; - rethinkdb = callPackage ../development/python-modules/rethinkdb { }; + muttils = callPackage ../development/python-modules/muttils { }; - roku = callPackage ../development/python-modules/roku { }; + mwclient = callPackage ../development/python-modules/mwclient { }; - roman = callPackage ../development/python-modules/roman { }; + mwlib = callPackage ../development/python-modules/mwlib { }; - rotate-backups = callPackage ../tools/backup/rotate-backups { }; + mwlib-ext = callPackage ../development/python-modules/mwlib-ext { }; - liblarch = callPackage ../development/python-modules/liblarch { }; + mwlib-rl = callPackage ../development/python-modules/mwlib-rl { }; - librosa = callPackage ../development/python-modules/librosa { }; + mwoauth = callPackage ../development/python-modules/mwoauth { }; - samplerate = callPackage ../development/python-modules/samplerate { }; + mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; - screeninfo = callPackage ../development/python-modules/screeninfo { }; + mxnet = callPackage ../development/python-modules/mxnet { }; - ssdeep = callPackage ../development/python-modules/ssdeep { }; + myfitnesspal = callPackage ../development/python-modules/myfitnesspal { }; - ssdp = callPackage ../development/python-modules/ssdp { }; + mygpoclient = callPackage ../development/python-modules/mygpoclient { }; - statsd = callPackage ../development/python-modules/statsd { }; + mypy = callPackage ../development/python-modules/mypy { }; - starfish = callPackage ../development/python-modules/starfish { }; + mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; - swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; + mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; - multi_key_dict = callPackage ../development/python-modules/multi_key_dict { }; + mysqlclient = callPackage ../development/python-modules/mysqlclient { }; - random2 = callPackage ../development/python-modules/random2 { }; + mysql-connector = callPackage ../development/python-modules/mysql-connector { }; - schedule = callPackage ../development/python-modules/schedule { }; + nagiosplugin = callPackage ../development/python-modules/nagiosplugin { }; - repoze_lru = callPackage ../development/python-modules/repoze_lru { }; + namebench = callPackage ../development/python-modules/namebench { }; - repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; + namedlist = callPackage ../development/python-modules/namedlist { }; - setuptools-git = callPackage ../development/python-modules/setuptools-git { }; + nameparser = callPackage ../development/python-modules/nameparser { }; - setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; + names = callPackage ../development/python-modules/names { }; - sievelib = callPackage ../development/python-modules/sievelib { }; + nanoleaf = callPackage ../development/python-modules/nanoleaf { }; - watchdog = callPackage ../development/python-modules/watchdog { }; + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; - zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; + nanotime = callPackage ../development/python-modules/nanotime { }; - validators = callPackage ../development/python-modules/validators { }; + nassl = callPackage ../development/python-modules/nassl { }; - validictory = callPackage ../development/python-modules/validictory { }; + natsort = callPackage ../development/python-modules/natsort { }; - validate-email = callPackage ../development/python-modules/validate-email { }; + naturalsort = callPackage ../development/python-modules/naturalsort { }; - venusian = callPackage ../development/python-modules/venusian { }; + nbclient = callPackage ../development/python-modules/nbclient { }; - chameleon = callPackage ../development/python-modules/chameleon { }; + nbconflux = callPackage ../development/python-modules/nbconflux { }; - ddt = callPackage ../development/python-modules/ddt { }; + nbconvert = callPackage ../development/python-modules/nbconvert { }; - distutils_extra = callPackage ../development/python-modules/distutils_extra { }; + nbdime = callPackage ../development/python-modules/nbdime { }; - pyxdg = callPackage ../development/python-modules/pyxdg { }; + nbformat = if isPy3k then + callPackage ../development/python-modules/nbformat { } + else + callPackage ../development/python-modules/nbformat/2.nix { }; - crayons = callPackage ../development/python-modules/crayons{ }; + nbmerge = callPackage ../development/python-modules/nbmerge { }; - django = self.django_lts; + nbsmoke = callPackage ../development/python-modules/nbsmoke { }; - django_lts = self.django_2_2; + nbsphinx = callPackage ../development/python-modules/nbsphinx { }; - django_1_11 = callPackage ../development/python-modules/django/1_11.nix { - gdal = self.gdal; - }; + nbval = callPackage ../development/python-modules/nbval { }; - django_2_2 = callPackage ../development/python-modules/django/2_2.nix { }; + nbxmpp = callPackage ../development/python-modules/nbxmpp { }; - django-allauth = callPackage ../development/python-modules/django-allauth { }; + ncclient = callPackage ../development/python-modules/ncclient { }; - django-anymail = callPackage ../development/python-modules/django-anymail {}; + ndg-httpsclient = callPackage ../development/python-modules/ndg-httpsclient { }; - django_appconf = callPackage ../development/python-modules/django_appconf { }; + ndtypes = callPackage ../development/python-modules/ndtypes { }; - django-auth-ldap = callPackage ../development/python-modules/django-auth-ldap { }; + neo = callPackage ../development/python-modules/neo { }; - django_colorful = callPackage ../development/python-modules/django_colorful { }; + nest-asyncio = callPackage ../development/python-modules/nest-asyncio { }; - django-cache-url = callPackage ../development/python-modules/django-cache-url { }; + netaddr = callPackage ../development/python-modules/netaddr { }; - django-cleanup = callPackage ../development/python-modules/django-cleanup { }; + netcdf4 = callPackage ../development/python-modules/netcdf4 { }; - django-configurations = callPackage ../development/python-modules/django-configurations { }; + netdisco = callPackage ../development/python-modules/netdisco { }; - django_compressor = callPackage ../development/python-modules/django_compressor { }; + netifaces = callPackage ../development/python-modules/netifaces { }; - django_compat = callPackage ../development/python-modules/django-compat { }; + networkx = if isPy3k then + callPackage ../development/python-modules/networkx { } + else + callPackage ../development/python-modules/networkx/2.2.nix { }; - django_contrib_comments = callPackage ../development/python-modules/django_contrib_comments { }; + neuron-mpi = pkgs.neuron-mpi.override { inherit python; }; - django-cors-headers = callPackage ../development/python-modules/django-cors-headers { }; + neuron = pkgs.neuron.override { inherit python; }; - django-csp = callPackage ../development/python-modules/django-csp { }; + neuronpy = callPackage ../development/python-modules/neuronpy { }; - django-discover-runner = callPackage ../development/python-modules/django-discover-runner { }; + nevow = callPackage ../development/python-modules/nevow { }; - django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { }; + nghttp2 = (toPythonModule (pkgs.nghttp2.override { + inherit (self) python cython setuptools; + inherit (pkgs) ncurses; + enablePython = true; + })).python; - django_environ = callPackage ../development/python-modules/django_environ { }; + nibabel = callPackage ../development/python-modules/nibabel { }; - django_evolution = callPackage ../development/python-modules/django_evolution { }; + nidaqmx = callPackage ../development/python-modules/nidaqmx { }; - django_extensions = callPackage ../development/python-modules/django-extensions { }; + Nikola = callPackage ../development/python-modules/Nikola { }; - django-filter = callPackage ../development/python-modules/django-filter { }; + nilearn = callPackage ../development/python-modules/nilearn { }; - django-gravatar2 = callPackage ../development/python-modules/django-gravatar2 { }; + nimfa = callPackage ../development/python-modules/nimfa { }; - django_guardian = callPackage ../development/python-modules/django_guardian { }; + nine = callPackage ../development/python-modules/nine { }; - django-ipware = callPackage ../development/python-modules/django-ipware { }; + nipy = callPackage ../development/python-modules/nipy { }; - django-jinja = callPackage ../development/python-modules/django-jinja2 { }; + nipype = callPackage ../development/python-modules/nipype { inherit (pkgs) which; }; - django-logentry-admin = callPackage ../development/python-modules/django-logentry-admin { }; + nitime = callPackage ../development/python-modules/nitime { }; - django-mailman3 = callPackage ../development/python-modules/django-mailman3 { }; + nitpick = callPackage ../applications/version-management/nitpick { }; - django-oauth-toolkit = callPackage ../development/python-modules/django-oauth-toolkit { }; + nix-kernel = callPackage ../development/python-modules/nix-kernel { inherit (pkgs) nix; }; - django-pglocks = callPackage ../development/python-modules/django-pglocks { }; + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 + { }; # This is used for NixOps to make sure we won't break it with the next major version of nixpart. - django-picklefield = callPackage ../development/python-modules/django-picklefield { }; + nixpart = callPackage ../tools/filesystems/nixpart { }; - django_polymorphic = callPackage ../development/python-modules/django-polymorphic { }; + nixpkgs = callPackage ../development/python-modules/nixpkgs { }; - django-postgresql-netfields = callPackage ../development/python-modules/django-postgresql-netfields { }; + nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; - django-ranged-response = callPackage ../development/python-modules/django-ranged-response { }; + nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { }; - django-rest-auth = callPackage ../development/python-modules/django-rest-auth { }; + nltk = callPackage ../development/python-modules/nltk { }; - django-sampledatahelper = callPackage ../development/python-modules/django-sampledatahelper { }; + nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; - django-simple-captcha = callPackage ../development/python-modules/django-simple-captcha { }; + nmigen = callPackage ../development/python-modules/nmigen { }; - django-sites = callPackage ../development/python-modules/django-sites { }; + nmigen-soc = callPackage ../development/python-modules/nmigen-soc { }; - django-sr = callPackage ../development/python-modules/django-sr { }; + nodeenv = callPackage ../development/python-modules/nodeenv { }; - django-storages = callPackage ../development/python-modules/django-storages { }; + node-semver = callPackage ../development/python-modules/node-semver { }; - django-versatileimagefield = callPackage ../development/python-modules/django-versatileimagefield { }; + noise = callPackage ../development/python-modules/noise { }; - django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { }; + nose2 = callPackage ../development/python-modules/nose2 { }; - django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { }; + nose = callPackage ../development/python-modules/nose { }; - django_tagging = callPackage ../development/python-modules/django_tagging { }; + nose-cov = callPackage ../development/python-modules/nose-cov { }; - django_classytags = callPackage ../development/python-modules/django_classytags { }; + nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; - # This package may need an older version of Django. - # Override the package set and set e.g. `django = super.django_1_9`. - # See the Nixpkgs manual for examples on how to override the package set. - django_hijack = callPackage ../development/python-modules/django-hijack { }; + nose-cprof = callPackage ../development/python-modules/nose-cprof { }; - django_hijack_admin = callPackage ../development/python-modules/django-hijack-admin { }; + nose-exclude = callPackage ../development/python-modules/nose-exclude { }; - django_nose = callPackage ../development/python-modules/django_nose { }; + nose-focus = callPackage ../development/python-modules/nose-focus { }; - django_modelcluster = callPackage ../development/python-modules/django_modelcluster { }; + nosejs = callPackage ../development/python-modules/nosejs { }; - djangorestframework = callPackage ../development/python-modules/djangorestframework { }; + nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; - djangorestframework-jwt = callPackage ../development/python-modules/djangorestframework-jwt { }; + nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; - djangorestframework-simplejwt = callPackage ../development/python-modules/djangorestframework-simplejwt { }; + nose_progressive = callPackage ../development/python-modules/nose_progressive { }; - django-raster = callPackage ../development/python-modules/django-raster { }; + nose-randomly = callPackage ../development/python-modules/nose-randomly { }; - django_redis = callPackage ../development/python-modules/django_redis { }; + nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { }; - django_reversion = callPackage ../development/python-modules/django_reversion { }; + nosexcover = callPackage ../development/python-modules/nosexcover { }; - django_silk = callPackage ../development/python-modules/django_silk { }; + notebook = if isPy3k then + callPackage ../development/python-modules/notebook { } + else + callPackage ../development/python-modules/notebook/2.nix { }; - django_taggit = callPackage ../development/python-modules/django_taggit { }; + notedown = callPackage ../development/python-modules/notedown { }; - django_treebeard = callPackage ../development/python-modules/django_treebeard { }; + notify2 = callPackage ../development/python-modules/notify2 { }; - django_pipeline = callPackage ../development/python-modules/django-pipeline { }; + notify = callPackage ../development/python-modules/notify { }; - djangoql = callPackage ../development/python-modules/djangoql { }; + notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; - dj-database-url = callPackage ../development/python-modules/dj-database-url { }; + nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; - dj-email-url = callPackage ../development/python-modules/dj-email-url { }; + nplusone = callPackage ../development/python-modules/nplusone { }; - dj-search-url = callPackage ../development/python-modules/dj-search-url { }; + ntlm-auth = callPackage ../development/python-modules/ntlm-auth { }; - djmail = callPackage ../development/python-modules/djmail { }; + ntplib = callPackage ../development/python-modules/ntplib { }; - pillowfight = callPackage ../development/python-modules/pillowfight { }; + Nuitka = callPackage ../development/python-modules/nuitka { }; - kaptan = callPackage ../development/python-modules/kaptan { }; + num2words = callPackage ../development/python-modules/num2words { }; - keepalive = callPackage ../development/python-modules/keepalive { }; + numba = callPackage ../development/python-modules/numba { }; - keyrings-alt = callPackage ../development/python-modules/keyrings-alt {}; + numcodecs = callPackage ../development/python-modules/numcodecs { inherit (pkgs) gcc8; }; - SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; + numericalunits = callPackage ../development/python-modules/numericalunits { }; - duckdb = callPackage ../development/python-modules/duckdb { - duckdb = pkgs.duckdb; - }; + numexpr = callPackage ../development/python-modules/numexpr { }; - dulwich = if isPy3k then - callPackage ../development/python-modules/dulwich { } - else - callPackage ../development/python-modules/dulwich/0_19.nix { }; + numpydoc = callPackage ../development/python-modules/numpydoc { }; - hg-git = callPackage ../development/python-modules/hg-git { }; + numpy = if pythonOlder "3.5" then + callPackage ../development/python-modules/numpy/1.16.nix { } + else + callPackage ../development/python-modules/numpy { }; - hg-evolve = callPackage ../development/python-modules/hg-evolve { }; + numpy-stl = callPackage ../development/python-modules/numpy-stl { }; - dtopt = callPackage ../development/python-modules/dtopt { }; + numtraits = callPackage ../development/python-modules/numtraits { }; - easywatch = callPackage ../development/python-modules/easywatch { }; + nunavut = callPackage ../development/python-modules/nunavut { }; - ecdsa = callPackage ../development/python-modules/ecdsa { }; + nvchecker = callPackage ../development/python-modules/nvchecker { }; - ecos = callPackage ../development/python-modules/ecos { }; + nwdiag = callPackage ../development/python-modules/nwdiag { }; - effect = callPackage ../development/python-modules/effect {}; + nxt-python = callPackage ../development/python-modules/nxt-python { }; - enum = callPackage ../development/python-modules/enum { }; + oath = callPackage ../development/python-modules/oath { }; - enum-compat = callPackage ../development/python-modules/enum-compat { }; + oauth2 = callPackage ../development/python-modules/oauth2 { }; - enum34 = callPackage ../development/python-modules/enum34 { }; + oauth2client = callPackage ../development/python-modules/oauth2client { }; - epc = callPackage ../development/python-modules/epc { }; + oauth = callPackage ../development/python-modules/oauth { }; - et_xmlfile = callPackage ../development/python-modules/et_xmlfile { }; + oauthenticator = callPackage ../development/python-modules/oauthenticator { }; - etesync = callPackage ../development/python-modules/etesync { }; + oauthlib = if isPy27 then + callPackage ../development/python-modules/oauthlib/3.1.nix { } + else + callPackage ../development/python-modules/oauthlib { }; - eventlet = callPackage ../development/python-modules/eventlet { }; + obfsproxy = callPackage ../development/python-modules/obfsproxy { }; - executing = callPackage ../development/python-modules/executing { }; + objgraph = callPackage ../development/python-modules/objgraph { graphvizPkg = pkgs.graphviz; }; - exifread = callPackage ../development/python-modules/exifread { }; + od = callPackage ../development/python-modules/od { }; - fastimport = callPackage ../development/python-modules/fastimport { }; + odfpy = callPackage ../development/python-modules/odfpy { }; - fastpair = callPackage ../development/python-modules/fastpair { }; + offtrac = callPackage ../development/python-modules/offtrac { }; - fastrlock = callPackage ../development/python-modules/fastrlock {}; + ofxclient = callPackage ../development/python-modules/ofxclient { }; - feedgen = callPackage ../development/python-modules/feedgen { }; + ofxhome = callPackage ../development/python-modules/ofxhome { }; - feedgenerator = callPackage ../development/python-modules/feedgenerator { - inherit (pkgs) glibcLocales; - }; + ofxparse = callPackage ../development/python-modules/ofxparse { }; - feedparser = callPackage ../development/python-modules/feedparser { }; + ofxtools = callPackage ../development/python-modules/ofxtools { }; - pyfribidi = callPackage ../development/python-modules/pyfribidi { }; + olefile = callPackage ../development/python-modules/olefile { }; - pyfritzhome = callPackage ../development/python-modules/pyfritzhome { }; + omegaconf = callPackage ../development/python-modules/omegaconf { }; - pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; + onkyo-eiscp = callPackage ../development/python-modules/onkyo-eiscp { }; - filebrowser_safe = callPackage ../development/python-modules/filebrowser_safe { }; + onnx = callPackage ../development/python-modules/onnx { }; - pycodestyle = callPackage ../development/python-modules/pycodestyle { }; + openant = callPackage ../development/python-modules/openant { }; - filebytes = callPackage ../development/python-modules/filebytes { }; + openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; - filelock = callPackage ../development/python-modules/filelock {}; + opencv3 = toPythonModule (pkgs.opencv3.override { + enablePython = true; + pythonPackages = self; + }); - fiona = callPackage ../development/python-modules/fiona { gdal_2 = pkgs.gdal_2; }; + opencv4 = toPythonModule (pkgs.opencv4.override { + enablePython = true; + pythonPackages = self; + }); - fitbit = callPackage ../development/python-modules/fitbit { }; + opencv = disabledIf isPy3k (toPythonModule (pkgs.opencv.override { + enablePython = true; + pythonPackages = self; + })); - flake8 = callPackage ../development/python-modules/flake8 { }; + openidc-client = callPackage ../development/python-modules/openidc-client { }; - flake8-blind-except = callPackage ../development/python-modules/flake8-blind-except { }; + openpyxl = if pythonAtLeast "3.6" then + callPackage ../development/python-modules/openpyxl { } + else + callPackage ../development/python-modules/openpyxl/2.nix { }; - flake8-debugger = callPackage ../development/python-modules/flake8-debugger { }; + openrazer = callPackage ../development/python-modules/openrazer/pylib.nix { }; - flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; + openrazer-daemon = callPackage ../development/python-modules/openrazer/daemon.nix { }; - flake8-import-order = callPackage ../development/python-modules/flake8-import-order { }; + opentimestamps = callPackage ../development/python-modules/opentimestamps { }; - flake8-polyfill = callPackage ../development/python-modules/flake8-polyfill { }; + opentracing = callPackage ../development/python-modules/opentracing { }; - flaky = callPackage ../development/python-modules/flaky { }; + openwebifpy = callPackage ../development/python-modules/openwebifpy { }; - flask = callPackage ../development/python-modules/flask { }; + openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); - flask-admin = callPackage ../development/python-modules/flask-admin { }; + opt-einsum = if isPy27 then + callPackage ../development/python-modules/opt-einsum/2.nix { } + else + callPackage ../development/python-modules/opt-einsum { }; - flask-appbuilder = callPackage ../development/python-modules/flask-appbuilder { }; + optuna = callPackage ../development/python-modules/optuna { }; - flask-api = callPackage ../development/python-modules/flask-api { }; + opuslib = callPackage ../development/python-modules/opuslib { }; - flask_assets = callPackage ../development/python-modules/flask-assets { }; + ordereddict = callPackage ../development/python-modules/ordereddict { }; - flask-autoindex = callPackage ../development/python-modules/flask-autoindex { }; + orderedmultidict = callPackage ../development/python-modules/orderedmultidict { }; - flask-babel = callPackage ../development/python-modules/flask-babel { }; + ordered-set = callPackage ../development/python-modules/ordered-set { }; - flask-babelex = callPackage ../development/python-modules/flask-babelex { }; + orderedset = callPackage ../development/python-modules/orderedset { }; - flask-bcrypt = callPackage ../development/python-modules/flask-bcrypt { }; + orm = callPackage ../development/python-modules/orm { }; - flask-bootstrap = callPackage ../development/python-modules/flask-bootstrap { }; + ortools = (toPythonModule (pkgs.or-tools.override { inherit (self) python; })).python; - flask-caching = callPackage ../development/python-modules/flask-caching { }; + osc = callPackage ../development/python-modules/osc { }; - flask-common = callPackage ../development/python-modules/flask-common { }; + oscrypto = callPackage ../development/python-modules/oscrypto { }; - flask-compress = callPackage ../development/python-modules/flask-compress { }; + oset = callPackage ../development/python-modules/oset { }; - flask-cors = callPackage ../development/python-modules/flask-cors { }; + osmnx = callPackage ../development/python-modules/osmnx { }; - flask_elastic = callPackage ../development/python-modules/flask-elastic { }; + osmpythontools = callPackage ../development/python-modules/osmpythontools { }; - flask-httpauth = callPackage ../development/python-modules/flask-httpauth { }; + osqp = callPackage ../development/python-modules/osqp { }; - flask-jwt-extended = callPackage ../development/python-modules/flask-jwt-extended { }; + outcome = callPackage ../development/python-modules/outcome { }; - flask-limiter = callPackage ../development/python-modules/flask-limiter { }; + ovh = callPackage ../development/python-modules/ovh { }; - flask_login = callPackage ../development/python-modules/flask-login { }; + ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito { pythonPackages = self; }); - flask_ldap_login = callPackage ../development/python-modules/flask-ldap-login { }; + owslib = callPackage ../development/python-modules/owslib { }; - flask_mail = callPackage ../development/python-modules/flask-mail { }; + oyaml = callPackage ../development/python-modules/oyaml { }; - flask_marshmallow = callPackage ../development/python-modules/flask-marshmallow { }; + packaging = callPackage ../development/python-modules/packaging { }; - flask_migrate = callPackage ../development/python-modules/flask-migrate { }; + packet-python = callPackage ../development/python-modules/packet-python { }; - flask-mongoengine = callPackage ../development/python-modules/flask-mongoengine { }; + pafy = callPackage ../development/python-modules/pafy { }; - flask-openid = callPackage ../development/python-modules/flask-openid { }; + pagelabels = callPackage ../development/python-modules/pagelabels { }; - flask-paginate = callPackage ../development/python-modules/flask-paginate { }; + pagerduty = callPackage ../development/python-modules/pagerduty { }; - flask_principal = callPackage ../development/python-modules/flask-principal { }; + paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; - flask-pymongo = callPackage ../development/python-modules/Flask-PyMongo { }; + palettable = callPackage ../development/python-modules/palettable { }; - flask-restful = callPackage ../development/python-modules/flask-restful { }; + pam = callPackage ../development/python-modules/pam { inherit (pkgs) pam; }; - flask-restplus = callPackage ../development/python-modules/flask-restplus { }; + pamela = callPackage ../development/python-modules/pamela { }; - flask-restx = callPackage ../development/python-modules/flask-restx { }; + pamqp = callPackage ../development/python-modules/pamqp { }; - flask-reverse-proxy-fix = callPackage ../development/python-modules/flask-reverse-proxy-fix { }; + pandas = if isPy3k then + callPackage ../development/python-modules/pandas { } + else + callPackage ../development/python-modules/pandas/2.nix { }; - flask_script = callPackage ../development/python-modules/flask-script { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; - flask-silk = callPackage ../development/python-modules/flask-silk { }; + pandocfilters = callPackage ../development/python-modules/pandocfilters { }; - flask-socketio = callPackage ../development/python-modules/flask-socketio { }; + panel = callPackage ../development/python-modules/panel { }; - flask-sockets = callPackage ../development/python-modules/flask-sockets { }; + papermill = callPackage ../development/python-modules/papermill { }; - flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { }; + paperspace = callPackage ../development/python-modules/paperspace { }; - flask-swagger = callPackage ../development/python-modules/flask-swagger { }; + paperwork-backend = callPackage ../applications/office/paperwork/backend.nix { }; - flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { }; + papis = callPackage ../development/python-modules/papis { }; - flask_testing = callPackage ../development/python-modules/flask-testing { }; + papis-python-rofi = callPackage ../development/python-modules/papis-python-rofi { }; - flask-versioned = callPackage ../development/python-modules/flask-versioned { }; + param = callPackage ../development/python-modules/param { }; - flask_wtf = callPackage ../development/python-modules/flask-wtf { }; + parameterized = callPackage ../development/python-modules/parameterized { }; - wtforms = callPackage ../development/python-modules/wtforms { }; + paramiko = callPackage ../development/python-modules/paramiko { }; - wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; + paramz = callPackage ../development/python-modules/paramz { }; - graph-tool = callPackage ../development/python-modules/graph-tool/2.x.x.nix { - inherit (pkgs) pkg-config; - }; + parfive = callPackage ../development/python-modules/parfive { }; - grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; + parse = callPackage ../development/python-modules/parse { }; - greatfet = callPackage ../development/python-modules/greatfet { }; + parsedatetime = callPackage ../development/python-modules/parsedatetime { }; - pygreat = callPackage ../development/python-modules/pygreat { }; + parsel = callPackage ../development/python-modules/parsel { }; - pytorch = callPackage ../development/python-modules/pytorch { - cudaSupport = pkgs.config.cudaSupport or false; - }; + parse-type = callPackage ../development/python-modules/parse-type { }; - pyro-ppl = callPackage ../development/python-modules/pyro-ppl {}; + parsimonious = callPackage ../development/python-modules/parsimonious { }; - opt-einsum = if isPy27 then - callPackage ../development/python-modules/opt-einsum/2.nix {} - else - callPackage ../development/python-modules/opt-einsum {}; + parsley = callPackage ../development/python-modules/parsley { }; - pytorchWithCuda = self.pytorch.override { - cudaSupport = true; - }; + parso = callPackage ../development/python-modules/parso { }; - pytorchWithoutCuda = self.pytorch.override { - cudaSupport = false; - }; + parsy = callPackage ../development/python-modules/parsy { }; - pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; + partd = callPackage ../development/python-modules/partd { }; - pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; + parver = callPackage ../development/python-modules/parver { }; + arpeggio = callPackage ../development/python-modules/arpeggio { }; - pythondialog = callPackage ../development/python-modules/pythondialog { }; + passlib = callPackage ../development/python-modules/passlib { }; - python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; + paste = callPackage ../development/python-modules/paste { }; - pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; + PasteDeploy = callPackage ../development/python-modules/pastedeploy { }; - rfc3987 = callPackage ../development/python-modules/rfc3987 { }; + pastel = callPackage ../development/python-modules/pastel { }; - ConfigArgParse = callPackage ../development/python-modules/configargparse { }; + pasteScript = callPackage ../development/python-modules/pastescript { }; - jsonschema = callPackage ../development/python-modules/jsonschema { }; + patator = callPackage ../development/python-modules/patator { }; - vcver = callPackage ../development/python-modules/vcver { }; + patch = callPackage ../development/python-modules/patch { }; - vcversioner = callPackage ../development/python-modules/vcversioner { }; + patch-ng = callPackage ../development/python-modules/patch-ng { }; - falcon = callPackage ../development/python-modules/falcon { }; + path-and-address = callPackage ../development/python-modules/path-and-address { }; - hug = callPackage ../development/python-modules/hug { }; + pathlib2 = callPackage ../development/python-modules/pathlib2 { }; - flup = callPackage ../development/python-modules/flup { }; + pathlib = callPackage ../development/python-modules/pathlib { }; - fn = callPackage ../development/python-modules/fn { }; + pathos = callPackage ../development/python-modules/pathos { }; - folium = callPackage ../development/python-modules/folium { }; + pathpy = if isPy3k then + callPackage ../development/python-modules/path.py { } + else + callPackage ../development/python-modules/path.py/2.nix { }; - fontforge = disabledIf (!isPy3k) (toPythonModule (pkgs.fontforge.override { - withPython = true; - inherit python; - })); + pathspec = callPackage ../development/python-modules/pathspec { }; - fonttools = callPackage ../development/python-modules/fonttools { }; + pathtools = callPackage ../development/python-modules/pathtools { }; - foolscap = callPackage ../development/python-modules/foolscap { }; + patsy = callPackage ../development/python-modules/patsy { }; - forbiddenfruit = callPackage ../development/python-modules/forbiddenfruit { }; + paver = callPackage ../development/python-modules/paver { }; - fusepy = callPackage ../development/python-modules/fusepy { }; + paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; - future = callPackage ../development/python-modules/future { }; + pbkdf2 = callPackage ../development/python-modules/pbkdf2 { }; - futures = callPackage ../development/python-modules/futures { }; + pbr = callPackage ../development/python-modules/pbr { }; - galario = toPythonModule (pkgs.galario.override { - enablePython = true; - pythonPackages = self; - }); + pc-ble-driver-py = toPythonModule (callPackage ../development/python-modules/pc-ble-driver-py { }); - gcovr = callPackage ../development/python-modules/gcovr { }; + pcpp = callPackage ../development/python-modules/pcpp { }; - gdal = toPythonModule (pkgs.gdal.override { - pythonPackages = self; - }); + pdf2image = callPackage ../development/python-modules/pdf2image { }; - gdrivefs = callPackage ../development/python-modules/gdrivefs { }; + pdfkit = callPackage ../development/python-modules/pdfkit { }; - geant4 = disabledIf (!isPy3k) (toPythonModule (pkgs.geant4.override { - enablePython = true; - python3 = python; - })); + pdfminer = callPackage ../development/python-modules/pdfminer_six { }; - genshi = callPackage ../development/python-modules/genshi { }; + pdfposter = callPackage ../development/python-modules/pdfposter { }; - gentools = callPackage ../development/python-modules/gentools { }; + pdfrw = callPackage ../development/python-modules/pdfrw { }; - gevent = callPackage ../development/python-modules/gevent { }; + pdftotext = callPackage ../development/python-modules/pdftotext { }; - geventhttpclient = callPackage ../development/python-modules/geventhttpclient { }; + pdfx = callPackage ../development/python-modules/pdfx { }; - gevent-socketio = callPackage ../development/python-modules/gevent-socketio { }; + pecan = callPackage ../development/python-modules/pecan { }; - geopandas = callPackage ../development/python-modules/geopandas { }; + peewee = callPackage ../development/python-modules/peewee { }; - geojson = callPackage ../development/python-modules/geojson { }; + pefile = callPackage ../development/python-modules/pefile { }; - gevent-websocket = callPackage ../development/python-modules/gevent-websocket { }; + pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; - genzshcomp = callPackage ../development/python-modules/genzshcomp { }; + pendulum = callPackage ../development/python-modules/pendulum { }; - gflags = callPackage ../development/python-modules/gflags { }; + pep257 = callPackage ../development/python-modules/pep257 { }; - ghdiff = callPackage ../development/python-modules/ghdiff { }; + pep517 = callPackage ../development/python-modules/pep517 { }; - gipc = callPackage ../development/python-modules/gipc { }; + pep8 = callPackage ../development/python-modules/pep8 { }; - git-revise = callPackage ../development/python-modules/git-revise { }; + pep8-naming = callPackage ../development/python-modules/pep8-naming { }; - git-sweep = callPackage ../development/python-modules/git-sweep { }; + peppercorn = callPackage ../development/python-modules/peppercorn { }; - glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 + percol = callPackage ../development/python-modules/percol { }; - github3_py = callPackage ../development/python-modules/github3_py { }; + perfplot = callPackage ../development/python-modules/perfplot { }; - github-webhook = callPackage ../development/python-modules/github-webhook { }; + periodictable = callPackage ../development/python-modules/periodictable { }; - goobook = callPackage ../development/python-modules/goobook { }; + persim = callPackage ../development/python-modules/persim { }; - googleapis_common_protos = callPackage ../development/python-modules/googleapis_common_protos { }; + persistent = callPackage ../development/python-modules/persistent { }; - google-auth-httplib2 = callPackage ../development/python-modules/google-auth-httplib2 { }; + persisting-theory = callPackage ../development/python-modules/persisting-theory { }; - google-auth-oauthlib = callPackage ../development/python-modules/google-auth-oauthlib { }; + pex = callPackage ../development/python-modules/pex { }; - google_api_core = callPackage ../development/python-modules/google_api_core { }; + pexif = callPackage ../development/python-modules/pexif { }; - google_api_python_client = let - google_api_python_client = callPackage ../development/python-modules/google-api-python-client { }; - in if isPy3k then google_api_python_client else - # Python 2.7 support was deprecated but is still needed by weboob and duplicity - google_api_python_client.overridePythonAttrs (old: rec { - version = "1.7.6"; - src = old.src.override { - inherit version; - sha256 = "14w5sdrp0bk9n0r2lmpqmrbf2zclpfq6q7giyahnskkfzdkb165z"; - }; - }); + pexpect = callPackage ../development/python-modules/pexpect { }; - google_apputils = callPackage ../development/python-modules/google_apputils { }; + pg8000 = callPackage ../development/python-modules/pg8000 { }; + pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; - google_auth = callPackage ../development/python-modules/google_auth { }; + pgcli = callPackage ../development/tools/database/pgcli { }; - google_cloud_asset = callPackage ../development/python-modules/google_cloud_asset { }; + pglast = callPackage ../development/python-modules/pglast { }; - google_cloud_automl = callPackage ../development/python-modules/google_cloud_automl { }; + pgpdump = callPackage ../development/python-modules/pgpdump { }; - google_cloud_core = callPackage ../development/python-modules/google_cloud_core { }; + pgpy = callPackage ../development/python-modules/pgpy { }; - google_cloud_bigquery = callPackage ../development/python-modules/google_cloud_bigquery { }; + pgsanity = callPackage ../development/python-modules/pgsanity { }; - google_cloud_bigquery_datatransfer = callPackage ../development/python-modules/google_cloud_bigquery_datatransfer { }; + pgspecial = callPackage ../development/python-modules/pgspecial { }; - google_cloud_bigtable = callPackage ../development/python-modules/google_cloud_bigtable { }; + phe = callPackage ../development/python-modules/phe { }; - google_cloud_container = callPackage ../development/python-modules/google_cloud_container { }; + phik = callPackage ../development/python-modules/phik { }; - google_cloud_dataproc = callPackage ../development/python-modules/google_cloud_dataproc { }; + phonenumbers = callPackage ../development/python-modules/phonenumbers { }; - google_cloud_datastore = callPackage ../development/python-modules/google_cloud_datastore { }; + phonopy = callPackage ../development/python-modules/phonopy { }; - google_cloud_dlp = callPackage ../development/python-modules/google_cloud_dlp { }; + phpserialize = callPackage ../development/python-modules/phpserialize { }; - google_cloud_dns = callPackage ../development/python-modules/google_cloud_dns { }; + piccata = callPackage ../development/python-modules/piccata { }; - google_cloud_error_reporting = callPackage ../development/python-modules/google_cloud_error_reporting { }; + pickleshare = callPackage ../development/python-modules/pickleshare { }; - google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { }; + picos = callPackage ../development/python-modules/picos { }; - google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { }; + pid = callPackage ../development/python-modules/pid { }; - google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { }; + piep = callPackage ../development/python-modules/piep { }; - google_cloud_language = callPackage ../development/python-modules/google_cloud_language { }; + piexif = callPackage ../development/python-modules/piexif { }; - google_cloud_logging = callPackage ../development/python-modules/google_cloud_logging { }; + pika = callPackage ../development/python-modules/pika { }; - google_cloud_monitoring = callPackage ../development/python-modules/google_cloud_monitoring { }; + pika-pool = callPackage ../development/python-modules/pika-pool { }; - google_cloud_pubsub = callPackage ../development/python-modules/google_cloud_pubsub { }; + pikepdf = callPackage ../development/python-modules/pikepdf { }; - google_cloud_redis = callPackage ../development/python-modules/google_cloud_redis { }; + pilkit = callPackage ../development/python-modules/pilkit { }; - google_cloud_resource_manager = callPackage ../development/python-modules/google_cloud_resource_manager { }; + pillowfight = callPackage ../development/python-modules/pillowfight { }; - google_cloud_runtimeconfig = callPackage ../development/python-modules/google_cloud_runtimeconfig { }; + pillow = if isPy27 then + callPackage ../development/python-modules/pillow/6.nix { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + } + else + callPackage ../development/python-modules/pillow { + inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; + inherit (pkgs.xorg) libX11; + }; - google_cloud_secret_manager = callPackage ../development/python-modules/google_cloud_secret_manager { }; + pims = callPackage ../development/python-modules/pims { }; - google_cloud_securitycenter = callPackage ../development/python-modules/google_cloud_securitycenter { }; + pint = callPackage ../development/python-modules/pint { }; - google_cloud_spanner = callPackage ../development/python-modules/google_cloud_spanner { }; + pip2nix = callPackage ../development/python-modules/pip2nix { }; - google_cloud_storage = callPackage ../development/python-modules/google_cloud_storage { }; + pip = callPackage ../development/python-modules/pip { }; - google_cloud_speech = callPackage ../development/python-modules/google_cloud_speech { }; + pipdate = callPackage ../development/python-modules/pipdate { }; - google_cloud_tasks = callPackage ../development/python-modules/google_cloud_tasks { }; + pip-tools = callPackage ../development/python-modules/pip-tools { + git = pkgs.gitMinimal; + glibcLocales = pkgs.glibcLocales; + }; - google_cloud_testutils = callPackage ../development/python-modules/google_cloud_testutils { }; + pipx = callPackage ../development/python-modules/pipx { }; - google_cloud_texttospeech = callPackage ../development/python-modules/google_cloud_texttospeech { }; + pivy = callPackage ../development/python-modules/pivy { }; - google_cloud_trace = callPackage ../development/python-modules/google_cloud_trace { }; + pkgconfig = callPackage ../development/python-modules/pkgconfig { inherit (pkgs) pkgconfig; }; - google_cloud_translate = callPackage ../development/python-modules/google_cloud_translate { }; + pkginfo = callPackage ../development/python-modules/pkginfo { }; - google_cloud_videointelligence = callPackage ../development/python-modules/google_cloud_videointelligence { }; + pkuseg = callPackage ../development/python-modules/pkuseg { }; - google_cloud_vision = callPackage ../development/python-modules/google_cloud_vision { }; + pkutils = callPackage ../development/python-modules/pkutils { }; - google_cloud_websecurityscanner = callPackage ../development/python-modules/google_cloud_websecurityscanner { }; + plac = callPackage ../development/python-modules/plac { }; - google-i18n-address = callPackage ../development/python-modules/google-i18n-address { }; + plaid-python = callPackage ../development/python-modules/plaid-python { }; - google_resumable_media = callPackage ../development/python-modules/google_resumable_media { }; + plaster = callPackage ../development/python-modules/plaster { }; - gorilla = callPackage ../development/python-modules/gorilla { }; + plaster-pastedeploy = callPackage ../development/python-modules/plaster-pastedeploy { }; - gpgme = toPythonModule (pkgs.gpgme.override { - pythonSupport = true; - inherit python; - }); + playsound = callPackage ../development/python-modules/playsound { }; - gphoto2 = callPackage ../development/python-modules/gphoto2 { - inherit (pkgs) pkgconfig; - }; + plexapi = callPackage ../development/python-modules/plexapi { }; - graphql-core = callPackage ../development/python-modules/graphql-core { }; + plexauth = callPackage ../development/python-modules/plexauth { }; - graphql-server-core = callPackage ../development/python-modules/graphql-server-core { }; + plexwebsocket = callPackage ../development/python-modules/plexwebsocket { }; - grammalecte = callPackage ../development/python-modules/grammalecte { }; + plone-testing = callPackage ../development/python-modules/plone-testing { }; - greenlet = callPackage ../development/python-modules/greenlet { }; + plotly = callPackage ../development/python-modules/plotly { }; - grib-api = disabledIf (!isPy27) (toPythonModule - (pkgs.grib-api.override { - enablePython = true; - pythonPackages = self; - })); + pluggy = callPackage ../development/python-modules/pluggy { }; - grpcio = callPackage ../development/python-modules/grpcio { }; + pluginbase = callPackage ../development/python-modules/pluginbase { }; - grpcio-tools = callPackage ../development/python-modules/grpcio-tools { }; + plumbum = callPackage ../development/python-modules/plumbum { }; - grpcio-gcp = callPackage ../development/python-modules/grpcio-gcp { }; + ply = callPackage ../development/python-modules/ply { }; - grpc_google_iam_v1 = callPackage ../development/python-modules/grpc_google_iam_v1 { }; + plyfile = callPackage ../development/python-modules/plyfile { }; - gspread = callPackage ../development/python-modules/gspread { }; + plyplus = callPackage ../development/python-modules/plyplus { }; - gtts-token = callPackage ../development/python-modules/gtts-token { }; + plyvel = callPackage ../development/python-modules/plyvel { }; - gym = callPackage ../development/python-modules/gym { }; + Pmw = callPackage ../development/python-modules/Pmw { }; - gyp = callPackage ../development/python-modules/gyp { }; + pocket = callPackage ../development/python-modules/pocket { }; - guessit = callPackage ../development/python-modules/guessit { }; + podcastparser = callPackage ../development/python-modules/podcastparser { }; - rebulk = callPackage ../development/python-modules/rebulk { }; + podcats = callPackage ../development/python-modules/podcats { }; - gunicorn = if isPy27 then - callPackage ../development/python-modules/gunicorn/19.nix { } - else - callPackage ../development/python-modules/gunicorn { }; + poetry = callPackage ../development/python-modules/poetry { }; - hawkauthlib = callPackage ../development/python-modules/hawkauthlib { }; + poetry-core = callPackage ../development/python-modules/poetry-core { }; - hdbscan = callPackage ../development/python-modules/hdbscan { }; + poezio = callPackage ../applications/networking/instant-messengers/poezio { inherit (pkgs) pkgconfig; }; - hmmlearn = callPackage ../development/python-modules/hmmlearn { }; + polib = callPackage ../development/python-modules/polib { }; - hcs_utils = callPackage ../development/python-modules/hcs_utils { }; + polyline = callPackage ../development/python-modules/polyline { }; - hetzner = callPackage ../development/python-modules/hetzner { }; + pomegranate = callPackage ../development/python-modules/pomegranate { }; - hiredis = callPackage ../development/python-modules/hiredis { }; + pony = callPackage ../development/python-modules/pony { }; - homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; + ponywhoosh = callPackage ../development/python-modules/ponywhoosh { }; - htmllaundry = callPackage ../development/python-modules/htmllaundry { }; + pooch = callPackage ../development/python-modules/pooch { }; - html-sanitizer = callPackage ../development/python-modules/html-sanitizer { }; + poppler-qt5 = callPackage ../development/python-modules/poppler-qt5 { + inherit (pkgs.qt5) qtbase; + inherit (pkgs.libsForQt5) poppler; + inherit (pkgs) pkgconfig; + }; - html5lib = callPackage ../development/python-modules/html5lib { }; + portalocker = callPackage ../development/python-modules/portalocker { }; - httmock = callPackage ../development/python-modules/httmock { }; + portend = callPackage ../development/python-modules/portend { }; - http_signature = callPackage ../development/python-modules/http_signature { }; + portpicker = callPackage ../development/python-modules/portpicker { }; - httpbin = callPackage ../development/python-modules/httpbin { }; + posix_ipc = callPackage ../development/python-modules/posix_ipc { }; - httplib2 = callPackage ../development/python-modules/httplib2 { }; + poster3 = callPackage ../development/python-modules/poster3 { }; - hvac = callPackage ../development/python-modules/hvac { }; + postorius = disabledIf (!isPy3k) (callPackage ../servers/mail/mailman/postorius.nix { }); - hydra = callPackage ../development/python-modules/hydra { }; + potr = callPackage ../development/python-modules/potr { }; - # File name is called 2.nix because this one will need to remain for Python 2. - hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { }; + power = callPackage ../development/python-modules/power { }; - hypothesis = if isPy3k then - callPackage ../development/python-modules/hypothesis { } - else - self.hypothesis_4; + powerline = callPackage ../development/python-modules/powerline { }; - hydra-check = callPackage ../development/python-modules/hydra-check { }; + pox = callPackage ../development/python-modules/pox { }; - colored = callPackage ../development/python-modules/colored { }; + poyo = callPackage ../development/python-modules/poyo { }; - xdg = callPackage ../development/python-modules/xdg { }; + ppft = callPackage ../development/python-modules/ppft { }; - xdis = callPackage ../development/python-modules/xdis { }; + pplpy = callPackage ../development/python-modules/pplpy { }; - xnd = callPackage ../development/python-modules/xnd { }; + pprintpp = callPackage ../development/python-modules/pprintpp { }; - uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; + pproxy = callPackage ../development/python-modules/pproxy { }; - unrpa = callPackage ../development/python-modules/unrpa { }; + pq = callPackage ../development/python-modules/pq { }; - lsi = callPackage ../development/python-modules/lsi { }; + prance = callPackage ../development/python-modules/prance { }; - hkdf = callPackage ../development/python-modules/hkdf { }; + prawcore = callPackage ../development/python-modules/prawcore { }; - httpretty = if isPy3k then - callPackage ../development/python-modules/httpretty { } + praw = if isPy3k then + callPackage ../development/python-modules/praw { } else - callPackage ../development/python-modules/httpretty/0.nix { }; + callPackage ../development/python-modules/praw/6.3.nix { }; - iapws = callPackage ../development/python-modules/iapws { }; + precis-i18n = callPackage ../development/python-modules/precis-i18n { }; - icalendar = callPackage ../development/python-modules/icalendar { }; + pre-commit = callPackage ../development/python-modules/pre-commit { }; - icecream = callPackage ../development/python-modules/icecream { }; + preggy = callPackage ../development/python-modules/preggy { }; - ics = callPackage ../development/python-modules/ics { }; + premailer = callPackage ../development/python-modules/premailer { }; - ifaddr = callPackage ../development/python-modules/ifaddr { }; + preshed = callPackage ../development/python-modules/preshed { }; - ifconfig-parser = callPackage ../development/python-modules/ifconfig-parser { }; + pretend = callPackage ../development/python-modules/pretend { }; - imagecorruptions = callPackage ../development/python-modules/imagecorruptions { }; + prettytable = callPackage ../development/python-modules/prettytable { }; - imageio = callPackage ../development/python-modules/imageio { }; + priority = callPackage ../development/python-modules/priority { }; - imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { }; + prison = callPackage ../development/python-modules/prison { }; - imgaug = callPackage ../development/python-modules/imgaug { }; + privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; - inflection = callPackage ../development/python-modules/inflection { }; + proboscis = callPackage ../development/python-modules/proboscis { }; - influxdb = callPackage ../development/python-modules/influxdb { }; + process-tests = callPackage ../development/python-modules/process-tests { }; - infoqscraper = callPackage ../development/python-modules/infoqscraper { }; + proglog = callPackage ../development/python-modules/proglog { }; - inifile = callPackage ../development/python-modules/inifile { }; + progressbar231 = callPackage ../development/python-modules/progressbar231 { }; - interruptingcow = callPackage ../development/python-modules/interruptingcow {}; + progressbar2 = callPackage ../development/python-modules/progressbar2 { }; - iocapture = callPackage ../development/python-modules/iocapture { }; + progressbar33 = callPackage ../development/python-modules/progressbar33 { }; - iptools = callPackage ../development/python-modules/iptools { }; + progressbar = callPackage ../development/python-modules/progressbar { }; - ipy = callPackage ../development/python-modules/IPy { }; + progress = callPackage ../development/python-modules/progress { }; - ipydatawidgets = callPackage ../development/python-modules/ipydatawidgets { }; + prometheus_client = callPackage ../development/python-modules/prometheus_client { }; - ipykernel = if pythonOlder "3.4" then - callPackage ../development/python-modules/ipykernel/4.nix { } + promise = callPackage ../development/python-modules/promise { }; + + prompt_toolkit = let + filename = if isPy3k then + ../development/python-modules/prompt_toolkit else - callPackage ../development/python-modules/ipykernel { }; + ../development/python-modules/prompt_toolkit/1.nix; + in callPackage filename { }; - ipyparallel = callPackage ../development/python-modules/ipyparallel { }; + property-manager = callPackage ../development/python-modules/property-manager { }; - ipython = if isPy27 then - callPackage ../development/python-modules/ipython/5.nix { } - else - callPackage ../development/python-modules/ipython { }; + protego = callPackage ../development/python-modules/protego { }; - ipython_genutils = callPackage ../development/python-modules/ipython_genutils { }; + protobuf = callPackage ../development/python-modules/protobuf { + disabled = isPyPy; + doCheck = + !isPy3k; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. + protobuf = pkgs.protobuf; + }; - ipyvue = callPackage ../development/python-modules/ipyvue { }; + prov = callPackage ../development/python-modules/prov { }; - ipyvuetify = callPackage ../development/python-modules/ipyvuetify { }; + prox-tv = callPackage ../development/python-modules/prox-tv { }; - ipywidgets = callPackage ../development/python-modules/ipywidgets { }; + psautohint = callPackage ../development/python-modules/psautohint { }; - ipaddr = callPackage ../development/python-modules/ipaddr { }; + psd-tools = callPackage ../development/python-modules/psd-tools { }; - ipaddress = callPackage ../development/python-modules/ipaddress { }; + psutil = callPackage ../development/python-modules/psutil { }; - ipdb = callPackage ../development/python-modules/ipdb { }; + psycopg2 = callPackage ../development/python-modules/psycopg2 { }; - ipdbplugin = callPackage ../development/python-modules/ipdbplugin { }; + ptable = callPackage ../development/python-modules/ptable { }; - pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; + ptest = callPackage ../development/python-modules/ptest { }; - iso-639 = callPackage ../development/python-modules/iso-639 {}; + ptpython = callPackage ../development/python-modules/ptpython { prompt_toolkit = self.prompt_toolkit; }; - iso3166 = callPackage ../development/python-modules/iso3166 {}; + ptyprocess = callPackage ../development/python-modules/ptyprocess { }; - iso8601 = callPackage ../development/python-modules/iso8601 { }; + publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 { }; - isort = callPackage ../development/python-modules/isort {}; + publicsuffix = callPackage ../development/python-modules/publicsuffix { }; - isoweek = callPackage ../development/python-modules/isoweek {}; + pudb = callPackage ../development/python-modules/pudb { }; - jabberbot = callPackage ../development/python-modules/jabberbot {}; + pulp = callPackage ../development/python-modules/pulp { }; - jedi = callPackage ../development/python-modules/jedi { }; + pulsectl = callPackage ../development/python-modules/pulsectl { }; - jellyfish = callPackage ../development/python-modules/jellyfish { }; + pure-eval = callPackage ../development/python-modules/pure-eval { }; - jeepney = callPackage ../development/python-modules/jeepney { }; + pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; - j2cli = callPackage ../development/python-modules/j2cli { }; + purepng = callPackage ../development/python-modules/purepng { }; - jinja2 = callPackage ../development/python-modules/jinja2 { }; + pure-python-adb-homeassistant = callPackage ../development/python-modules/pure-python-adb-homeassistant { }; - jinja2_time = callPackage ../development/python-modules/jinja2_time { }; + purl = callPackage ../development/python-modules/purl { }; - jinja2_pluralize = callPackage ../development/python-modules/jinja2_pluralize { }; + pushbullet = callPackage ../development/python-modules/pushbullet { }; - jmespath = callPackage ../development/python-modules/jmespath { }; + pushover-complete = callPackage ../development/python-modules/pushover-complete { }; - journalwatch = callPackage ../tools/system/journalwatch { - inherit (self) systemd pytest; - }; + pvlib = callPackage ../development/python-modules/pvlib { }; - jq = callPackage ../development/python-modules/jq { - inherit (pkgs) jq; - }; + Pweave = callPackage ../development/python-modules/pweave { }; - jsondate = callPackage ../development/python-modules/jsondate { }; + pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; - jsondiff = callPackage ../development/python-modules/jsondiff { }; + pxml = callPackage ../development/python-modules/pxml { }; - jsonnet = buildPythonPackage { - inherit (pkgs.jsonnet) name src; - }; + py2bit = callPackage ../development/python-modules/py2bit { }; - jupyter_client = if isPy3k then - callPackage ../development/python-modules/jupyter_client { } - else - callPackage ../development/python-modules/jupyter_client/5.nix { }; + py3buddy = toPythonModule (callPackage ../development/python-modules/py3buddy { }); - jupyter_core = callPackage ../development/python-modules/jupyter_core { }; + py3exiv2 = callPackage ../development/python-modules/py3exiv2 { }; - jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { - pkgs-docker = pkgs.docker; - }; + py3status = callPackage ../development/python-modules/py3status { }; - jupyter-telemetry = callPackage ../development/python-modules/jupyter-telemetry { }; + py3to2 = callPackage ../development/python-modules/3to2 { }; - jupyterhub = callPackage ../development/python-modules/jupyterhub { }; + py4j = callPackage ../development/python-modules/py4j { }; - jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; + pyacoustid = callPackage ../development/python-modules/pyacoustid { }; - jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { - inherit (pkgs) bash; - }; + pyaes = callPackage ../development/python-modules/pyaes { }; - kaggle = callPackage ../development/python-modules/kaggle { }; + pyairvisual = callPackage ../development/python-modules/pyairvisual { }; - keyring = if isPy3k then - callPackage ../development/python-modules/keyring { } - else - callPackage ../development/python-modules/keyring/2.nix { }; + pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; - keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; + pyamf = callPackage ../development/python-modules/pyamf { }; - kiwisolver = if isPy3k then - callPackage ../development/python-modules/kiwisolver { } - else - callPackage ../development/python-modules/kiwisolver/1_1.nix { }; + pyamg = callPackage ../development/python-modules/pyamg { }; - klaus = callPackage ../development/python-modules/klaus {}; + pyaml = callPackage ../development/python-modules/pyaml { }; - klein = callPackage ../development/python-modules/klein { }; + pyannotate = callPackage ../development/python-modules/pyannotate { }; - koji = callPackage ../development/python-modules/koji { }; + pyarrow = callPackage ../development/python-modules/pyarrow { inherit (pkgs) arrow-cpp cmake pkgconfig; }; - kombu = callPackage ../development/python-modules/kombu { }; + pyasn1 = callPackage ../development/python-modules/pyasn1 { }; - konfig = callPackage ../development/python-modules/konfig { }; + pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; - kitchen = callPackage ../development/python-modules/kitchen { }; + pyatmo = callPackage ../development/python-modules/pyatmo { }; - knack = callPackage ../development/python-modules/knack { }; + pyatspi = callPackage ../development/python-modules/pyatspi { inherit (pkgs) pkgconfig; }; - kubernetes = callPackage ../development/python-modules/kubernetes { }; + pyatv = callPackage ../development/python-modules/pyatv { }; - k5test = callPackage ../development/python-modules/k5test { - inherit (pkgs) krb5Full findutils which; - }; + pyaudio = callPackage ../development/python-modules/pyaudio { }; - pylast = callPackage ../development/python-modules/pylast { }; + pyavm = callPackage ../development/python-modules/pyavm { }; - pylru = callPackage ../development/python-modules/pylru { }; + pyaxmlparser = callPackage ../development/python-modules/pyaxmlparser { }; - libnl-python = disabledIf isPy3k - (toPythonModule (pkgs.libnl.override{pythonSupport=true; inherit python; })).py; + pybase64 = callPackage ../development/python-modules/pybase64 { }; - lark-parser = callPackage ../development/python-modules/lark-parser { }; + pybids = callPackage ../development/python-modules/pybids { }; - jsonpath_rw = callPackage ../development/python-modules/jsonpath_rw { }; + pybigwig = callPackage ../development/python-modules/pybigwig { }; - kerberos = callPackage ../development/python-modules/kerberos { - inherit (pkgs) kerberos; - }; + pybind11 = callPackage ../development/python-modules/pybind11 { }; - lazy_import = callPackage ../development/python-modules/lazy_import { }; + pybindgen = callPackage ../development/python-modules/pybindgen { }; - lazy-object-proxy = callPackage ../development/python-modules/lazy-object-proxy { }; + pyblake2 = callPackage ../development/python-modules/pyblake2 { }; - ldaptor = callPackage ../development/python-modules/ldaptor { }; + pyblock = callPackage ../development/python-modules/pyblock { }; - le = callPackage ../development/python-modules/le { }; + pyblosxom = callPackage ../development/python-modules/pyblosxom { }; - lektor = callPackage ../development/python-modules/lektor { }; + pybluez = callPackage ../development/python-modules/pybluez { }; - leveldb = callPackage ../development/python-modules/leveldb { }; + pybotvac = callPackage ../development/python-modules/pybotvac { }; - python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; + pybrowserid = callPackage ../development/python-modules/pybrowserid { }; - python_openzwave = callPackage ../development/python-modules/python_openzwave { - inherit (pkgs) pkgconfig; - }; + pybtex = callPackage ../development/python-modules/pybtex { }; - python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; + pybtex-docutils = callPackage ../development/python-modules/pybtex-docutils { }; - python-unshare = callPackage ../development/python-modules/python-unshare { }; + pybullet = callPackage ../development/python-modules/pybullet { }; - fs = callPackage ../development/python-modules/fs { }; + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; }; - fs-s3fs = callPackage ../development/python-modules/fs-s3fs { }; + pycallgraph = callPackage ../development/python-modules/pycallgraph { }; - libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; + py = callPackage ../development/python-modules/py { }; - libcloud = if isPy27 then - callPackage ../development/python-modules/libcloud/2.nix { } - else - callPackage ../development/python-modules/libcloud { }; + pycangjie = disabledIf (!isPy3k) (callPackage ../development/python-modules/pycangjie { inherit (pkgs) pkgconfig; }); - libgpuarray = callPackage ../development/python-modules/libgpuarray { - clblas = pkgs.clblas.override { boost = self.boost; }; - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - }; + pycapnp = callPackage ../development/python-modules/pycapnp { }; - libgpiod = disabledIf (!isPy3k) (toPythonModule (pkgs.libgpiod.override { - enablePython = true; - python3 = python; - })); + pycaption = callPackage ../development/python-modules/pycaption { }; - libkeepass = callPackage ../development/python-modules/libkeepass { }; + pycarddav = callPackage ../development/python-modules/pycarddav { }; - libredwg = toPythonModule (pkgs.libredwg.override { - enablePython = true; - inherit (self) python libxml2; - }); + pycares = callPackage ../development/python-modules/pycares { }; - librepo = pipe pkgs.librepo [ - toPythonModule + pycassa = callPackage ../development/python-modules/pycassa { }; - (p: p.overrideAttrs (super: { - meta = super.meta // { - outputsToInstall = [ "py" ]; - }; - })) + pycategories = callPackage ../development/python-modules/pycategories { }; - (p: p.override { - inherit python; - }) + pycdio = callPackage ../development/python-modules/pycdio { }; - (p: p.py) - ]; + pychart = callPackage ../development/python-modules/pychart { }; - libnacl = callPackage ../development/python-modules/libnacl { - inherit (pkgs) libsodium; - }; + pychef = callPackage ../development/python-modules/pychef { }; - libsavitar = callPackage ../development/python-modules/libsavitar { }; + PyChromecast = callPackage ../development/python-modules/pychromecast { }; - libplist = disabledIf isPy3k - (toPythonModule (pkgs.libplist.override { enablePython = true; inherit python; })).py; + pyclipper = callPackage ../development/python-modules/pyclipper { }; - libxml2 = (toPythonModule (pkgs.libxml2.override{pythonSupport=true; inherit python;})).py; + pycm = callPackage ../development/python-modules/pycm { }; - libxslt = (toPythonModule (pkgs.libxslt.override{pythonSupport=true; inherit python; inherit (self) libxml2;})).py; + pycodestyle = callPackage ../development/python-modules/pycodestyle { }; - limits = callPackage ../development/python-modules/limits { }; + pycognito = callPackage ../development/python-modules/pycognito { }; - limnoria = callPackage ../development/python-modules/limnoria { }; + pycoin = callPackage ../development/python-modules/pycoin { }; - line_profiler = callPackage ../development/python-modules/line_profiler { }; + pycollada = callPackage ../development/python-modules/pycollada { }; - linode = callPackage ../development/python-modules/linode { }; + pycontracts = callPackage ../development/python-modules/pycontracts { }; - linode-api = callPackage ../development/python-modules/linode-api { }; + pycosat = callPackage ../development/python-modules/pycosat { }; - livereload = callPackage ../development/python-modules/livereload { }; + pycountry = callPackage ../development/python-modules/pycountry { }; - llfuse = callPackage ../development/python-modules/llfuse { - inherit (pkgs) fuse pkgconfig; # use "real" fuse and pkgconfig, not the python modules - }; + pycparser = callPackage ../development/python-modules/pycparser { }; - locustio = callPackage ../development/python-modules/locustio { }; + py-cpuinfo = callPackage ../development/python-modules/py-cpuinfo { }; - llvmlite = callPackage ../development/python-modules/llvmlite { - llvm = pkgs.llvm_9; # llvmlite always requires a specific version of llvm. + pycrc = callPackage ../development/python-modules/pycrc { }; + + pycrypto = callPackage ../development/python-modules/pycrypto { }; + + pycryptodome = callPackage ../development/python-modules/pycryptodome { }; + + pycryptodomex = callPackage ../development/python-modules/pycryptodomex { }; + + pycryptopp = callPackage ../development/python-modules/pycryptopp { }; + + pyct = callPackage ../development/python-modules/pyct { }; + + pycuda = callPackage ../development/python-modules/pycuda { + cudatoolkit = pkgs.cudatoolkit; + inherit (pkgs.stdenv) mkDerivation; }; - lockfile = callPackage ../development/python-modules/lockfile { }; + pycups = callPackage ../development/python-modules/pycups { }; - logilab_common = callPackage ../development/python-modules/logilab/common.nix {}; + pycurl2 = callPackage ../development/python-modules/pycurl2 { }; - logilab-constraint = callPackage ../development/python-modules/logilab/constraint.nix {}; + pycurl = callPackage ../development/python-modules/pycurl { }; - lxml = callPackage ../development/python-modules/lxml {inherit (pkgs) libxml2 libxslt zlib;}; + pydantic = callPackage ../development/python-modules/pydantic { }; - lxc = callPackage ../development/python-modules/lxc { }; + pydbus = callPackage ../development/python-modules/pydbus { }; - py_scrypt = callPackage ../development/python-modules/py_scrypt { }; + pydenticon = callPackage ../development/python-modules/pydenticon { }; - python_magic = callPackage ../development/python-modules/python-magic { }; + pydicom = callPackage ../development/python-modules/pydicom { }; - m3u8 = callPackage ../development/python-modules/m3u8 { }; + pydispatcher = callPackage ../development/python-modules/pydispatcher { }; - magic = callPackage ../development/python-modules/magic { }; + pydns = let + py3 = callPackage ../development/python-modules/py3dns { }; + py2 = callPackage ../development/python-modules/pydns { }; + in if isPy3k then py3 else py2; - m2crypto = callPackage ../development/python-modules/m2crypto { }; + pydocstyle = if isPy27 then + callPackage ../development/python-modules/pydocstyle/2.nix { } + else + callPackage ../development/python-modules/pydocstyle { }; - Mako = callPackage ../development/python-modules/Mako { }; + pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; - macfsevents = callPackage ../development/python-modules/macfsevents { - inherit (pkgs.darwin.apple_sdk.frameworks) CoreFoundation CoreServices; - }; + pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; - maestral = callPackage ../development/python-modules/maestral { }; + pydot_ng = callPackage ../development/python-modules/pydot_ng { graphviz = pkgs.graphviz; }; - manifestparser = callPackage ../development/python-modules/marionette-harness/manifestparser.nix {}; - marionette_driver = callPackage ../development/python-modules/marionette-harness/marionette_driver.nix {}; - mozcrash = callPackage ../development/python-modules/marionette-harness/mozcrash.nix {}; - mozdevice = callPackage ../development/python-modules/marionette-harness/mozdevice.nix {}; - mozfile = callPackage ../development/python-modules/marionette-harness/mozfile.nix {}; - mozhttpd = callPackage ../development/python-modules/marionette-harness/mozhttpd.nix {}; - mozinfo = callPackage ../development/python-modules/marionette-harness/mozinfo.nix {}; - mozlog = callPackage ../development/python-modules/marionette-harness/mozlog.nix {}; - moznetwork = callPackage ../development/python-modules/marionette-harness/moznetwork.nix {}; - mozprocess = callPackage ../development/python-modules/marionette-harness/mozprocess.nix {}; - mozprofile = callPackage ../development/python-modules/marionette-harness/mozprofile.nix {}; - mozrunner = callPackage ../development/python-modules/marionette-harness/mozrunner.nix {}; - moztest = callPackage ../development/python-modules/marionette-harness/moztest.nix {}; - mozversion = callPackage ../development/python-modules/marionette-harness/mozversion.nix {}; - marionette-harness = callPackage ../development/python-modules/marionette-harness {}; - - marisa = callPackage ../development/python-modules/marisa { - marisa = pkgs.marisa; - }; + pydotplus = callPackage ../development/python-modules/pydotplus { }; - marisa-trie = callPackage ../development/python-modules/marisa-trie { }; + pydrive = callPackage ../development/python-modules/pydrive { }; - Markups = callPackage ../development/python-modules/Markups { }; + pydsdl = callPackage ../development/python-modules/pydsdl { }; - markupsafe = callPackage ../development/python-modules/markupsafe { }; + pydub = callPackage ../development/python-modules/pydub { }; - marshmallow = callPackage ../development/python-modules/marshmallow { }; + pydy = callPackage ../development/python-modules/pydy { }; - marshmallow-enum = callPackage ../development/python-modules/marshmallow-enum { }; + pyechonest = callPackage ../development/python-modules/pyechonest { }; - marshmallow-polyfield = callPackage ../development/python-modules/marshmallow-polyfield { }; + pyelftools = callPackage ../development/python-modules/pyelftools { }; - marshmallow-sqlalchemy = callPackage ../development/python-modules/marshmallow-sqlalchemy { }; + pyemd = callPackage ../development/python-modules/pyemd { }; - manuel = callPackage ../development/python-modules/manuel { }; + pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; - mapsplotlib = callPackage ../development/python-modules/mapsplotlib { }; + pyepsg = callPackage ../development/python-modules/pyepsg { }; - markdown = if isPy3k then - callPackage ../development/python-modules/markdown { } - else - callPackage ../development/python-modules/markdown/3_1.nix { }; + pyexcel = callPackage ../development/python-modules/pyexcel { }; - markdownsuperscript = callPackage ../development/python-modules/markdownsuperscript {}; + pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; - markdown-macros = callPackage ../development/python-modules/markdown-macros { }; + pyexcel-io = callPackage ../development/python-modules/pyexcel-io { }; - matplotlib = let - path = if isPy3k then ../development/python-modules/matplotlib/default.nix else - ../development/python-modules/matplotlib/2.nix; - in callPackage path { - stdenv = if stdenv.isDarwin then pkgs.clangStdenv else pkgs.stdenv; - inherit (pkgs.darwin.apple_sdk.frameworks) Cocoa; - inherit (pkgs) pkgconfig; - }; + pyexcel-ods = callPackage ../development/python-modules/pyexcel-ods { }; - matrix-client = callPackage ../development/python-modules/matrix-client { }; + pyexcel-xls = callPackage ../development/python-modules/pyexcel-xls { }; - matrix-nio = callPackage ../development/python-modules/matrix-nio { }; + pyexiv2 = disabledIf isPy3k (toPythonModule (callPackage ../development/python-modules/pyexiv2 { })); - mautrix = callPackage ../development/python-modules/mautrix { }; - mautrix-appservice = self.mautrix; # alias 2019-12-28 + pyext = callPackage ../development/python-modules/pyext { }; - maya = callPackage ../development/python-modules/maya { }; + pyface = callPackage ../development/python-modules/pyface { }; - mayavi = pkgs.libsForQt5.callPackage ../development/python-modules/mayavi { - inherit buildPythonPackage isPy27 fetchPypi; - inherit (self) pyface pygments numpy vtk traitsui envisage apptools pyqt5; - }; + pyfaidx = callPackage ../development/python-modules/pyfaidx { }; - mccabe = callPackage ../development/python-modules/mccabe { }; + pyfakefs = callPackage ../development/python-modules/pyfakefs { }; - mechanize = callPackage ../development/python-modules/mechanize { }; + pyfantom = callPackage ../development/python-modules/pyfantom { }; - MechanicalSoup = callPackage ../development/python-modules/MechanicalSoup { }; + pyfcm = callPackage ../development/python-modules/pyfcm { }; - meld3 = callPackage ../development/python-modules/meld3 { }; + pyfftw = callPackage ../development/python-modules/pyfftw { }; - meliae = callPackage ../development/python-modules/meliae {}; + pyfiglet = callPackage ../development/python-modules/pyfiglet { }; - meinheld = callPackage ../development/python-modules/meinheld { }; + pyflakes = callPackage ../development/python-modules/pyflakes { }; - memcached = callPackage ../development/python-modules/memcached { }; + pyfma = callPackage ../development/python-modules/pyfma { }; - memory_profiler = callPackage ../development/python-modules/memory_profiler { }; + pyfribidi = callPackage ../development/python-modules/pyfribidi { }; - mesa = callPackage ../development/python-modules/mesa { }; + pyfritzhome = callPackage ../development/python-modules/pyfritzhome { }; - meson = disabledIf (pythonOlder "3.5") (toPythonModule ((pkgs.meson.override { - python3 = python; - }).overrideAttrs(oldAttrs: { - # We do not want the setup hook in Python packages - # because the build is performed differently. - setupHook = null; - }))); + pyftdi = callPackage ../development/python-modules/pyftdi { }; - mesonpep517 = callPackage ../development/python-modules/mesonpep517 { }; + pyftgl = callPackage ../development/python-modules/pyftgl { }; - meshlabxml = callPackage ../development/python-modules/meshlabxml { }; + pyftpdlib = callPackage ../development/python-modules/pyftpdlib { }; - metaphone = callPackage ../development/python-modules/metaphone { }; + pyfttt = callPackage ../development/python-modules/pyfttt { }; - mezzanine = callPackage ../development/python-modules/mezzanine { }; + pyfxa = callPackage ../development/python-modules/pyfxa { }; - micawber = callPackage ../development/python-modules/micawber { }; + pygal = callPackage ../development/python-modules/pygal { }; - milksnake = callPackage ../development/python-modules/milksnake { }; + pygame = callPackage ../development/python-modules/pygame { }; - minimock = callPackage ../development/python-modules/minimock { }; + pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { }; - minio = callPackage ../development/python-modules/minio { }; + pygbm = callPackage ../development/python-modules/pygbm { }; - moviepy = callPackage ../development/python-modules/moviepy { }; + pygccxml = callPackage ../development/python-modules/pygccxml { }; - mozterm = callPackage ../development/python-modules/mozterm { }; + pygdbmi = callPackage ../development/python-modules/pygdbmi { }; - mplleaflet = callPackage ../development/python-modules/mplleaflet { }; + pygeoip = callPackage ../development/python-modules/pygeoip { }; - multidict = callPackage ../development/python-modules/multidict { }; + pygit2 = callPackage ../development/python-modules/pygit2 { }; - munch = callPackage ../development/python-modules/munch { }; + PyGithub = callPackage ../development/python-modules/pyGithub { }; - nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; + pyglet = callPackage ../development/python-modules/pyglet { }; - rainbowstream = callPackage ../development/python-modules/rainbowstream { }; + pygls = callPackage ../development/python-modules/pygls { }; - pendulum = callPackage ../development/python-modules/pendulum { }; + pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; - pocket = callPackage ../development/python-modules/pocket { }; + pygments = if isPy3k then + callPackage ../development/python-modules/Pygments { } + else + callPackage ../development/python-modules/Pygments/2_5.nix { }; - mistune = callPackage ../development/python-modules/mistune { }; + pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; - brotlipy = callPackage ../development/python-modules/brotlipy { }; + pygmo = callPackage ../development/python-modules/pygmo { }; - sortedcollections = callPackage ../development/python-modules/sortedcollections { }; + pygobject2 = callPackage ../development/python-modules/pygobject { inherit (pkgs) pkgconfig; }; - hyperframe = callPackage ../development/python-modules/hyperframe { }; + pygobject3 = callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson pkgconfig; }; - h2 = callPackage ../development/python-modules/h2 { }; + pygogo = callPackage ../development/python-modules/pygogo { }; - editorconfig = callPackage ../development/python-modules/editorconfig { }; + pygpgme = callPackage ../development/python-modules/pygpgme { }; - mock = if pythonOlder "3.6" then - callPackage ../development/python-modules/mock/2.nix { } - else - callPackage ../development/python-modules/mock { }; + pygraphviz = callPackage ../development/python-modules/pygraphviz { + inherit (pkgs) graphviz pkgconfig; + }; # not the python package - mocket = callPackage ../development/python-modules/mocket { }; + pygreat = callPackage ../development/python-modules/pygreat { }; - mock-open = callPackage ../development/python-modules/mock-open { }; + pygrok = callPackage ../development/python-modules/pygrok { }; - mockito = callPackage ../development/python-modules/mockito { }; + pygtail = callPackage ../development/python-modules/pygtail { }; - modeled = callPackage ../development/python-modules/modeled { }; + pygtk = callPackage ../development/python-modules/pygtk { + inherit (pkgs) pkgconfig; + libglade = null; + }; - moderngl = callPackage ../development/python-modules/moderngl { }; + pyGtkGlade = self.pygtk.override { libglade = pkgs.gnome2.libglade; }; - moderngl-window = callPackage ../development/python-modules/moderngl_window { }; + pygtksourceview = callPackage ../development/python-modules/pygtksourceview { inherit (pkgs) pkgconfig; }; - modestmaps = callPackage ../development/python-modules/modestmaps { }; + pyhamcrest = if isPy3k then + callPackage ../development/python-modules/pyhamcrest { } + else + callPackage ../development/python-modules/pyhamcrest/1.nix { }; - # Needed here because moinmoin is loaded as a Python library. - moinmoin = callPackage ../development/python-modules/moinmoin { }; + pyhaversion = callPackage ../development/python-modules/pyhaversion { }; - moretools = callPackage ../development/python-modules/moretools { }; + pyhcl = callPackage ../development/python-modules/pyhcl { }; - moto = callPackage ../development/python-modules/moto {}; + pyhocon = callPackage ../development/python-modules/pyhocon { }; - mox = callPackage ../development/python-modules/mox { }; + pyhomematic = callPackage ../development/python-modules/pyhomematic { }; - mozsvc = callPackage ../development/python-modules/mozsvc { }; + pyhs100 = callPackage ../development/python-modules/pyhs100 { }; - mpmath = callPackage ../development/python-modules/mpmath { }; + pyicloud = callPackage ../development/python-modules/pyicloud { }; - mpd = callPackage ../development/python-modules/mpd { }; + PyICU = callPackage ../development/python-modules/pyicu { }; - mpd2 = callPackage ../development/python-modules/mpd2 { }; + pyinotify = callPackage ../development/python-modules/pyinotify { }; - mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; }; + pyinputevent = callPackage ../development/python-modules/pyinputevent { }; - mrbob = callPackage ../development/python-modules/mrbob {}; + pyipp = callPackage ../development/python-modules/pyipp { }; - msgpack = callPackage ../development/python-modules/msgpack {}; + pyjade = callPackage ../development/python-modules/pyjade { }; - msgpack-numpy = callPackage ../development/python-modules/msgpack-numpy {}; + pyjet = callPackage ../development/python-modules/pyjet { }; - msrplib = callPackage ../development/python-modules/msrplib { }; + pyjks = callPackage ../development/python-modules/pyjks { }; - multipledispatch = callPackage ../development/python-modules/multipledispatch { }; + pyjson5 = callPackage ../development/python-modules/pyjson5 { }; - multiprocess = callPackage ../development/python-modules/multiprocess { }; + pyjwkest = callPackage ../development/python-modules/pyjwkest { }; - munkres = callPackage ../development/python-modules/munkres { }; + pyjwt = callPackage ../development/python-modules/pyjwt { }; - musicbrainzngs = callPackage ../development/python-modules/musicbrainzngs { }; + pykdtree = callPackage ../development/python-modules/pykdtree { inherit (pkgs.llvmPackages) openmp; }; - mutag = callPackage ../development/python-modules/mutag { }; + pykeepass = callPackage ../development/python-modules/pykeepass { }; - mutagen = if isPy27 then - callPackage ../development/python-modules/mutagen/1.43.nix { } - else - callPackage ../development/python-modules/mutagen { }; + pykerberos = callPackage ../development/python-modules/pykerberos { }; - muttils = callPackage ../development/python-modules/muttils { }; + pykickstart = callPackage ../development/python-modules/pykickstart { }; - mygpoclient = callPackage ../development/python-modules/mygpoclient { }; + pykka = callPackage ../development/python-modules/pykka { }; - mysqlclient = callPackage ../development/python-modules/mysqlclient { }; + pykwalify = callPackage ../development/python-modules/pykwalify { }; - mypy = callPackage ../development/python-modules/mypy { }; + pylama = callPackage ../development/python-modules/pylama { }; - mypy-extensions = callPackage ../development/python-modules/mypy/extensions.nix { }; + pylast = callPackage ../development/python-modules/pylast { }; - mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; + pylatexenc = callPackage ../development/python-modules/pylatexenc { }; - neuronpy = callPackage ../development/python-modules/neuronpy { }; + PyLD = callPackage ../development/python-modules/PyLD { }; - persisting-theory = callPackage ../development/python-modules/persisting-theory { }; + pylev = callPackage ../development/python-modules/pylev { }; - pint = callPackage ../development/python-modules/pint { }; + pylibacl = callPackage ../development/python-modules/pylibacl { }; - pkutils = callPackage ../development/python-modules/pkutils { }; + pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; - pygal = callPackage ../development/python-modules/pygal { }; + pylibftdi = callPackage ../development/python-modules/pylibftdi { inherit (pkgs) libusb1; }; - pygogo = callPackage ../development/python-modules/pygogo { }; + pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 - pytaglib = callPackage ../development/python-modules/pytaglib { }; + pyliblo = callPackage ../development/python-modules/pyliblo { }; - pyte = callPackage ../development/python-modules/pyte { }; + pylibmc = callPackage ../development/python-modules/pylibmc { }; - graphviz = callPackage ../development/python-modules/graphviz { - inherit (pkgs) graphviz; - }; + pylint-celery = callPackage ../development/python-modules/pylint-celery { }; - pygraphviz = callPackage ../development/python-modules/pygraphviz { - inherit (pkgs) graphviz pkgconfig; # not the python package - }; + pylint-django = callPackage ../development/python-modules/pylint-django { }; - pymc3 = callPackage ../development/python-modules/pymc3 { }; + pylint-flask = callPackage ../development/python-modules/pylint-flask { }; - pympler = callPackage ../development/python-modules/pympler { }; + pylint = if isPy3k then + callPackage ../development/python-modules/pylint { } + else + callPackage ../development/python-modules/pylint/1.9.nix { }; - pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; + pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; - merkletools = callPackage ../development/python-modules/merkletools { }; + py-lru-cache = callPackage ../development/python-modules/py-lru-cache { }; - monosat = disabledIf (!isPy3k) (pkgs.monosat.python { inherit buildPythonPackage; inherit (self) cython; }); + pylru = callPackage ../development/python-modules/pylru { }; - monotonic = callPackage ../development/python-modules/monotonic { }; + pyls-black = callPackage ../development/python-modules/pyls-black { }; - mysql-connector = callPackage ../development/python-modules/mysql-connector { }; + pyls-isort = callPackage ../development/python-modules/pyls-isort { }; - namebench = callPackage ../development/python-modules/namebench { }; + pyls-mypy = callPackage ../development/python-modules/pyls-mypy { }; - namedlist = callPackage ../development/python-modules/namedlist { }; + PyLTI = callPackage ../development/python-modules/pylti { }; - nameparser = callPackage ../development/python-modules/nameparser { }; + pymacaroons = callPackage ../development/python-modules/pymacaroons { }; - names = callPackage ../development/python-modules/names { }; + pymaging = callPackage ../development/python-modules/pymaging { }; - nbclient = callPackage ../development/python-modules/nbclient { }; + pymaging_png = callPackage ../development/python-modules/pymaging_png { }; - nbconflux = callPackage ../development/python-modules/nbconflux { }; + pymatgen = callPackage ../development/python-modules/pymatgen { }; - nbconvert = callPackage ../development/python-modules/nbconvert { }; + pymatgen-lammps = callPackage ../development/python-modules/pymatgen-lammps { }; - nbformat = if isPy3k then - callPackage ../development/python-modules/nbformat { } - else callPackage ../development/python-modules/nbformat/2.nix { }; + pymavlink = callPackage ../development/python-modules/pymavlink { }; - nbmerge = callPackage ../development/python-modules/nbmerge { }; + pymbolic = callPackage ../development/python-modules/pymbolic { }; - nbdime = callPackage ../development/python-modules/nbdime { }; + pymc3 = callPackage ../development/python-modules/pymc3 { }; - nbxmpp = callPackage ../development/python-modules/nbxmpp { }; + pymediainfo = callPackage ../development/python-modules/pymediainfo { }; - sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; + pymeeus = callPackage ../development/python-modules/pymeeus { }; - slixmpp = callPackage ../development/python-modules/slixmpp { - inherit (pkgs) gnupg; - }; + pymemoize = callPackage ../development/python-modules/pymemoize { }; - netaddr = callPackage ../development/python-modules/netaddr { }; + pyment = callPackage ../development/python-modules/pyment { }; - netifaces = callPackage ../development/python-modules/netifaces { }; + pymetar = callPackage ../development/python-modules/pymetar { }; - hpack = callPackage ../development/python-modules/hpack { }; + pymetno = callPackage ../development/python-modules/pymetno { }; - nevow = callPackage ../development/python-modules/nevow { }; + pymongo = callPackage ../development/python-modules/pymongo { }; - nghttp2 = (toPythonModule (pkgs.nghttp2.override { - inherit (self) python cython setuptools; - inherit (pkgs) ncurses; - enablePython = true; - })).python; + pympler = callPackage ../development/python-modules/pympler { }; - nibabel = callPackage ../development/python-modules/nibabel {}; + pymsgbox = callPackage ../development/python-modules/pymsgbox { }; - nidaqmx = callPackage ../development/python-modules/nidaqmx { }; + pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 - nilearn = callPackage ../development/python-modules/nilearn {}; + py-multibase = callPackage ../development/python-modules/py-multibase { }; - nimfa = callPackage ../development/python-modules/nimfa {}; + py-multihash = callPackage ../development/python-modules/py-multihash { }; - nipy = callPackage ../development/python-modules/nipy { }; + pymumble = callPackage ../development/python-modules/pymumble { }; - nipype = callPackage ../development/python-modules/nipype { - inherit (pkgs) which; - }; + pymupdf = callPackage ../development/python-modules/pymupdf { }; - nitime = callPackage ../development/python-modules/nitime { }; + PyMVGLive = callPackage ../development/python-modules/pymvglive { }; - nix-kernel = callPackage ../development/python-modules/nix-kernel { - inherit (pkgs) nix; - }; + pymysql = callPackage ../development/python-modules/pymysql { }; - nixpkgs = callPackage ../development/python-modules/nixpkgs { }; + pymysqlsa = callPackage ../development/python-modules/pymysqlsa { }; - nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { }; + pymystem3 = callPackage ../development/python-modules/pymystem3 { }; - nodeenv = callPackage ../development/python-modules/nodeenv { }; + pynac = callPackage ../development/python-modules/pynac { }; - nose = callPackage ../development/python-modules/nose { }; + pynacl = callPackage ../development/python-modules/pynacl { }; - nose-cov = callPackage ../development/python-modules/nose-cov { }; + pynamecheap = callPackage ../development/python-modules/pynamecheap { }; - nose-exclude = callPackage ../development/python-modules/nose-exclude { }; + pynamodb = callPackage ../development/python-modules/pynamodb { }; - nose-focus = callPackage ../development/python-modules/nose-focus { }; + pynanoleaf = callPackage ../development/python-modules/pynanoleaf { }; - nose-randomly = callPackage ../development/python-modules/nose-randomly { }; + pync = callPackage ../development/python-modules/pync { }; - nose2 = callPackage ../development/python-modules/nose2 { }; + pynisher = callPackage ../development/python-modules/pynisher { }; - nose-cover3 = callPackage ../development/python-modules/nose-cover3 { }; + pynmea2 = callPackage ../development/python-modules/pynmea2 { }; - nosexcover = callPackage ../development/python-modules/nosexcover { }; + pynput = callPackage ../development/python-modules/pynput { }; - nosejs = callPackage ../development/python-modules/nosejs { }; + pynrrd = callPackage ../development/python-modules/pynrrd { }; - nose-cprof = callPackage ../development/python-modules/nose-cprof { }; + pynvim = callPackage ../development/python-modules/pynvim { }; - nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { }; + pynvml = callPackage ../development/python-modules/pynvml { }; - nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { }; + pynzb = callPackage ../development/python-modules/pynzb { }; - nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { }; + pyobjc = if stdenv.isDarwin then + callPackage ../development/python-modules/pyobjc { } + else + throw "pyobjc can only be built on Mac OS"; - notebook = if isPy3k then callPackage ../development/python-modules/notebook { } - else callPackage ../development/python-modules/notebook/2.nix { }; + pyocr = callPackage ../development/python-modules/pyocr { }; - notedown = callPackage ../development/python-modules/notedown { }; + pyodbc = callPackage ../development/python-modules/pyodbc { }; - notify = callPackage ../development/python-modules/notify { }; + pyogg = callPackage ../development/python-modules/pyogg { }; - notify2 = callPackage ../development/python-modules/notify2 {}; + pyomo = callPackage ../development/python-modules/pyomo { }; - notmuch = callPackage ../development/python-modules/notmuch { - inherit (pkgs) notmuch; - }; + pyopencl = callPackage ../development/python-modules/pyopencl { }; - emoji = callPackage ../development/python-modules/emoji { }; + pyopengl = callPackage ../development/python-modules/pyopengl { }; - ntplib = callPackage ../development/python-modules/ntplib { }; + pyopenssl = callPackage ../development/python-modules/pyopenssl { }; - num2words = callPackage ../development/python-modules/num2words { }; + pyosmium = callPackage ../development/python-modules/pyosmium { }; - numba = callPackage ../development/python-modules/numba { }; + pyotp = callPackage ../development/python-modules/pyotp { }; + + pyowm = callPackage ../development/python-modules/pyowm { }; - numcodecs = callPackage ../development/python-modules/numcodecs { - inherit (pkgs) gcc8; + pypamtest = pkgs.libpam-wrapper.override { + enablePython = true; + inherit python; }; - numexpr = callPackage ../development/python-modules/numexpr { }; + pypandoc = callPackage ../development/python-modules/pypandoc { }; - Nuitka = callPackage ../development/python-modules/nuitka { }; + pyparser = callPackage ../development/python-modules/pyparser { }; - numpy = - if pythonOlder "3.5" then - callPackage ../development/python-modules/numpy/1.16.nix { } - else - callPackage ../development/python-modules/numpy { }; + pyparsing = callPackage ../development/python-modules/pyparsing { }; - numpydoc = callPackage ../development/python-modules/numpydoc { }; + pyparted = callPackage ../development/python-modules/pyparted { }; - numpy-stl = callPackage ../development/python-modules/numpy-stl { }; + pypcap = callPackage ../development/python-modules/pypcap { }; - numtraits = callPackage ../development/python-modules/numtraits { }; + pypdf2 = callPackage ../development/python-modules/pypdf2 { }; - nwdiag = callPackage ../development/python-modules/nwdiag { }; + pyPdf = callPackage ../development/python-modules/pypdf { }; - dynd = callPackage ../development/python-modules/dynd { }; + pypeg2 = callPackage ../development/python-modules/pypeg2 { }; - langcodes = callPackage ../development/python-modules/langcodes { }; + pyperclip = callPackage ../development/python-modules/pyperclip { }; - livestreamer = callPackage ../development/python-modules/livestreamer { }; + pyperf = callPackage ../development/python-modules/pyperf { }; - livestreamer-curses = callPackage ../development/python-modules/livestreamer-curses { }; + pyphen = callPackage ../development/python-modules/pyphen { }; - oauth = callPackage ../development/python-modules/oauth { }; + pyphotonfile = callPackage ../development/python-modules/pyphotonfile { }; - oauth2 = callPackage ../development/python-modules/oauth2 { }; + pypillowfight = callPackage ../development/python-modules/pypillowfight { }; - oauth2client = callPackage ../development/python-modules/oauth2client { }; + pyplatec = callPackage ../development/python-modules/pyplatec { }; - oauthlib = if isPy27 then - callPackage ../development/python-modules/oauthlib/3.1.nix { } - else - callPackage ../development/python-modules/oauthlib { }; + pypoppler = callPackage ../development/python-modules/pypoppler { }; - obfsproxy = callPackage ../development/python-modules/obfsproxy { }; + pyprind = callPackage ../development/python-modules/pyprind { }; - objgraph = callPackage ../development/python-modules/objgraph { - graphvizPkg = pkgs.graphviz; - }; + pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; - offtrac = callPackage ../development/python-modules/offtrac { }; + pyproj = callPackage ../development/python-modules/pyproj { }; - openpyxl = if pythonAtLeast "3.6" then - callPackage ../development/python-modules/openpyxl { } - else - callPackage ../development/python-modules/openpyxl/2.nix { }; + pyptlib = callPackage ../development/python-modules/pyptlib { }; - opentimestamps = callPackage ../development/python-modules/opentimestamps { }; + pypubsub = callPackage ../development/python-modules/pypubsub { }; - ordereddict = callPackage ../development/python-modules/ordereddict { }; + pyqrcode = callPackage ../development/python-modules/pyqrcode { }; - od = callPackage ../development/python-modules/od { }; + pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { inherit (pkgs) pkgconfig; }; - omegaconf = callPackage ../development/python-modules/omegaconf { }; + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; - opuslib = callPackage ../development/python-modules/opuslib { }; + pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; - orderedset = callPackage ../development/python-modules/orderedset { }; + /* + `pyqt5_with_qtwebkit` should not be used by python libraries in + pkgs/development/python-modules/*. Putting this attribute in + `propagatedBuildInputs` may cause collisions. + */ + pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; - python-multipart = callPackage ../development/python-modules/python-multipart { }; + pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - python-otr = callPackage ../development/python-modules/python-otr { }; + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; - plone-testing = callPackage ../development/python-modules/plone-testing { }; + pyquery = callPackage ../development/python-modules/pyquery { }; - ply = callPackage ../development/python-modules/ply { }; + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; - plyplus = callPackage ../development/python-modules/plyplus { }; + pyrad = callPackage ../development/python-modules/pyrad { }; - plyvel = callPackage ../development/python-modules/plyvel { }; + py-radix = callPackage ../development/python-modules/py-radix { }; - osc = callPackage ../development/python-modules/osc { }; + pyramid_beaker = callPackage ../development/python-modules/pyramid_beaker { }; - rfc3986 = callPackage ../development/python-modules/rfc3986 { }; + pyramid = callPackage ../development/python-modules/pyramid { }; - cachetools = let - cachetools' = callPackage ../development/python-modules/cachetools {}; - cachetools_2 = cachetools'.overridePythonAttrs(oldAttrs: rec { - version = "3.1.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "16m69l6n6y1r1y7cklm92rr7v69ldig2n3lbl3j323w5jz7d78lf"; - }; + pyramid_chameleon = callPackage ../development/python-modules/pyramid_chameleon { }; - }); - in if isPy3k then cachetools' else cachetools_2; + pyramid_exclog = callPackage ../development/python-modules/pyramid_exclog { }; - cma = callPackage ../development/python-modules/cma { }; + pyramid_hawkauth = callPackage ../development/python-modules/pyramid_hawkauth { }; - cmd2 = callPackage ../development/python-modules/cmd2 {}; + pyramid_jinja2 = callPackage ../development/python-modules/pyramid_jinja2 { }; - warlock = callPackage ../development/python-modules/warlock { }; + pyramid_mako = callPackage ../development/python-modules/pyramid_mako { }; - pecan = callPackage ../development/python-modules/pecan { }; + pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; - kaitaistruct = callPackage ../development/python-modules/kaitaistruct { }; + pyreadability = callPackage ../development/python-modules/pyreadability { }; - Kajiki = callPackage ../development/python-modules/kajiki { }; + pyrealsense2 = toPythonModule (pkgs.librealsense.override { + enablePython = true; + pythonPackages = self; + }); - WSME = callPackage ../development/python-modules/WSME { }; + pyrealsense2WithCuda = toPythonModule (pkgs.librealsenseWithCuda.override { + enablePython = true; + pythonPackages = self; + }); - zake = callPackage ../development/python-modules/zake { }; + pyrealsense2WithoutCuda = toPythonModule (pkgs.librealsenseWithoutCuda.override { + enablePython = true; + pythonPackages = self; + }); - zarr = callPackage ../development/python-modules/zarr { }; + pyregion = callPackage ../development/python-modules/pyregion { }; - kazoo = callPackage ../development/python-modules/kazoo { }; + pyreport = callPackage ../development/python-modules/pyreport { }; - FormEncode = callPackage ../development/python-modules/FormEncode { }; + pyres = callPackage ../development/python-modules/pyres { }; - pycountry = callPackage ../development/python-modules/pycountry { }; + pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { }; - nine = callPackage ../development/python-modules/nine { }; + PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { }; - logutils = callPackage ../development/python-modules/logutils { }; + Pyro4 = callPackage ../development/python-modules/pyro4 { }; - ldappool = callPackage ../development/python-modules/ldappool { }; + Pyro5 = callPackage ../development/python-modules/pyro5 { }; - retrying = callPackage ../development/python-modules/retrying { }; + pyroma = callPackage ../development/python-modules/pyroma { }; - fasteners = callPackage ../development/python-modules/fasteners { }; + pyro-ppl = callPackage ../development/python-modules/pyro-ppl { }; - aiocontextvars = callPackage ../development/python-modules/aiocontextvars { }; + pyroute2 = callPackage ../development/python-modules/pyroute2 { }; - aioeventlet = callPackage ../development/python-modules/aioeventlet { }; + pyrr = callPackage ../development/python-modules/pyrr { }; - aiokafka = callPackage ../development/python-modules/aiokafka { }; + pyrsistent = callPackage ../development/python-modules/pyrsistent { }; - olefile = callPackage ../development/python-modules/olefile { }; + PyRSS2Gen = callPackage ../development/python-modules/pyrss2gen { }; - requests-mock = callPackage ../development/python-modules/requests-mock { }; + pyrtlsdr = callPackage ../development/python-modules/pyrtlsdr { }; - mecab-python3 = callPackage ../development/python-modules/mecab-python3 { }; + pysam = callPackage ../development/python-modules/pysam { }; - mox3 = callPackage ../development/python-modules/mox3 { }; + pysaml2 = callPackage ../development/python-modules/pysaml2 { inherit (pkgs) xmlsec; }; - doc8 = callPackage ../development/python-modules/doc8 { }; + pysc2 = callPackage ../development/python-modules/pysc2 { }; - wrapt = callPackage ../development/python-modules/wrapt { }; + pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; - pagerduty = callPackage ../development/python-modules/pagerduty { }; + pyschedule = callPackage ../development/python-modules/pyschedule { }; - pandas = if isPy3k then - callPackage ../development/python-modules/pandas { } - else - callPackage ../development/python-modules/pandas/2.nix { }; + pyscreenshot = callPackage ../development/python-modules/pyscreenshot { }; - panel = callPackage ../development/python-modules/panel { }; + py_scrypt = callPackage ../development/python-modules/py_scrypt { }; - xlrd = callPackage ../development/python-modules/xlrd { }; + pyscrypt = callPackage ../development/python-modules/pyscrypt { }; - bottleneck = callPackage ../development/python-modules/bottleneck { }; + pyscss = callPackage ../development/python-modules/pyscss { }; - paho-mqtt = callPackage ../development/python-modules/paho-mqtt { }; + pysdl2 = callPackage ../development/python-modules/pysdl2 { }; - pagelabels = callPackage ../development/python-modules/pagelabels { }; + pysendfile = callPackage ../development/python-modules/pysendfile { }; - pamqp = callPackage ../development/python-modules/pamqp { }; + pysensors = callPackage ../development/python-modules/pysensors { }; - parsedatetime = callPackage ../development/python-modules/parsedatetime { }; + pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; - param = callPackage ../development/python-modules/param { }; + pyserial = callPackage ../development/python-modules/pyserial { }; - paramiko = callPackage ../development/python-modules/paramiko { }; + pysftp = callPackage ../development/python-modules/pysftp { }; - parameterized = callPackage ../development/python-modules/parameterized { }; + pysha3 = callPackage ../development/python-modules/pysha3 { }; - paramz = callPackage ../development/python-modules/paramz { }; + pyshp = callPackage ../development/python-modules/pyshp { }; - parfive = callPackage ../development/python-modules/parfive { }; + pyside2-tools = + toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); - parsel = callPackage ../development/python-modules/parsel { }; + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake qt5 ninja; }); - parso = callPackage ../development/python-modules/parso { }; + pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; - partd = callPackage ../development/python-modules/partd { }; + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { inherit (pkgs) libxml2 libxslt; }; - patch = callPackage ../development/python-modules/patch { }; + pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; - patch-ng = callPackage ../development/python-modules/patch-ng { }; + pysigset = callPackage ../development/python-modules/pysigset { }; - pathos = callPackage ../development/python-modules/pathos { }; + pysingleton = callPackage ../development/python-modules/pysingleton { }; - patsy = callPackage ../development/python-modules/patsy { }; + pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; - paste = callPackage ../development/python-modules/paste { }; + pysmb = callPackage ../development/python-modules/pysmb { }; - PasteDeploy = callPackage ../development/python-modules/pastedeploy { }; + pysmbc = callPackage ../development/python-modules/pysmbc { inherit (pkgs) pkgconfig; }; - pasteScript = callPackage ../development/python-modules/pastescript { }; + pysmf = callPackage ../development/python-modules/pysmf { }; - patator = callPackage ../development/python-modules/patator { }; + pysmi = callPackage ../development/python-modules/pysmi { }; - pathlib2 = callPackage ../development/python-modules/pathlib2 { }; + pysnmp = callPackage ../development/python-modules/pysnmp { }; - pathpy = if isPy3k then - callPackage ../development/python-modules/path.py { } - else - callPackage ../development/python-modules/path.py/2.nix { }; + pysnooper = callPackage ../development/python-modules/pysnooper { }; - paypalrestsdk = callPackage ../development/python-modules/paypalrestsdk { }; + pysnow = callPackage ../development/python-modules/pysnow { }; - pbr = callPackage ../development/python-modules/pbr { }; + pysocks = callPackage ../development/python-modules/pysocks { }; - fixtures = callPackage ../development/python-modules/fixtures { }; + pysolr = callPackage ../development/python-modules/pysolr { }; - fipy = callPackage ../development/python-modules/fipy { }; + pysonos = callPackage ../development/python-modules/pysonos { }; - sfepy = callPackage ../development/python-modules/sfepy { }; + pysoundfile = self.soundfile; # Alias added 23-06-2019 - pelican = callPackage ../development/python-modules/pelican { - inherit (pkgs) glibcLocales git; - }; + pyspark = callPackage ../development/python-modules/pyspark { }; - pep8 = callPackage ../development/python-modules/pep8 { }; + pysparse = callPackage ../development/python-modules/pysparse { }; - pep8-naming = callPackage ../development/python-modules/pep8-naming { }; + pyspf = callPackage ../development/python-modules/pyspf { }; - pep257 = callPackage ../development/python-modules/pep257 { }; + pyspinel = callPackage ../development/python-modules/pyspinel { }; - pep517 = callPackage ../development/python-modules/pep517 { }; + pyspotify = callPackage ../development/python-modules/pyspotify { }; - percol = callPackage ../development/python-modules/percol { }; + pyspread = callPackage ../development/python-modules/pyspread { }; - pexif = callPackage ../development/python-modules/pexif { }; + pysptk = callPackage ../development/python-modules/pysptk { }; - pexpect = callPackage ../development/python-modules/pexpect { }; + pysqlite = callPackage ../development/python-modules/pysqlite { }; - pdfkit = callPackage ../development/python-modules/pdfkit { }; + pysrim = callPackage ../development/python-modules/pysrim { }; - pdfrw = callPackage ../development/python-modules/pdfrw { }; + pysrt = callPackage ../development/python-modules/pysrt { }; - periodictable = callPackage ../development/python-modules/periodictable { }; + pyssim = callPackage ../development/python-modules/pyssim { }; - pgcli = callPackage ../development/tools/database/pgcli {}; + pystache = callPackage ../development/python-modules/pystache { }; - pg8000 = callPackage ../development/python-modules/pg8000 { }; - pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; + pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; - pglast = callPackage ../development/python-modules/pglast { }; + PyStemmer = callPackage ../development/python-modules/pystemmer { }; - pgsanity = callPackage ../development/python-modules/pgsanity { }; + pystray = callPackage ../development/python-modules/pystray { }; - pgspecial = callPackage ../development/python-modules/pgspecial { }; + py_stringmatching = callPackage ../development/python-modules/py_stringmatching { }; - pgpy = callPackage ../development/python-modules/pgpy { }; + pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; - pickleshare = callPackage ../development/python-modules/pickleshare { }; + pysvn = callPackage ../development/python-modules/pysvn { }; - picos = callPackage ../development/python-modules/picos { }; + pytado = callPackage ../development/python-modules/pytado { }; - piep = callPackage ../development/python-modules/piep { }; + pytaglib = callPackage ../development/python-modules/pytaglib { }; - piexif = callPackage ../development/python-modules/piexif { }; + pyte = callPackage ../development/python-modules/pyte { }; - pip = callPackage ../development/python-modules/pip { }; + pytelegrambotapi = callPackage ../development/python-modules/pyTelegramBotAPI { }; - pip-tools = callPackage ../development/python-modules/pip-tools { - git = pkgs.gitMinimal; - glibcLocales = pkgs.glibcLocales; - }; + pytesseract = callPackage ../development/python-modules/pytesseract { }; - pipdate = callPackage ../development/python-modules/pipdate { }; + # pytest>=6 is too new for most packages + pytest = if isPy3k then self.pytest_5 else self.pytest_4; - pika = callPackage ../development/python-modules/pika { }; + pytest_4 = callPackage + ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; - pika-pool = callPackage ../development/python-modules/pika-pool { }; + pytest_5 = callPackage + ../development/python-modules/pytest/5.nix { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; - pikepdf = callPackage ../development/python-modules/pikepdf { }; + pytest_6 = + callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { doCheck = false; }; + }; - kmapper = callPackage ../development/python-modules/kmapper { }; + pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; - kmsxx = toPythonModule ((callPackage ../development/libraries/kmsxx { - inherit (pkgs.kmsxx) stdenv; - inherit (pkgs) pkgconfig; - withPython = true; - }).overrideAttrs (oldAttrs: { - name = "${python.libPrefix}-${pkgs.kmsxx.name}"; - })); + pytest-annotate = callPackage ../development/python-modules/pytest-annotate { }; - precis-i18n = callPackage ../development/python-modules/precis-i18n { }; + pytest-ansible = callPackage ../development/python-modules/pytest-ansible { }; - promise = callPackage ../development/python-modules/promise { }; + pytest-arraydiff = callPackage ../development/python-modules/pytest-arraydiff { }; - prox-tv = callPackage ../development/python-modules/prox-tv { }; + pytest-astropy = callPackage ../development/python-modules/pytest-astropy { }; - pvlib = callPackage ../development/python-modules/pvlib { }; + pytest-astropy-header = callPackage ../development/python-modules/pytest-astropy-header { }; - pybase64 = callPackage ../development/python-modules/pybase64 { }; + pytest-asyncio = callPackage ../development/python-modules/pytest-asyncio { }; - pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; + pytest-bdd = callPackage ../development/python-modules/pytest-bdd { }; - pylibmc = callPackage ../development/python-modules/pylibmc {}; + pytest-benchmark = callPackage ../development/python-modules/pytest-benchmark { }; - pymetar = callPackage ../development/python-modules/pymetar { }; + pytest-black = callPackage ../development/python-modules/pytest-black { }; - pypubsub = callPackage ../development/python-modules/pypubsub { }; + pytestcache = callPackage ../development/python-modules/pytestcache { }; - pysftp = callPackage ../development/python-modules/pysftp { }; + pytest-catchlog = callPackage ../development/python-modules/pytest-catchlog { }; - soundfile = callPackage ../development/python-modules/soundfile { }; + pytest-check = callPackage ../development/python-modules/pytest-check { }; - pysoundfile = self.soundfile; # Alias added 23-06-2019 + pytest-click = callPackage ../development/python-modules/pytest-click { }; - python-jenkins = callPackage ../development/python-modules/python-jenkins { }; + pytestcov = callPackage ../development/python-modules/pytest-cov { }; - pystringtemplate = callPackage ../development/python-modules/stringtemplate { }; + pytest-cram = callPackage ../development/python-modules/pytest-cram { }; - pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; + pytest-datadir = callPackage ../development/python-modules/pytest-datadir { }; - pillow = if isPy27 then - callPackage ../development/python-modules/pillow/6.nix { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; - } else - callPackage ../development/python-modules/pillow { - inherit (pkgs) freetype libjpeg zlib libtiff libwebp tcl lcms2 tk; - inherit (pkgs.xorg) libX11; - }; + pytest-datafiles = callPackage ../development/python-modules/pytest-datafiles { }; - pkgconfig = callPackage ../development/python-modules/pkgconfig { - inherit (pkgs) pkgconfig; - }; + pytest-dependency = callPackage ../development/python-modules/pytest-dependency { }; - plumbum = callPackage ../development/python-modules/plumbum { }; + pytest-django = callPackage ../development/python-modules/pytest-django { }; - polib = callPackage ../development/python-modules/polib {}; + pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { }; - ponywhoosh = callPackage ../development/python-modules/ponywhoosh { }; + pytest-env = callPackage ../development/python-modules/pytest-env { }; - posix_ipc = callPackage ../development/python-modules/posix_ipc { }; + pytest-expect = callPackage ../development/python-modules/pytest-expect { }; - portend = callPackage ../development/python-modules/portend { }; + pytest-factoryboy = callPackage ../development/python-modules/pytest-factoryboy { }; - powerline = callPackage ../development/python-modules/powerline { }; + pytest-filter-subpackage = callPackage ../development/python-modules/pytest-filter-subpackage { }; - pox = callPackage ../development/python-modules/pox { }; + pytest-fixture-config = callPackage ../development/python-modules/pytest-fixture-config { }; - ppft = callPackage ../development/python-modules/ppft { }; + pytest-flake8 = callPackage ../development/python-modules/pytest-flake8 { }; - pproxy = callPackage ../development/python-modules/pproxy { }; + pytest-flakes = callPackage ../development/python-modules/pytest-flakes { }; - pq = callPackage ../development/python-modules/pq { }; + pytest-flask = callPackage ../development/python-modules/pytest-flask { }; - praw = if isPy3k then callPackage ../development/python-modules/praw { } - else callPackage ../development/python-modules/praw/6.3.nix { }; + pytest-forked = callPackage ../development/python-modules/pytest-forked { }; - prance = callPackage ../development/python-modules/prance { }; + pytest-freezegun = callPackage ../development/python-modules/pytest-freezegun { }; - prawcore = callPackage ../development/python-modules/prawcore { }; + pytest-helpers-namespace = callPackage ../development/python-modules/pytest-helpers-namespace { }; - premailer = callPackage ../development/python-modules/premailer { }; + pytest-html = callPackage ../development/python-modules/pytest-html { }; - prettytable = callPackage ../development/python-modules/prettytable { }; + pytest-httpbin = callPackage ../development/python-modules/pytest-httpbin { }; - property-manager = callPackage ../development/python-modules/property-manager { }; + pytest-isort = callPackage ../development/python-modules/pytest-isort { }; - prompt_toolkit = let - filename = if isPy3k then ../development/python-modules/prompt_toolkit else ../development/python-modules/prompt_toolkit/1.nix; - in callPackage filename { }; + pytest-lazy-fixture = callPackage ../development/python-modules/pytest-lazy-fixture { }; - protobuf = callPackage ../development/python-modules/protobuf { - disabled = isPyPy; - doCheck = !isPy3k; - # If a protobuf upgrade causes many Python packages to fail, please pin it - # here to the previous version. - protobuf = pkgs.protobuf; - }; + pytest-localserver = callPackage ../development/python-modules/pytest-localserver { }; - psd-tools = callPackage ../development/python-modules/psd-tools { }; + pytest-metadata = callPackage ../development/python-modules/pytest-metadata { }; - psutil = callPackage ../development/python-modules/psutil { }; + pytest-mock = if isPy3k then + callPackage ../development/python-modules/pytest-mock { } + else + callPackage ../development/python-modules/pytest-mock/2.nix { }; - psycopg2 = callPackage ../development/python-modules/psycopg2 {}; + pytest-mpl = callPackage ../development/python-modules/pytest-mpl { }; - ptpython = callPackage ../development/python-modules/ptpython { - prompt_toolkit = self.prompt_toolkit; - }; + pytest-mypy = callPackage ../development/python-modules/pytest-mypy { }; - ptable = callPackage ../development/python-modules/ptable { }; + pytest-openfiles = callPackage ../development/python-modules/pytest-openfiles { }; - publicsuffix = callPackage ../development/python-modules/publicsuffix {}; + pytest-ordering = callPackage ../development/python-modules/pytest-ordering { }; - publicsuffix2 = callPackage ../development/python-modules/publicsuffix2 {}; + pytest-pep257 = callPackage ../development/python-modules/pytest-pep257 { }; - py = callPackage ../development/python-modules/py { }; + pytestpep8 = callPackage ../development/python-modules/pytest-pep8 { }; - pyacoustid = callPackage ../development/python-modules/pyacoustid { }; + pytest-pylint = callPackage ../development/python-modules/pytest-pylint { }; - pyalgotrade = callPackage ../development/python-modules/pyalgotrade { }; + pytest-pythonpath = callPackage ../development/python-modules/pytest-pythonpath { }; - pyasn1 = callPackage ../development/python-modules/pyasn1 { }; + pytest-qt = callPackage ../development/python-modules/pytest-qt { }; - pyasn1-modules = callPackage ../development/python-modules/pyasn1-modules { }; + pytestquickcheck = callPackage ../development/python-modules/pytest-quickcheck { }; - pyatmo = callPackage ../development/python-modules/pyatmo { }; + pytest-raisesregexp = callPackage ../development/python-modules/pytest-raisesregexp { }; - pyaudio = callPackage ../development/python-modules/pyaudio { }; + pytest-randomly = callPackage ../development/python-modules/pytest-randomly { }; - pycoin = callPackage ../development/python-modules/pycoin { }; + pytest-random-order = callPackage ../development/python-modules/pytest-random-order { }; - pysam = callPackage ../development/python-modules/pysam { }; + pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { }; - pysaml2 = callPackage ../development/python-modules/pysaml2 { - inherit (pkgs) xmlsec; - }; + pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { }; - python-pushover = callPackage ../development/python-modules/pushover {}; + pytest-repeat = callPackage ../development/python-modules/pytest-repeat { }; - pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; + pytest-rerunfailures = callPackage ../development/python-modules/pytest-rerunfailures { }; - mongodict = callPackage ../development/python-modules/mongodict { }; + pytestrunner = callPackage ../development/python-modules/pytestrunner { }; - mongoengine = callPackage ../development/python-modules/mongoengine { }; + pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; - repoze_who = callPackage ../development/python-modules/repoze_who { }; + pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; - vobject = callPackage ../development/python-modules/vobject { }; + pytest-services = callPackage ../development/python-modules/pytest-services { }; - pycarddav = callPackage ../development/python-modules/pycarddav { }; + pytest-shutil = callPackage ../development/python-modules/pytest-shutil { }; - pygit2 = callPackage ../development/python-modules/pygit2 { }; + pytest-socket = callPackage ../development/python-modules/pytest-socket { }; - Babel = callPackage ../development/python-modules/Babel { }; + pytest-subtesthack = callPackage ../development/python-modules/pytest-subtesthack { }; - babelgladeextractor = callPackage ../development/python-modules/babelgladeextractor { }; + pytest-sugar = callPackage ../development/python-modules/pytest-sugar { }; - batchspawner = callPackage ../development/python-modules/batchspawner { }; + pytest-testmon = callPackage ../development/python-modules/pytest-testmon { }; - pybigwig = callPackage ../development/python-modules/pybigwig { }; + pytest-timeout = callPackage ../development/python-modules/pytest-timeout { }; - py2bit = callPackage ../development/python-modules/py2bit { }; + pytest-tornado = callPackage ../development/python-modules/pytest-tornado { }; - pyblock = callPackage ../development/python-modules/pyblock { }; + pytest-tornasync = callPackage ../development/python-modules/pytest-tornasync { }; - pyblosxom = callPackage ../development/python-modules/pyblosxom { }; + pytest-trio = callPackage ../development/python-modules/pytest-trio { }; - pycapnp = callPackage ../development/python-modules/pycapnp { }; + pytest-twisted = callPackage ../development/python-modules/pytest-twisted { }; - pycaption = callPackage ../development/python-modules/pycaption { }; + pytest-virtualenv = callPackage ../development/python-modules/pytest-virtualenv { }; - pycdio = callPackage ../development/python-modules/pycdio { }; + pytest-warnings = callPackage ../development/python-modules/pytest-warnings { }; - pycosat = callPackage ../development/python-modules/pycosat { }; + pytest-watch = callPackage ../development/python-modules/pytest-watch { }; - pycryptopp = callPackage ../development/python-modules/pycryptopp { }; + pytest_xdist_1 = callPackage ../development/python-modules/pytest-xdist { }; - pyct = callPackage ../development/python-modules/pyct { }; + pytest_xdist_2 = callPackage ../development/python-modules/pytest-xdist/2.nix { }; - pycups = callPackage ../development/python-modules/pycups { }; + pytest_xdist = self.pytest_xdist_1; - pycurl = callPackage ../development/python-modules/pycurl { }; + pytest-xprocess = callPackage ../development/python-modules/pytest-xprocess { }; - pycurl2 = callPackage ../development/python-modules/pycurl2 { }; + pytest-xvfb = callPackage ../development/python-modules/pytest-xvfb { }; - pydispatcher = callPackage ../development/python-modules/pydispatcher { }; + python2-pythondialog = callPackage ../development/python-modules/python2-pythondialog { }; - pydot = callPackage ../development/python-modules/pydot { - inherit (pkgs) graphviz; - }; + python3-openid = callPackage ../development/python-modules/python3-openid { }; - pydot_ng = callPackage ../development/python-modules/pydot_ng { graphviz = pkgs.graphviz; }; + python-axolotl = callPackage ../development/python-modules/python-axolotl { }; - pyelftools = callPackage ../development/python-modules/pyelftools { }; + python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { }; - pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; + python-baseconv = callPackage ../development/python-modules/python-baseconv { }; - pyexcelerator = callPackage ../development/python-modules/pyexcelerator { }; + python-binance = callPackage ../development/python-modules/python-binance { }; - pyext = callPackage ../development/python-modules/pyext { }; + python-constraint = callPackage ../development/python-modules/python-constraint { }; - pyface = callPackage ../development/python-modules/pyface { }; + python-ctags3 = callPackage ../development/python-modules/python-ctags3 { }; - pyfantom = callPackage ../development/python-modules/pyfantom { }; + python-daemon = callPackage ../development/python-modules/python-daemon { }; - pyfma = callPackage ../development/python-modules/pyfma { }; + python-dateutil = callPackage ../development/python-modules/dateutil { }; + # Alias that we should deprecate + dateutil = self.python-dateutil; - pyfftw = callPackage ../development/python-modules/pyfftw { }; + python-dbusmock = callPackage ../development/python-modules/python-dbusmock { }; - pyfiglet = callPackage ../development/python-modules/pyfiglet { }; + pythondialog = callPackage ../development/python-modules/pythondialog { }; - pyflakes = callPackage ../development/python-modules/pyflakes { }; + python-didl-lite = callPackage ../development/python-modules/python-didl-lite { }; - pyftgl = callPackage ../development/python-modules/pyftgl { }; + python-docx = callPackage ../development/python-modules/python-docx { }; - pygeoip = callPackage ../development/python-modules/pygeoip {}; + python-doi = callPackage ../development/python-modules/python-doi { }; - PyGithub = callPackage ../development/python-modules/pyGithub {}; + python-dotenv = callPackage ../development/python-modules/python-dotenv { }; - pyglet = callPackage ../development/python-modules/pyglet {}; + python-editor = callPackage ../development/python-modules/python-editor { }; - pygments = if isPy3k then - callPackage ../development/python-modules/Pygments { } - else - callPackage ../development/python-modules/Pygments/2_5.nix { }; + pythonefl = callPackage ../development/python-modules/python-efl { inherit (pkgs) pkgconfig; }; - pygpgme = callPackage ../development/python-modules/pygpgme { }; + python-engineio = callPackage ../development/python-modules/python-engineio { }; - pyment = callPackage ../development/python-modules/pyment { }; + python-etcd = callPackage ../development/python-modules/python-etcd { }; - pylint = if isPy3k then callPackage ../development/python-modules/pylint { } - else callPackage ../development/python-modules/pylint/1.9.nix { }; + python_fedora = callPackage ../development/python-modules/python_fedora { }; - pylint-celery = callPackage ../development/python-modules/pylint-celery { }; + python-fontconfig = callPackage ../development/python-modules/python-fontconfig { }; - pylint-django = callPackage ../development/python-modules/pylint-django { }; + python-forecastio = callPackage ../development/python-modules/python-forecastio { }; - pylint-flask = callPackage ../development/python-modules/pylint-flask { }; + python-gitlab = callPackage ../development/python-modules/python-gitlab { }; - pylint-plugin-utils = callPackage ../development/python-modules/pylint-plugin-utils { }; + python-gnupg = callPackage ../development/python-modules/python-gnupg { }; - pymumble = callPackage ../development/python-modules/pymumble { }; + python-hosts = callPackage ../development/python-modules/python-hosts { }; - pyomo = callPackage ../development/python-modules/pyomo { }; + python-igraph = callPackage ../development/python-modules/python-igraph { + pkgconfig = pkgs.pkgconfig; + igraph = pkgs.igraph; + }; - pyopencl = callPackage ../development/python-modules/pyopencl { }; + pythonIRClib = callPackage ../development/python-modules/pythonirclib { }; - pyosmium = callPackage ../development/python-modules/pyosmium { }; + pythonix = callPackage ../development/python-modules/pythonix { inherit (pkgs) meson pkgconfig; }; - pyotp = callPackage ../development/python-modules/pyotp { }; + python-jenkins = callPackage ../development/python-modules/python-jenkins { }; - pyproj = callPackage ../development/python-modules/pyproj { }; + python-jose = callPackage ../development/python-modules/python-jose { }; - pyqrcode = callPackage ../development/python-modules/pyqrcode { }; + python-json-logger = callPackage ../development/python-modules/python-json-logger { }; - pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; + python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server { }; - pyrad = callPackage ../development/python-modules/pyrad { }; + python_keyczar = callPackage ../development/python-modules/python_keyczar { }; - pyrr = callPackage ../development/python-modules/pyrr { }; + python-language-server = callPackage ../development/python-modules/python-language-server { }; - pysha3 = callPackage ../development/python-modules/pysha3 { }; + python-ldap-test = callPackage ../development/python-modules/python-ldap-test { }; - pyshp = callPackage ../development/python-modules/pyshp { }; + python-Levenshtein = callPackage ../development/python-modules/python-levenshtein { }; - pysnow = callPackage ../development/python-modules/pysnow { }; + python-libarchive = callPackage ../development/python-modules/python-libarchive { }; - pysmbc = callPackage ../development/python-modules/pysmbc { - inherit (pkgs) pkgconfig; - }; + python-logstash = callPackage ../development/python-modules/python-logstash { }; - pyspread = callPackage ../development/python-modules/pyspread { }; + python-ly = callPackage ../development/python-modules/python-ly { }; - pysparse = callPackage ../development/python-modules/pysparse { }; + python-lz4 = callPackage ../development/python-modules/python-lz4 { }; - pyupdate = callPackage ../development/python-modules/pyupdate {}; + python-lzf = callPackage ../development/python-modules/python-lzf { }; - pyvmomi = callPackage ../development/python-modules/pyvmomi { }; + python-lzo = callPackage ../development/python-modules/python-lzo { inherit (pkgs) lzo; }; - pyx = callPackage ../development/python-modules/pyx { }; + python_magic = callPackage ../development/python-modules/python-magic { }; - mmpython = callPackage ../development/python-modules/mmpython { }; + pythonmagick = callPackage ../development/python-modules/pythonmagick { }; - kaa-base = callPackage ../development/python-modules/kaa-base { }; + python-mapnik = callPackage ../development/python-modules/python-mapnik { }; - kaa-metadata = callPackage ../development/python-modules/kaa-metadata { }; + python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; - PyICU = callPackage ../development/python-modules/pyicu { }; + python-miio = callPackage ../development/python-modules/python-miio { }; - pyinputevent = callPackage ../development/python-modules/pyinputevent { }; + python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; - pyinotify = callPackage ../development/python-modules/pyinotify { }; + python-mnist = callPackage ../development/python-modules/python-mnist { }; - pyipp = callPackage ../development/python-modules/pyipp { }; + python-mpv-jsonipc = callPackage ../development/python-modules/python-mpv-jsonipc { }; - pyjwt = callPackage ../development/python-modules/pyjwt { }; + python-multipart = callPackage ../development/python-modules/python-multipart { }; - pykickstart = callPackage ../development/python-modules/pykickstart { }; + pythonnet = callPackage + ../development/python-modules/pythonnet { # `mono >= 4.6` required to prevent crashes encountered with earlier versions. + mono = pkgs.mono4; + inherit (pkgs) pkgconfig; + }; - pymemoize = callPackage ../development/python-modules/pymemoize { }; + python-nomad = callPackage ../development/python-modules/python-nomad { }; - pyobjc = if stdenv.isDarwin - then callPackage ../development/python-modules/pyobjc {} - else throw "pyobjc can only be built on Mac OS"; + python-oauth2 = callPackage ../development/python-modules/python-oauth2 { }; - pyodbc = callPackage ../development/python-modules/pyodbc { }; + pythonocc-core = + toPythonModule (callPackage ../development/python-modules/pythonocc-core { inherit (pkgs.xorg) libX11; }); - pyocr = callPackage ../development/python-modules/pyocr { }; + python-olm = callPackage ../development/python-modules/python-olm { }; - pyparsing = callPackage ../development/python-modules/pyparsing { }; + python_openzwave = callPackage ../development/python-modules/python_openzwave { inherit (pkgs) pkgconfig; }; - pyparted = callPackage ../development/python-modules/pyparted { }; + python-otr = callPackage ../development/python-modules/python-otr { }; - pyptlib = callPackage ../development/python-modules/pyptlib { }; + python-packer = callPackage ../development/python-modules/python-packer { }; - pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; + python-pam = callPackage ../development/python-modules/python-pam { }; - PyStemmer = callPackage ../development/python-modules/pystemmer {}; + python-periphery = callPackage ../development/python-modules/python-periphery { }; - # Missing expression? - # Pyro = callPackage ../development/python-modules/pyro { }; + python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; - pyrsistent = callPackage ../development/python-modules/pyrsistent { }; + python-prctl = callPackage ../development/python-modules/python-prctl { }; - PyRSS2Gen = callPackage ../development/python-modules/pyrss2gen { }; + python-ptrace = callPackage ../development/python-modules/python-ptrace { }; - pysmi = callPackage ../development/python-modules/pysmi { }; + python-pushover = callPackage ../development/python-modules/pushover { }; - pysnmp = callPackage ../development/python-modules/pysnmp { }; + python-rapidjson = callPackage ../development/python-modules/python-rapidjson { }; - pysocks = callPackage ../development/python-modules/pysocks { }; + python-redis-lock = callPackage ../development/python-modules/python-redis-lock { }; - python_fedora = callPackage ../development/python-modules/python_fedora {}; + python-rtmidi = callPackage ../development/python-modules/python-rtmidi { }; - python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat {}; + python-simple-hipchat = callPackage ../development/python-modules/python-simple-hipchat { }; python_simple_hipchat = self.python-simple-hipchat; - scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; - - python_keyczar = callPackage ../development/python-modules/python_keyczar { }; - - python-language-server = callPackage ../development/python-modules/python-language-server {}; + python-slugify = callPackage ../development/python-modules/python-slugify { }; - python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server {}; + python-snappy = callPackage ../development/python-modules/python-snappy { inherit (pkgs) snappy; }; - pyls-black = callPackage ../development/python-modules/pyls-black {}; + python-socketio = callPackage ../development/python-modules/python-socketio { }; - pyls-isort = callPackage ../development/python-modules/pyls-isort {}; + python-sql = callPackage ../development/python-modules/python-sql { }; - pyls-mypy = callPackage ../development/python-modules/pyls-mypy {}; + python_statsd = callPackage ../development/python-modules/python_statsd { }; - pyu2f = callPackage ../development/python-modules/pyu2f { }; + python-stdnum = callPackage ../development/python-modules/python-stdnum { }; - pyudev = callPackage ../development/python-modules/pyudev { - inherit (pkgs) systemd; - }; + python-sybase = callPackage ../development/python-modules/sybase { }; - pynmea2 = callPackage ../development/python-modules/pynmea2 {}; + python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; - pynrrd = callPackage ../development/python-modules/pynrrd { }; + python-toolbox = callPackage ../development/python-modules/python-toolbox { }; - pynvml = callPackage ../development/python-modules/pynvml { }; + python-twitter = callPackage ../development/python-modules/python-twitter { }; - pynzb = callPackage ../development/python-modules/pynzb { }; + python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; - process-tests = callPackage ../development/python-modules/process-tests { }; + python-uinput = callPackage ../development/python-modules/python-uinput { }; - progressbar = callPackage ../development/python-modules/progressbar {}; + python-unshare = callPackage ../development/python-modules/python-unshare { }; - progressbar2 = callPackage ../development/python-modules/progressbar2 { }; + python-utils = callPackage ../development/python-modules/python-utils { }; - progressbar231 = callPackage ../development/python-modules/progressbar231 { }; + python-vagrant = callPackage ../development/python-modules/python-vagrant { }; - progressbar33 = callPackage ../development/python-modules/progressbar33 { }; + python-vipaccess = callPackage ../development/python-modules/python-vipaccess { }; - protego = callPackage ../development/python-modules/protego {}; + python-vlc = callPackage ../development/python-modules/python-vlc { }; - ldap = callPackage ../development/python-modules/ldap { - inherit (pkgs) openldap cyrus_sasl; - }; + python-wifi = callPackage ../development/python-modules/python-wifi { }; - ldap3 = callPackage ../development/python-modules/ldap3 {}; + python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; - ptest = callPackage ../development/python-modules/ptest { }; + pytimeparse = callPackage ../development/python-modules/pytimeparse { }; - ptyprocess = callPackage ../development/python-modules/ptyprocess { }; + pytmx = callPackage ../development/python-modules/pytmx { }; - pylibacl = callPackage ../development/python-modules/pylibacl { }; + pytoml = callPackage ../development/python-modules/pytoml { }; - pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 + pytools = callPackage ../development/python-modules/pytools { }; - pyliblo = callPackage ../development/python-modules/pyliblo { }; + pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; }; - pypcap = callPackage ../development/python-modules/pypcap {}; + pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { + inherit (pkgs.linuxPackages) nvidia_x11; + }; - pyplatec = callPackage ../development/python-modules/pyplatec { }; + pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { }; - purepng = callPackage ../development/python-modules/purepng { }; + pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; - pyhocon = callPackage ../development/python-modules/pyhocon { }; + pytorchWithCuda = self.pytorch.override { cudaSupport = true; }; - pyjson5 = callPackage ../development/python-modules/pyjson5 {}; + pytorchWithoutCuda = self.pytorch.override { cudaSupport = false; }; - pymaging = callPackage ../development/python-modules/pymaging { }; + pytrends = callPackage ../development/python-modules/pytrends { }; - pymaging_png = callPackage ../development/python-modules/pymaging_png { }; + pytricia = callPackage ../development/python-modules/pytricia { }; - pyPdf = callPackage ../development/python-modules/pypdf { }; + pytun = callPackage ../development/python-modules/pytun { }; - pypdf2 = callPackage ../development/python-modules/pypdf2 { }; + pytz = callPackage ../development/python-modules/pytz { }; - pyopengl = callPackage ../development/python-modules/pyopengl { }; + pytzdata = callPackage ../development/python-modules/pytzdata { }; - pyopenssl = callPackage ../development/python-modules/pyopenssl { }; + pyu2f = callPackage ../development/python-modules/pyu2f { }; - pyquery = callPackage ../development/python-modules/pyquery { }; + pyuavcan = callPackage + ../development/python-modules/pyuavcan { # this version pinpoint to anold version is necessary due to a regression + nunavut = self.nunavut.overridePythonAttrs (old: rec { + version = "0.2.3"; + src = old.src.override { + inherit version; + sha256 = "0x8a9h4mc2r2yz49s9arsbs4bn3h25mvmg4zbgksm9hcyi9536x5"; + }; + }); + }; - pyreport = callPackage ../development/python-modules/pyreport { }; + pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; }; - pyreadability = callPackage ../development/python-modules/pyreadability { }; + pyunbound = callPackage ../tools/networking/unbound/python.nix { }; - pyscss = callPackage ../development/python-modules/pyscss { }; + pyunifi = callPackage ../development/python-modules/pyunifi { }; - pyserial = callPackage ../development/python-modules/pyserial {}; + pyupdate = callPackage ../development/python-modules/pyupdate { }; - pyserial-asyncio = callPackage ../development/python-modules/pyserial-asyncio { }; + pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; - pysonos = callPackage ../development/python-modules/pysonos {}; + pyutil = callPackage ../development/python-modules/pyutil { }; - pymongo = callPackage ../development/python-modules/pymongo {}; + pyutilib = callPackage ../development/python-modules/pyutilib { }; - pyperclip = callPackage ../development/python-modules/pyperclip { }; + pyuv = callPackage ../development/python-modules/pyuv { }; - pysqlite = callPackage ../development/python-modules/pysqlite { }; + py-vapid = callPackage ../development/python-modules/py-vapid { }; - pysvn = callPackage ../development/python-modules/pysvn { }; + pyvcd = callPackage ../development/python-modules/pyvcd { }; - python-markdown-math = callPackage ../development/python-modules/python-markdown-math { }; + pyvcf = callPackage ../development/python-modules/pyvcf { }; - python-miio = callPackage ../development/python-modules/python-miio { }; + pyviz-comms = callPackage ../development/python-modules/pyviz-comms { }; - python-pipedrive = callPackage ../development/python-modules/python-pipedrive { }; + pyvmomi = callPackage ../development/python-modules/pyvmomi { }; - python-ptrace = callPackage ../development/python-modules/python-ptrace { }; + pyvoro = callPackage ../development/python-modules/pyvoro { }; - python-wifi = callPackage ../development/python-modules/python-wifi { }; + pywal = callPackage ../development/python-modules/pywal { }; - python-etcd = callPackage ../development/python-modules/python-etcd { }; + pywatchman = callPackage ../development/python-modules/pywatchman { }; - pythonnet = callPackage ../development/python-modules/pythonnet { - # `mono >= 4.6` required to prevent crashes encountered with earlier versions. - mono = pkgs.mono4; - inherit (pkgs) pkgconfig; - }; + pywavelets = callPackage ../development/python-modules/pywavelets { }; - pytz = callPackage ../development/python-modules/pytz { }; + # We need "normal" libxml2 and not the python package by the same name. + pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; - pytzdata = callPackage ../development/python-modules/pytzdata { }; + PyWebDAV = callPackage ../development/python-modules/pywebdav { }; - pyutil = callPackage ../development/python-modules/pyutil { }; + pywebpush = callPackage ../development/python-modules/pywebpush { }; - pyutilib = callPackage ../development/python-modules/pyutilib { }; + pywebview = callPackage ../development/python-modules/pywebview { }; - pywal = callPackage ../development/python-modules/pywal { }; + pywick = callPackage ../development/python-modules/pywick { }; pywinrm = callPackage ../development/python-modules/pywinrm { }; pyxattr = let pyxattr' = callPackage ../development/python-modules/pyxattr { }; - pyxattr_2 = pyxattr'.overridePythonAttrs(oldAttrs: rec { + pyxattr_2 = pyxattr'.overridePythonAttrs (oldAttrs: rec { version = "0.6.1"; src = oldAttrs.src.override { inherit version; @@ -5833,68 +5843,49 @@ in { }); in if isPy3k then pyxattr' else pyxattr_2; - pyamg = callPackage ../development/python-modules/pyamg { }; - - pyaml = callPackage ../development/python-modules/pyaml { }; - - pyyaml = callPackage ../development/python-modules/pyyaml { }; - - rabbitpy = callPackage ../development/python-modules/rabbitpy { }; - - rasterio = callPackage ../development/python-modules/rasterio { - gdal = pkgs.gdal_2; # gdal 3.0 not supported yet - }; + pyx = callPackage ../development/python-modules/pyx { }; - radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud {}; + pyxdg = callPackage ../development/python-modules/pyxdg { }; - recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; + pyxl3 = callPackage ../development/python-modules/pyxl3 { }; - rbtools = callPackage ../development/python-modules/rbtools { }; + pyxml = disabledIf isPy3k (callPackage ../development/python-modules/pyxml { }); - rencode = callPackage ../development/python-modules/rencode { }; - - reportlab = callPackage ../development/python-modules/reportlab { }; + pyyaml = callPackage ../development/python-modules/pyyaml { }; - requests = callPackage ../development/python-modules/requests { }; + pyzmq = callPackage ../development/python-modules/pyzmq { }; - requests_download = callPackage ../development/python-modules/requests_download { }; + pyzufall = callPackage ../development/python-modules/pyzufall { }; - requestsexceptions = callPackage ../development/python-modules/requestsexceptions {}; + qasm2image = callPackage ../development/python-modules/qasm2image { }; - requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; + qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; - requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; + qds_sdk = callPackage ../development/python-modules/qds_sdk { }; - requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; - requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 + qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; - retry_decorator = callPackage ../development/python-modules/retry_decorator { }; + qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; - roboschool = callPackage ../development/python-modules/roboschool { - inherit (pkgs) pkgconfig; # use normal pkgconfig, not the python package - }; + qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; - rfc6555 = callPackage ../development/python-modules/rfc6555 { }; + qiskit = callPackage ../development/python-modules/qiskit { }; - qdarkstyle = callPackage ../development/python-modules/qdarkstyle { }; + qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; - qds_sdk = callPackage ../development/python-modules/qds_sdk { }; + qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; - qimage2ndarray = callPackage ../development/python-modules/qimage2ndarray { }; + qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; - quamash = callPackage ../development/python-modules/quamash { }; + qpid-python = callPackage ../development/python-modules/qpid-python { }; - quandl = callPackage ../development/python-modules/quandl { }; - # alias for an older package which did not support Python 3 - Quandl = callPackage ../development/python-modules/quandl { }; + qrcode = callPackage ../development/python-modules/qrcode { }; - querystring_parser = callPackage ../development/python-modules/querystring-parser { }; + qreactor = callPackage ../development/python-modules/qreactor { }; qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { - pythonPackages = self; - }; + qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; qscintilla = self.qscintilla-qt4; @@ -5906,790 +5897,675 @@ in { qtpy = callPackage ../development/python-modules/qtpy { }; - qreactor = callPackage ../development/python-modules/qreactor { }; - - quantities = callPackage ../development/python-modules/quantities { }; - - qutip = callPackage ../development/python-modules/qutip { }; + quamash = callPackage ../development/python-modules/quamash { }; - rcssmin = callPackage ../development/python-modules/rcssmin { }; + quandl = callPackage ../development/python-modules/quandl { }; - recommonmark = callPackage ../development/python-modules/recommonmark { }; + Quandl = + callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 - redis = callPackage ../development/python-modules/redis { }; + quantities = callPackage ../development/python-modules/quantities { }; - rednose = callPackage ../development/python-modules/rednose { }; + querystring_parser = callPackage ../development/python-modules/querystring-parser { }; - reikna = callPackage ../development/python-modules/reikna { }; + queuelib = callPackage ../development/python-modules/queuelib { }; - repocheck = callPackage ../development/python-modules/repocheck { }; + qutip = callPackage ../development/python-modules/qutip { }; - restrictedpython = callPackage ../development/python-modules/restrictedpython { }; + r2pipe = callPackage ../development/python-modules/r2pipe { }; - restview = callPackage ../development/python-modules/restview { }; + rabbitpy = callPackage ../development/python-modules/rabbitpy { }; - readme = callPackage ../development/python-modules/readme { }; + radicale_infcloud = callPackage ../development/python-modules/radicale_infcloud { }; - readme_renderer = callPackage ../development/python-modules/readme_renderer { }; + radio_beam = callPackage ../development/python-modules/radio_beam { }; - readchar = callPackage ../development/python-modules/readchar { }; + radish-bdd = callPackage ../development/python-modules/radish-bdd { }; - retworkx = callPackage ../development/python-modules/retworkx { }; + rainbowstream = callPackage ../development/python-modules/rainbowstream { }; - rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { - python3 = python; - })); + ramlfications = callPackage ../development/python-modules/ramlfications { }; - ripser = callPackage ../development/python-modules/ripser { }; + random2 = callPackage ../development/python-modules/random2 { }; - rjsmin = callPackage ../development/python-modules/rjsmin { }; + rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; - pysolr = callPackage ../development/python-modules/pysolr { }; + rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet - geoalchemy2 = callPackage ../development/python-modules/geoalchemy2 { }; + ratelimiter = callPackage ../development/python-modules/ratelimiter { }; - geographiclib = callPackage ../development/python-modules/geographiclib { }; + raven = callPackage ../development/python-modules/raven { }; - geopy = if isPy3k - then callPackage ../development/python-modules/geopy { } - else callPackage ../development/python-modules/geopy/2.nix { }; + rawkit = callPackage ../development/python-modules/rawkit { }; - django-haystack = callPackage ../development/python-modules/django-haystack { }; + rbtools = callPackage ../development/python-modules/rbtools { }; - django-multiselectfield = callPackage ../development/python-modules/django-multiselectfield { }; + rcssmin = callPackage ../development/python-modules/rcssmin { }; rdflib = callPackage ../development/python-modules/rdflib { }; rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { }; - isodate = callPackage ../development/python-modules/isodate { }; - - owslib = callPackage ../development/python-modules/owslib { }; - - readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; - - requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; + readchar = callPackage ../development/python-modules/readchar { }; - requirements-detector = callPackage ../development/python-modules/requirements-detector { }; + readme = callPackage ../development/python-modules/readme { }; - resampy = callPackage ../development/python-modules/resampy { }; + readme_renderer = callPackage ../development/python-modules/readme_renderer { }; - restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; + readthedocs-sphinx-ext = callPackage ../development/python-modules/readthedocs-sphinx-ext { }; - retry = callPackage ../development/python-modules/retry { }; + rebulk = callPackage ../development/python-modules/rebulk { }; - robomachine = callPackage ../development/python-modules/robomachine { }; + recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; - robotframework = callPackage ../development/python-modules/robotframework { }; + recommonmark = callPackage ../development/python-modules/recommonmark { }; - robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { }; + redis = callPackage ../development/python-modules/redis { }; - robotframework-requests = callPackage ../development/python-modules/robotframework-requests { }; + rednose = callPackage ../development/python-modules/rednose { }; - robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; + regex = callPackage ../development/python-modules/regex { }; - robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; + regional = callPackage ../development/python-modules/regional { }; - robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { }; + reikna = callPackage ../development/python-modules/reikna { }; - robotframework-sshlibrary = callPackage ../development/python-modules/robotframework-sshlibrary { }; + relatorio = callPackage ../development/python-modules/relatorio { }; - robotframework-tools = callPackage ../development/python-modules/robotframework-tools { }; + remotecv = callPackage ../development/python-modules/remotecv { }; - robotstatuschecker = callPackage ../development/python-modules/robotstatuschecker { }; + rencode = callPackage ../development/python-modules/rencode { }; - robotsuite = callPackage ../development/python-modules/robotsuite { }; + repeated_test = callPackage ../development/python-modules/repeated_test { }; - serpent = callPackage ../development/python-modules/serpent { }; + repocheck = callPackage ../development/python-modules/repocheck { }; - selectors34 = callPackage ../development/python-modules/selectors34 { }; + reportlab = callPackage ../development/python-modules/reportlab { }; - Pyro4 = callPackage ../development/python-modules/pyro4 { }; + repoze_lru = callPackage ../development/python-modules/repoze_lru { }; - Pyro5 = callPackage ../development/python-modules/pyro5 { }; + repoze_sphinx_autointerface = callPackage ../development/python-modules/repoze_sphinx_autointerface { }; - rnc2rng = callPackage ../development/python-modules/rnc2rng { }; + repoze_who = callPackage ../development/python-modules/repoze_who { }; - rope = callPackage ../development/python-modules/rope { }; + reproject = callPackage ../development/python-modules/reproject { }; - ropper = callPackage ../development/python-modules/ropper { }; + requests-aws4auth = callPackage ../development/python-modules/requests-aws4auth { }; - rpkg = callPackage ../development/python-modules/rpkg {}; + requests-cache = callPackage ../development/python-modules/requests-cache { }; - rply = callPackage ../development/python-modules/rply {}; + requests = callPackage ../development/python-modules/requests { }; - rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override{ inherit python; })); + requests_download = callPackage ../development/python-modules/requests_download { }; - rpmfluff = callPackage ../development/python-modules/rpmfluff {}; + requestsexceptions = callPackage ../development/python-modules/requestsexceptions { }; - rpy2 = if isPy3k - then callPackage ../development/python-modules/rpy2 { } - else callPackage ../development/python-modules/rpy2/2.nix { }; + requests-file = callPackage ../development/python-modules/requests-file { }; - rtslib = callPackage ../development/python-modules/rtslib {}; + requests-http-signature = callPackage ../development/python-modules/requests-http-signature { }; - Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; + requests-kerberos = callPackage ../development/python-modules/requests-kerberos { }; - typing = callPackage ../development/python-modules/typing { }; + requests-mock = callPackage ../development/python-modules/requests-mock { }; - typing-extensions = callPackage ../development/python-modules/typing-extensions { }; + requests_ntlm = callPackage ../development/python-modules/requests_ntlm { }; - typing-inspect = callPackage ../development/python-modules/typing-inspect { }; + requests_oauthlib = callPackage ../development/python-modules/requests-oauthlib { }; - typeguard = callPackage ../development/python-modules/typeguard { }; + requests-toolbelt = callPackage ../development/python-modules/requests-toolbelt { }; - typesentry = callPackage ../development/python-modules/typesentry { }; + requests_toolbelt = self.requests-toolbelt; # Old attr, 2017-09-26 - typesystem = callPackage ../development/python-modules/typesystem { }; + requests-unixsocket = callPackage ../development/python-modules/requests-unixsocket { }; - s3transfer = callPackage ../development/python-modules/s3transfer { }; + requirements-detector = callPackage ../development/python-modules/requirements-detector { }; - seqdiag = callPackage ../development/python-modules/seqdiag { }; + resampy = callPackage ../development/python-modules/resampy { }; - sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { - pythonPackages = self; - pythonSupport = true; - })); + responses = callPackage ../development/python-modules/responses { }; - safe = callPackage ../development/python-modules/safe { }; + restrictedpython = callPackage ../development/python-modules/restrictedpython { }; - safety = callPackage ../development/python-modules/safety { }; + restructuredtext_lint = callPackage ../development/python-modules/restructuredtext_lint { }; - sampledata = callPackage ../development/python-modules/sampledata { }; + restview = callPackage ../development/python-modules/restview { }; - sasmodels = callPackage ../development/python-modules/sasmodels { }; + rethinkdb = callPackage ../development/python-modules/rethinkdb { }; - scapy = callPackage ../development/python-modules/scapy { }; + retry = callPackage ../development/python-modules/retry { }; - scipy = let - scipy_ = callPackage ../development/python-modules/scipy { }; - scipy_1_2 = scipy_.overridePythonAttrs(oldAttrs: rec { - version = "1.2.2"; - src = oldAttrs.src.override { - inherit version; - sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; - }; - }); - in if pythonOlder "3.5" then scipy_1_2 else scipy_; + retry_decorator = callPackage ../development/python-modules/retry_decorator { }; - scipy_1_3 = self.scipy.overridePythonAttrs(oldAttrs: rec { - version = "1.3.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; - }; - doCheck = false; - }); + retrying = callPackage ../development/python-modules/retrying { }; - scikitimage = callPackage ../development/python-modules/scikit-image { }; + retworkx = disabledIf (pythonOlder "3.5") (toPythonModule (callPackage ../development/python-modules/retworkx { })); - scikitlearn = let - args = { inherit (pkgs) gfortran glibcLocales; }; - in - if isPy3k then callPackage ../development/python-modules/scikitlearn args - else callPackage ../development/python-modules/scikitlearn/0.20.nix args; + rfc3986 = callPackage ../development/python-modules/rfc3986 { }; - scikit-bio = callPackage ../development/python-modules/scikit-bio { }; + rfc3987 = callPackage ../development/python-modules/rfc3987 { }; - scikit-build = callPackage ../development/python-modules/scikit-build { }; + rfc6555 = callPackage ../development/python-modules/rfc6555 { }; - scikits-odes = callPackage ../development/python-modules/scikits-odes { }; + rfc7464 = callPackage ../development/python-modules/rfc7464 { }; - scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; + rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl { }); - scikit-tda = callPackage ../development/python-modules/scikit-tda { }; + rig = callPackage ../development/python-modules/rig { }; - scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; + ripser = callPackage ../development/python-modules/ripser { }; - scp = callPackage ../development/python-modules/scp {}; + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { python3 = python; })); - seaborn = if isPy3k then - callPackage ../development/python-modules/seaborn { } - else - callPackage ../development/python-modules/seaborn/0.9.1.nix { }; + rjsmin = callPackage ../development/python-modules/rjsmin { }; - seabreeze = callPackage ../development/python-modules/seabreeze { }; + rl-coach = callPackage ../development/python-modules/rl-coach { }; - selenium = callPackage ../development/python-modules/selenium { }; + rlp = callPackage ../development/python-modules/rlp { }; - serpy = callPackage ../development/python-modules/serpy { }; + rnc2rng = callPackage ../development/python-modules/rnc2rng { }; - setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; + robomachine = callPackage ../development/python-modules/robomachine { }; - setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; + roboschool = callPackage ../development/python-modules/roboschool { + inherit (pkgs) pkgconfig; + }; # use normal pkgconfig, not the python package - serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; + robot-detection = callPackage ../development/python-modules/robot-detection { }; - shippai = callPackage ../development/python-modules/shippai {}; + robotframework = callPackage ../development/python-modules/robotframework { }; - shutilwhich = callPackage ../development/python-modules/shutilwhich { }; + robotframework-databaselibrary = callPackage ../development/python-modules/robotframework-databaselibrary { }; - simanneal = callPackage ../development/python-modules/simanneal { }; + robotframework-requests = callPackage ../development/python-modules/robotframework-requests { }; - simplegeneric = callPackage ../development/python-modules/simplegeneric { }; + robotframework-ride = callPackage ../development/python-modules/robotframework-ride { }; - shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; + robotframework-selenium2library = callPackage ../development/python-modules/robotframework-selenium2library { }; - shodan = callPackage ../development/python-modules/shodan { }; + robotframework-seleniumlibrary = callPackage ../development/python-modules/robotframework-seleniumlibrary { }; - should-dsl = callPackage ../development/python-modules/should-dsl { }; + robotframework-sshlibrary = callPackage ../development/python-modules/robotframework-sshlibrary { }; - showit = callPackage ../development/python-modules/showit { }; + robotframework-tools = callPackage ../development/python-modules/robotframework-tools { }; - simplejson = callPackage ../development/python-modules/simplejson { }; + robotstatuschecker = callPackage ../development/python-modules/robotstatuschecker { }; - simplekml = callPackage ../development/python-modules/simplekml { }; + robotsuite = callPackage ../development/python-modules/robotsuite { }; - slimit = callPackage ../development/python-modules/slimit { }; + rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; - snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { }; + roku = callPackage ../development/python-modules/roku { }; - snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { }; + roman = callPackage ../development/python-modules/roman { }; - snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; + rope = callPackage ../development/python-modules/rope { }; - snitun = callPackage ../development/python-modules/snitun { }; + ROPGadget = callPackage ../development/python-modules/ROPGadget { }; - snscrape = callPackage ../development/python-modules/snscrape { }; + ropper = callPackage ../development/python-modules/ropper { }; - snug = callPackage ../development/python-modules/snug { }; + rotate-backups = callPackage ../tools/backup/rotate-backups { }; - snuggs = callPackage ../development/python-modules/snuggs { }; + routes = callPackage ../development/python-modules/routes { }; - spake2 = callPackage ../development/python-modules/spake2 { }; + rpdb = callPackage ../development/python-modules/rpdb { }; - sphfile = callPackage ../development/python-modules/sphfile { }; + rpkg = callPackage ../development/python-modules/rpkg { }; - supervisor = callPackage ../development/python-modules/supervisor {}; + rply = callPackage ../development/python-modules/rply { }; - subprocess32 = callPackage ../development/python-modules/subprocess32 { }; + rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { inherit python; })); - spark_parser = callPackage ../development/python-modules/spark_parser { }; + rpmfluff = callPackage ../development/python-modules/rpmfluff { }; - sphinx = if isPy3k then - callPackage ../development/python-modules/sphinx { } + rpy2 = if isPy3k then + callPackage ../development/python-modules/rpy2 { } else - callPackage ../development/python-modules/sphinx/2.nix { }; + callPackage ../development/python-modules/rpy2/2.nix { }; - # Only exists for a Haskell package. - sphinx_1_7_9 = (callPackage ../development/python-modules/sphinx/2.nix { }) - .overridePythonAttrs (oldAttrs: rec { - version = "1.7.9"; - src = oldAttrs.src.override { - inherit version; - sha256 = "217a7705adcb573da5bbe1e0f5cab4fa0bd89fd9342c9159121746f593c2d5a4"; - }; - }); + rpyc = callPackage ../development/python-modules/rpyc { }; - sphinx-argparse = callPackage ../development/python-modules/sphinx-argparse { }; + rq = callPackage ../development/python-modules/rq { }; - sphinxcontrib-websupport = if isPy3k then - callPackage ../development/python-modules/sphinxcontrib-websupport { } + rsa = if isPy3k then + callPackage ../development/python-modules/rsa { } else - callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; - - hieroglyph = callPackage ../development/python-modules/hieroglyph { }; - - hvplot = callPackage ../development/python-modules/hvplot { }; - - guzzle_sphinx_theme = callPackage ../development/python-modules/guzzle_sphinx_theme { }; - - sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; - - sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp {}; - - sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp {}; - - sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; - - sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp {}; - - sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath {}; - - sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; - - sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp {}; - - sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml {}; - - sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex {}; + callPackage ../development/python-modules/rsa/4_0.nix { }; - sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree {}; + rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; - sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; + Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; - splinter = callPackage ../development/python-modules/splinter { }; + rtslib = callPackage ../development/python-modules/rtslib { }; - spotipy = callPackage ../development/python-modules/spotipy { }; + ruamel_base = callPackage ../development/python-modules/ruamel_base { }; - sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; + ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; - sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; + ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; - sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; + ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { }; - sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; + rubymarshal = callPackage ../development/python-modules/rubymarshal { }; - sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; + ruffus = callPackage ../development/python-modules/ruffus { }; - sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; + runsnakerun = callPackage ../development/python-modules/runsnakerun { }; - sqlsoup = callPackage ../development/python-modules/sqlsoup { }; + runway-python = callPackage ../development/python-modules/runway-python { }; - staticjinja = callPackage ../development/python-modules/staticjinja { }; + rx = callPackage ../development/python-modules/rx { }; - statsmodels = callPackage ../development/python-modules/statsmodels { }; + rxv = callPackage ../development/python-modules/rxv { }; - strategies = callPackage ../development/python-modules/strategies { }; + s2clientprotocol = callPackage ../development/python-modules/s2clientprotocol { }; - stravalib = callPackage ../development/python-modules/stravalib { }; + s3fs = callPackage ../development/python-modules/s3fs { }; - streamz = callPackage ../development/python-modules/streamz { }; + s3transfer = callPackage ../development/python-modules/s3transfer { }; - structlog = callPackage ../development/python-modules/structlog { }; + sabyenc3 = callPackage ../development/python-modules/sabyenc3 { }; - stytra = callPackage ../development/python-modules/stytra { }; + sabyenc = callPackage ../development/python-modules/sabyenc { }; - sybil = callPackage ../development/python-modules/sybil { }; + sacremoses = callPackage ../development/python-modules/sacremoses { }; - # legacy alias - syncthing-gtk = pkgs.syncthing-gtk; + safe = callPackage ../development/python-modules/safe { }; - systemd = callPackage ../development/python-modules/systemd { - inherit (pkgs) pkgconfig systemd; - }; + safety = callPackage ../development/python-modules/safety { }; - sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; + salmon-mail = callPackage ../development/python-modules/salmon-mail { }; - tabulate = callPackage ../development/python-modules/tabulate { }; + sampledata = callPackage ../development/python-modules/sampledata { }; - tadasets = callPackage ../development/python-modules/tadasets { }; + samplerate = callPackage ../development/python-modules/samplerate { }; - tasklib = callPackage ../development/python-modules/tasklib { }; + samsungctl = callPackage ../development/python-modules/samsungctl { }; - tatsu = callPackage ../development/python-modules/tatsu { }; + samsungtvws = callPackage ../development/python-modules/samsungtvws { }; - tbm-utils = callPackage ../development/python-modules/tbm-utils { }; + sandboxlib = callPackage ../development/python-modules/sandboxlib { }; - tempita = callPackage ../development/python-modules/tempita { }; + sanic-auth = callPackage ../development/python-modules/sanic-auth { }; - terminado = callPackage ../development/python-modules/terminado { }; + sanic = callPackage ../development/python-modules/sanic { }; - tess = callPackage ../development/python-modules/tess { }; + sapi-python-client = callPackage ../development/python-modules/sapi-python-client { }; - testresources = callPackage ../development/python-modules/testresources { }; + sarge = callPackage ../development/python-modules/sarge { }; - testtools = callPackage ../development/python-modules/testtools { }; + sasmodels = callPackage ../development/python-modules/sasmodels { }; - traitlets = callPackage ../development/python-modules/traitlets { }; + scales = callPackage ../development/python-modules/scales { }; - traittypes = callPackage ../development/python-modules/traittypes { }; + scandir = callPackage ../development/python-modules/scandir { }; - transitions = callPackage ../development/python-modules/transitions { }; + scapy = callPackage ../development/python-modules/scapy { }; - extras = callPackage ../development/python-modules/extras { }; + schedule = callPackage ../development/python-modules/schedule { }; - extension-helpers = callPackage ../development/python-modules/extension-helpers { }; + schema = callPackage ../development/python-modules/schema { }; - texttable = callPackage ../development/python-modules/texttable { }; + scikit-bio = callPackage ../development/python-modules/scikit-bio { }; - textwrap3 = callPackage ../development/python-modules/textwrap3 { }; + scikit-build = callPackage ../development/python-modules/scikit-build { }; - tiledb = callPackage ../development/python-modules/tiledb { - inherit (pkgs) tiledb; - }; + scikit-fmm = callPackage ../development/python-modules/scikit-fmm { }; - timezonefinder = callPackage ../development/python-modules/timezonefinder { }; + scikitimage = callPackage ../development/python-modules/scikit-image { }; - tiros = callPackage ../development/python-modules/tiros { }; + scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; }; + in if isPy3k then + callPackage ../development/python-modules/scikitlearn args + else + callPackage ../development/python-modules/scikitlearn/0.20.nix args; - tinydb = callPackage ../development/python-modules/tinydb { }; + scikit-optimize = callPackage ../development/python-modules/scikit-optimize { }; - tifffile = callPackage ../development/python-modules/tifffile { }; + scikits-odes = callPackage ../development/python-modules/scikits-odes { }; - tmdb3 = callPackage ../development/python-modules/tmdb3 { }; + scikit-tda = callPackage ../development/python-modules/scikit-tda { }; - toolz = callPackage ../development/python-modules/toolz { }; + scipy_1_3 = self.scipy.overridePythonAttrs (oldAttrs: rec { + version = "1.3.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "02iqb7ws7fw5fd1a83hx705pzrw1imj7z0bphjsl4bfvw254xgv4"; + }; + doCheck = false; + disabled = !isPy3k; + }); - tox = callPackage ../development/python-modules/tox { }; + scipy = let + scipy_ = callPackage ../development/python-modules/scipy { }; + scipy_1_2 = scipy_.overridePythonAttrs (oldAttrs: rec { + version = "1.2.2"; + src = oldAttrs.src.override { + inherit version; + sha256 = "a4331e0b8dab1ff75d2c67b5158a8bb9a83c799d7140094dda936d876c7cfbb1"; + }; + }); + in if pythonOlder "3.5" then scipy_1_2 else scipy_; - tqdm = callPackage ../development/python-modules/tqdm { }; + scour = callPackage ../development/python-modules/scour { }; - trytond = callPackage ../development/python-modules/trytond { }; + scp = callPackage ../development/python-modules/scp { }; - smmap = callPackage ../development/python-modules/smmap { }; + scrapy = callPackage ../development/python-modules/scrapy { }; - smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 + scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; - transaction = callPackage ../development/python-modules/transaction { }; + scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; - TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; + scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; - tweepy = callPackage ../development/python-modules/tweepy { }; + screeninfo = callPackage ../development/python-modules/screeninfo { }; - twill = callPackage ../development/python-modules/twill { }; + scripttest = callPackage ../development/python-modules/scripttest { }; - twine = callPackage ../development/python-modules/twine { }; + scs = callPackage ../development/python-modules/scs { scs = pkgs.scs; }; - twisted = callPackage ../development/python-modules/twisted { }; + sdnotify = callPackage ../development/python-modules/sdnotify { }; - txtorcon = callPackage ../development/python-modules/txtorcon { }; + seaborn = if isPy3k then + callPackage ../development/python-modules/seaborn { } + else + callPackage ../development/python-modules/seaborn/0.9.1.nix { }; - txdbus = callPackage ../development/python-modules/txdbus { }; + seabreeze = callPackage ../development/python-modules/seabreeze { }; - tzlocal = callPackage ../development/python-modules/tzlocal { }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1 pkgconfig; }; - u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; + secretstorage = if isPy3k then + callPackage ../development/python-modules/secretstorage { } + else + callPackage ../development/python-modules/secretstorage/2.nix { }; - ua-parser = callPackage ../development/python-modules/ua-parser { }; + secure = callPackage ../development/python-modules/secure { }; - uarray = callPackage ../development/python-modules/uarray { }; + seekpath = callPackage ../development/python-modules/seekpath { }; - ueberzug = callPackage ../development/python-modules/ueberzug { - inherit (pkgs.xorg) libX11 libXext; - }; + selectors2 = callPackage ../development/python-modules/selectors2 { }; - ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; + selectors34 = callPackage ../development/python-modules/selectors34 { }; - umap-learn = callPackage ../development/python-modules/umap-learn { }; + selenium = callPackage ../development/python-modules/selenium { }; - umemcache = callPackage ../development/python-modules/umemcache {}; + semantic = callPackage ../development/python-modules/semantic { }; - uritools = callPackage ../development/python-modules/uritools { }; + semantic-version = callPackage ../development/python-modules/semantic-version { }; - update_checker = callPackage ../development/python-modules/update_checker {}; + semver = callPackage ../development/python-modules/semver { }; - update-copyright = callPackage ../development/python-modules/update-copyright {}; + send2trash = callPackage ../development/python-modules/send2trash { }; - update-dotdee = callPackage ../development/python-modules/update-dotdee { }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece pkgconfig; }; - uritemplate = callPackage ../development/python-modules/uritemplate { }; + sentinel = callPackage ../development/python-modules/sentinel { }; - uproot = callPackage ../development/python-modules/uproot {}; + sentry-sdk = callPackage ../development/python-modules/sentry-sdk { }; - uproot-methods = callPackage ../development/python-modules/uproot-methods { }; + sepaxml = callPackage ../development/python-modules/sepaxml { }; - urlgrabber = callPackage ../development/python-modules/urlgrabber {}; + seqdiag = callPackage ../development/python-modules/seqdiag { }; - urwid = callPackage ../development/python-modules/urwid {}; + sequoia = disabledIf (isPyPy || !isPy3k) (toPythonModule (pkgs.sequoia.override { + pythonPackages = self; + pythonSupport = true; + })); - user-agents = callPackage ../development/python-modules/user-agents { }; + serpent = callPackage ../development/python-modules/serpent { }; - variants = callPackage ../development/python-modules/variants { }; + serpy = callPackage ../development/python-modules/serpy { }; - verboselogs = callPackage ../development/python-modules/verboselogs { }; + serverlessrepo = callPackage ../development/python-modules/serverlessrepo { }; - vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + serversyncstorage = callPackage ../development/python-modules/serversyncstorage { }; - vertica-python = callPackage ../development/python-modules/vertica-python { }; + service-identity = callPackage ../development/python-modules/service_identity { }; - virtkey = callPackage ../development/python-modules/virtkey { - inherit (pkgs) pkgconfig; - }; + setproctitle = callPackage ../development/python-modules/setproctitle { }; - virtual-display = callPackage ../development/python-modules/virtual-display { }; + setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; - virtualenv = callPackage ../development/python-modules/virtualenv { }; + setuptools-git = callPackage ../development/python-modules/setuptools-git { }; - vispy = callPackage ../development/python-modules/vispy { }; + setuptools-lint = callPackage ../development/python-modules/setuptools-lint { }; - vsts = callPackage ../development/python-modules/vsts { }; + setuptools_scm = callPackage ../development/python-modules/setuptools_scm { }; - vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; + setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { }; - python-vlc = callPackage ../development/python-modules/python-vlc { }; + setuptoolsTrial = callPackage ../development/python-modules/setuptoolstrial { }; - weasyprint = callPackage ../development/python-modules/weasyprint { }; + sexpdata = callPackage ../development/python-modules/sexpdata { }; - webassets = callPackage ../development/python-modules/webassets { }; + sfepy = callPackage ../development/python-modules/sfepy { }; - webcolors = callPackage ../development/python-modules/webcolors { }; + shamir-mnemonic = callPackage ../development/python-modules/shamir-mnemonic { }; - webencodings = callPackage ../development/python-modules/webencodings { }; + shapely = callPackage ../development/python-modules/shapely { }; - websockets = callPackage ../development/python-modules/websockets { }; + sharedmem = callPackage ../development/python-modules/sharedmem { }; - Wand = callPackage ../development/python-modules/Wand { }; + sh = callPackage ../development/python-modules/sh { }; - wcwidth = callPackage ../development/python-modules/wcwidth { }; + shellingham = callPackage ../development/python-modules/shellingham { }; - werkzeug = callPackage ../development/python-modules/werkzeug { }; + shiboken2 = + toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake qt5 llvmPackages; }); - wheel = callPackage ../development/python-modules/wheel { }; + shippai = callPackage ../development/python-modules/shippai { }; - widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; + shodan = callPackage ../development/python-modules/shodan { }; - wordfreq = callPackage ../development/python-modules/wordfreq { }; + shortuuid = callPackage ../development/python-modules/shortuuid { }; - magic-wormhole = callPackage ../development/python-modules/magic-wormhole { }; + shouldbe = callPackage ../development/python-modules/shouldbe { }; - magic-wormhole-mailbox-server = callPackage ../development/python-modules/magic-wormhole-mailbox-server { }; + should-dsl = callPackage ../development/python-modules/should-dsl { }; - magic-wormhole-transit-relay = callPackage ../development/python-modules/magic-wormhole-transit-relay { }; + showit = callPackage ../development/python-modules/showit { }; - wxPython = self.wxPython30; + shutilwhich = callPackage ../development/python-modules/shutilwhich { }; - wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { - wxGTK = pkgs.wxGTK30; - inherit (pkgs) pkgconfig; - }; + sievelib = callPackage ../development/python-modules/sievelib { }; - wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { - inherit (pkgs) pkgconfig; - wxGTK = pkgs.wxGTK30.override { withGtk2 = false; withWebKit = true; }; - }; + signedjson = callPackage ../development/python-modules/signedjson { }; - xml2rfc = callPackage ../development/python-modules/xml2rfc { }; + sigtools = callPackage ../development/python-modules/sigtools { }; - xmlschema = callPackage ../development/python-modules/xmlschema { }; + simanneal = callPackage ../development/python-modules/simanneal { }; - xmltodict = callPackage ../development/python-modules/xmltodict { }; + simpleai = callPackage ../development/python-modules/simpleai { }; - xarray = callPackage ../development/python-modules/xarray { }; + simpleaudio = callPackage ../development/python-modules/simpleaudio { }; - xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; + simplebayes = callPackage ../development/python-modules/simplebayes { }; - xapp = callPackage ../development/python-modules/xapp { - inherit (pkgs) gtk3 gobject-introspection polkit; - inherit (pkgs.cinnamon) xapps; - }; + simpleeval = callPackage ../development/python-modules/simpleeval { }; - xlwt = callPackage ../development/python-modules/xlwt { }; + simplefix = callPackage ../development/python-modules/simplefix { }; - xxhash = callPackage ../development/python-modules/xxhash { }; + simplegeneric = callPackage ../development/python-modules/simplegeneric { }; - ydiff = callPackage ../development/python-modules/ydiff { }; + simplejson = callPackage ../development/python-modules/simplejson { }; - yoda = toPythonModule (pkgs.yoda.override { - inherit python; - }); + simplekml = callPackage ../development/python-modules/simplekml { }; - youtube-dl = callPackage ../tools/misc/youtube-dl {}; + simpleparse = callPackage ../development/python-modules/simpleparse { }; - youtube-dl-light = callPackage ../tools/misc/youtube-dl { - ffmpegSupport = false; - phantomjsSupport = false; - }; + simple-salesforce = callPackage ../development/python-modules/simple-salesforce { }; - zconfig = callPackage ../development/python-modules/zconfig { }; + simple-websocket-server = callPackage ../development/python-modules/simple-websocket-server { }; - zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; + simpy = callPackage ../development/python-modules/simpy { }; - zerorpc = callPackage ../development/python-modules/zerorpc { }; + singledispatch = callPackage ../development/python-modules/singledispatch { }; - zimports = callPackage ../development/python-modules/zimports { }; + sip = callPackage ../development/python-modules/sip { }; - zipstream = callPackage ../development/python-modules/zipstream { }; + sipsimple = callPackage ../development/python-modules/sipsimple { }; - zodb = callPackage ../development/python-modules/zodb {}; + six = callPackage ../development/python-modules/six { }; - zodbpickle = callPackage ../development/python-modules/zodbpickle {}; + skein = callPackage ../development/python-modules/skein { }; - BTrees = callPackage ../development/python-modules/btrees {}; + sklearn-deap = callPackage ../development/python-modules/sklearn-deap { }; - persistent = callPackage ../development/python-modules/persistent {}; + skorch = callPackage ../development/python-modules/skorch { }; - persim = callPackage ../development/python-modules/persim { }; + slackclient = callPackage ../development/python-modules/slackclient { }; - xdot = callPackage ../development/python-modules/xdot { }; + sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; - zetup = callPackage ../development/python-modules/zetup { }; + slicedimage = callPackage ../development/python-modules/slicedimage { }; - routes = callPackage ../development/python-modules/routes { }; + slicerator = callPackage ../development/python-modules/slicerator { }; - rpyc = callPackage ../development/python-modules/rpyc { }; + slimit = callPackage ../development/python-modules/slimit { }; - rsa = if isPy3k then - callPackage ../development/python-modules/rsa { } - else - callPackage ../development/python-modules/rsa/4_0.nix { }; + slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; - squaremap = callPackage ../development/python-modules/squaremap { }; + slixmpp = callPackage ../development/python-modules/slixmpp { inherit (pkgs) gnupg; }; - ruamel_base = callPackage ../development/python-modules/ruamel_base { }; + slob = callPackage ../development/python-modules/slob { }; - ruamel_ordereddict = callPackage ../development/python-modules/ruamel_ordereddict { }; + slowaes = callPackage ../development/python-modules/slowaes { }; - ruamel_yaml = callPackage ../development/python-modules/ruamel_yaml { }; + sly = callPackage ../development/python-modules/sly { }; - ruamel_yaml_clib = callPackage ../development/python-modules/ruamel_yaml_clib { }; + smartdc = callPackage ../development/python-modules/smartdc { }; - ruffus = callPackage ../development/python-modules/ruffus { }; + smart_open = callPackage ../development/python-modules/smart_open { }; - runsnakerun = callPackage ../development/python-modules/runsnakerun { }; + smartypants = callPackage ../development/python-modules/smartypants { }; - pysendfile = callPackage ../development/python-modules/pysendfile { }; + smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14 - pyxl3 = callPackage ../development/python-modules/pyxl3 { }; + smmap = callPackage ../development/python-modules/smmap { }; - qpid-python = callPackage ../development/python-modules/qpid-python { }; + smpplib = callPackage ../development/python-modules/smpplib { }; - xattr = callPackage ../development/python-modules/xattr { }; + smugline = callPackage ../development/python-modules/smugline { }; - scripttest = callPackage ../development/python-modules/scripttest { }; + smugpy = callPackage ../development/python-modules/smugpy { }; - setuptoolsDarcs = callPackage ../development/python-modules/setuptoolsdarcs { }; + snakebite = callPackage ../development/python-modules/snakebite { }; - setuptoolsTrial = callPackage ../development/python-modules/setuptoolstrial { }; + snakeviz = callPackage ../development/python-modules/snakeviz { }; - simplebayes = callPackage ../development/python-modules/simplebayes { }; + snapcast = callPackage ../development/python-modules/snapcast { }; - shortuuid = callPackage ../development/python-modules/shortuuid { }; + snapperGUI = callPackage ../development/python-modules/snappergui { }; - shouldbe = callPackage ../development/python-modules/shouldbe { }; + sniffio = callPackage ../development/python-modules/sniffio { }; - simpleparse = callPackage ../development/python-modules/simpleparse { }; + snitun = callPackage ../development/python-modules/snitun { }; - slob = callPackage ../development/python-modules/slob { }; + snowballstemmer = callPackage ../development/python-modules/snowballstemmer { }; - slowaes = callPackage ../development/python-modules/slowaes { }; + snowflake-connector-python = callPackage ../development/python-modules/snowflake-connector-python { }; - sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; + snowflake-sqlalchemy = callPackage ../development/python-modules/snowflake-sqlalchemy { }; - sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + snscrape = callPackage ../development/python-modules/snscrape { }; - sqlobject = callPackage ../development/python-modules/sqlobject { }; + snug = callPackage ../development/python-modules/snug { }; - sqlmap = callPackage ../development/python-modules/sqlmap { }; + snuggs = callPackage ../development/python-modules/snuggs { }; - pgpdump = callPackage ../development/python-modules/pgpdump { }; + soapysdr = toPythonModule (pkgs.soapysdr.override { + python = self.python; + usePython = true; + }); - spambayes = callPackage ../development/python-modules/spambayes { }; + soapysdr-with-plugins = toPythonModule (pkgs.soapysdr-with-plugins.override { + python = self.python; + usePython = true; + }); - shapely = callPackage ../development/python-modules/shapely { }; + sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; - sharedmem = callPackage ../development/python-modules/sharedmem { }; + socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; soco = callPackage ../development/python-modules/soco { }; - sopel = callPackage ../development/python-modules/sopel { }; - - sounddevice = callPackage ../development/python-modules/sounddevice { }; - - stevedore = callPackage ../development/python-modules/stevedore {}; - - svglib = callPackage ../development/python-modules/svglib { }; - - text-unidecode = callPackage ../development/python-modules/text-unidecode { }; - - Theano = callPackage ../development/python-modules/Theano rec { - cudaSupport = pkgs.config.cudaSupport or false; - cudnnSupport = cudaSupport; - inherit (pkgs.linuxPackages) nvidia_x11; - }; - - TheanoWithoutCuda = self.Theano.override { - cudaSupport = false; - cudnnSupport = false; - }; - - TheanoWithCuda = self.Theano.override { - cudaSupport = true; - cudnnSupport = true; - }; - - thespian = callPackage ../development/python-modules/thespian { }; - - tidylib = callPackage ../development/python-modules/pytidylib { }; - - tilestache = callPackage ../development/python-modules/tilestache { }; - - timelib = callPackage ../development/python-modules/timelib { }; + softlayer = callPackage ../development/python-modules/softlayer { }; - timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; + solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); - pid = callPackage ../development/python-modules/pid { }; - - pip2nix = callPackage ../development/python-modules/pip2nix { }; + somajo = callPackage ../development/python-modules/somajo { }; - pychef = callPackage ../development/python-modules/pychef { }; + sopel = callPackage ../development/python-modules/sopel { }; - pydns = - let - py3 = callPackage ../development/python-modules/py3dns { }; + sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; - py2 = callPackage ../development/python-modules/pydns { }; - in if isPy3k then py3 else py2; + sortedcollections = callPackage ../development/python-modules/sortedcollections { }; - python-daemon = callPackage ../development/python-modules/python-daemon { }; + sortedcontainers = callPackage ../development/python-modules/sortedcontainers { }; - python-vagrant = callPackage ../development/python-modules/python-vagrant { }; + sounddevice = callPackage ../development/python-modules/sounddevice { }; - symengine = callPackage ../development/python-modules/symengine { - symengine = pkgs.symengine; - }; + soundfile = callPackage ../development/python-modules/soundfile { }; - sympy = if isPy3k then - callPackage ../development/python-modules/sympy { } + soupsieve = if isPy3k then + callPackage ../development/python-modules/soupsieve { } else - callPackage ../development/python-modules/sympy/1_5.nix { }; - - pilkit = callPackage ../development/python-modules/pilkit { }; - - clint = callPackage ../development/python-modules/clint { }; - - argh = callPackage ../development/python-modules/argh { }; + callPackage ../development/python-modules/soupsieve/1.nix { }; - nose_progressive = callPackage ../development/python-modules/nose_progressive { }; + spacy = callPackage ../development/python-modules/spacy { }; - blessings = callPackage ../development/python-modules/blessings { }; + spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; - secretstorage = if isPy3k - then callPackage ../development/python-modules/secretstorage { } - else callPackage ../development/python-modules/secretstorage/2.nix { }; + spake2 = callPackage ../development/python-modules/spake2 { }; - secure = callPackage ../development/python-modules/secure { }; + spambayes = callPackage ../development/python-modules/spambayes { }; - semantic = callPackage ../development/python-modules/semantic { }; + spark_parser = callPackage ../development/python-modules/spark_parser { }; - sandboxlib = callPackage ../development/python-modules/sandboxlib { }; + SPARQLWrapper = callPackage ../development/python-modules/sparqlwrapper { }; - sanic = callPackage ../development/python-modules/sanic { }; + sparse = callPackage ../development/python-modules/sparse { }; - scales = callPackage ../development/python-modules/scales { }; + speaklater = callPackage ../development/python-modules/speaklater { }; - secp256k1 = callPackage ../development/python-modules/secp256k1 { - inherit (pkgs) secp256k1 pkgconfig; - }; + spectral-cube = callPackage ../development/python-modules/spectral-cube { }; - semantic-version = callPackage ../development/python-modules/semantic-version { }; + speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; - sexpdata = callPackage ../development/python-modules/sexpdata { }; + spglib = callPackage ../development/python-modules/spglib { }; - sh = callPackage ../development/python-modules/sh { }; + sphfile = callPackage ../development/python-modules/sphfile { }; - sipsimple = callPackage ../development/python-modules/sipsimple { }; + sphinxcontrib-applehelp = callPackage ../development/python-modules/sphinxcontrib-applehelp { }; - six = callPackage ../development/python-modules/six { }; + sphinxcontrib-bibtex = callPackage ../development/python-modules/sphinxcontrib-bibtex { }; - smartdc = callPackage ../development/python-modules/smartdc { }; + sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; - smpplib = callPackage ../development/python-modules/smpplib { }; + sphinxcontrib-devhelp = callPackage ../development/python-modules/sphinxcontrib-devhelp { }; - socksipy-branch = callPackage ../development/python-modules/socksipy-branch { }; + sphinxcontrib-fulltoc = callPackage ../development/python-modules/sphinxcontrib-fulltoc { }; - sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { }; + sphinxcontrib-htmlhelp = callPackage ../development/python-modules/sphinxcontrib-htmlhelp { }; - sorl_thumbnail = callPackage ../development/python-modules/sorl_thumbnail { }; + sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; - soupsieve = if isPy3k then - callPackage ../development/python-modules/soupsieve { } - else - callPackage ../development/python-modules/soupsieve/1.nix { }; + sphinxcontrib-jsmath = callPackage ../development/python-modules/sphinxcontrib-jsmath { }; - sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; + sphinxcontrib-katex = callPackage ../development/python-modules/sphinxcontrib-katex { }; - sphinxcontrib-blockdiag = callPackage ../development/python-modules/sphinxcontrib-blockdiag { }; + sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; - sphinxcontrib_httpdomain = callPackage ../development/python-modules/sphinxcontrib_httpdomain { }; + sphinxcontrib_plantuml = + callPackage ../development/python-modules/sphinxcontrib_plantuml { inherit (pkgs) plantuml; }; - sphinxcontrib_newsfeed = callPackage ../development/python-modules/sphinxcontrib_newsfeed { }; + sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; - sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { - inherit (pkgs) plantuml; - }; + sphinxcontrib-serializinghtml = callPackage ../development/python-modules/sphinxcontrib-serializinghtml { }; sphinxcontrib-spelling = callPackage ../development/python-modules/sphinxcontrib-spelling { }; @@ -6697,1130 +6573,1105 @@ in { texLive = pkgs.texlive.combine { inherit (pkgs.texlive) scheme-small standalone pgfplots; }; }; - sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; - - Pweave = callPackage ../development/python-modules/pweave { }; - - SQLAlchemy-ImageAttach = callPackage ../development/python-modules/sqlalchemy-imageattach { }; - - sqlparse = callPackage ../development/python-modules/sqlparse { }; + sphinxcontrib-websupport = if isPy3k then + callPackage ../development/python-modules/sphinxcontrib-websupport { } + else + callPackage ../development/python-modules/sphinxcontrib-websupport/1_1.nix { }; - python_statsd = callPackage ../development/python-modules/python_statsd { }; + sphinx = if isPy3k then + callPackage ../development/python-modules/sphinx { } + else + callPackage ../development/python-modules/sphinx/2.nix { }; - skein = callPackage ../development/python-modules/skein { }; + sphinx-jinja = callPackage ../development/python-modules/sphinx-jinja { }; - stompclient = callPackage ../development/python-modules/stompclient { }; + sphinx-navtree = callPackage ../development/python-modules/sphinx-navtree { }; - subdownloader = callPackage ../development/python-modules/subdownloader { }; + sphinx_pypi_upload = callPackage ../development/python-modules/sphinx_pypi_upload { }; - subunit = callPackage ../development/python-modules/subunit { - inherit (pkgs) subunit pkg-config cppunit check; - }; + sphinx_rtd_theme = callPackage ../development/python-modules/sphinx_rtd_theme { }; - sure = callPackage ../development/python-modules/sure { }; + sphinx-testing = callPackage ../development/python-modules/sphinx-testing { }; - svgwrite = callPackage ../development/python-modules/svgwrite { }; + spidev = callPackage ../development/python-modules/spidev { }; - swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; + splinter = callPackage ../development/python-modules/splinter { }; - openapi-spec-validator = callPackage ../development/python-modules/openapi-spec-validator { }; + spotipy = callPackage ../development/python-modules/spotipy { }; - freezegun = callPackage ../development/python-modules/freezegun { }; + spyder = callPackage ../development/python-modules/spyder { }; + spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; - taskw = callPackage ../development/python-modules/taskw { }; + spyder-kernels = callPackage ../development/python-modules/spyder-kernels { }; + spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix { }; - telethon = callPackage ../development/python-modules/telethon { }; + sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; - telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; + sqlalchemy-citext = callPackage ../development/python-modules/sqlalchemy-citext { }; - terminaltables = callPackage ../development/python-modules/terminaltables { }; + sqlalchemy-continuum = callPackage ../development/python-modules/sqlalchemy-continuum { }; - testpath = callPackage ../development/python-modules/testpath { }; + sqlalchemy-i18n = callPackage ../development/python-modules/sqlalchemy-i18n { }; - testrepository = callPackage ../development/python-modules/testrepository { }; + SQLAlchemy-ImageAttach = callPackage ../development/python-modules/sqlalchemy-imageattach { }; - testscenarios = callPackage ../development/python-modules/testscenarios { }; + sqlalchemy_migrate = callPackage ../development/python-modules/sqlalchemy-migrate { }; - python_mimeparse = callPackage ../development/python-modules/python_mimeparse { }; + sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { }; - # Tkinter/tkinter is part of the Python standard library. - # The Python interpreters in Nixpkgs come without tkinter by default. - # To make the module available, we make it available as any other - # Python package. - tkinter = let - py = python.override{x11Support=true;}; - in callPackage ../development/python-modules/tkinter { py = py; }; + sqlite3dbm = callPackage ../development/python-modules/sqlite3dbm { }; - tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; + sqlitedict = callPackage ../development/python-modules/sqlitedict { }; - qrcode = callPackage ../development/python-modules/qrcode { }; + sqlmap = callPackage ../development/python-modules/sqlmap { }; - traits = callPackage ../development/python-modules/traits { }; + sqlobject = callPackage ../development/python-modules/sqlobject { }; - transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; + sqlparse = callPackage ../development/python-modules/sqlparse { }; - eggdeps = callPackage ../development/python-modules/eggdeps { }; + sqlsoup = callPackage ../development/python-modules/sqlsoup { }; - twiggy = callPackage ../development/python-modules/twiggy { }; + squaremap = callPackage ../development/python-modules/squaremap { }; - twitter = callPackage ../development/python-modules/twitter { }; + srp = callPackage ../development/python-modules/srp { }; - twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; + srptools = callPackage ../development/python-modules/srptools { }; - twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; + srsly = callPackage ../development/python-modules/srsly { }; - twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; + srvlookup = callPackage ../development/python-modules/srvlookup { }; - twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; + ssdeep = callPackage ../development/python-modules/ssdeep { }; - twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; + ssdp = callPackage ../development/python-modules/ssdp { }; - twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; + sseclient = callPackage ../development/python-modules/sseclient { }; - python-twitter = callPackage ../development/python-modules/python-twitter { }; + sshpubkeys = callPackage ../development/python-modules/sshpubkeys { }; - umalqurra = callPackage ../development/python-modules/umalqurra { }; + sshtunnel = callPackage ../development/python-modules/sshtunnel { }; - unicodecsv = callPackage ../development/python-modules/unicodecsv { }; + sslib = callPackage ../development/python-modules/sslib { }; - unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; + sslyze = callPackage ../development/python-modules/sslyze { }; - unidiff = callPackage ../development/python-modules/unidiff { }; + starfish = callPackage ../development/python-modules/starfish { }; - units = callPackage ../development/python-modules/units { }; + starlette = callPackage ../development/python-modules/starlette { }; - unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; + staticjinja = callPackage ../development/python-modules/staticjinja { }; - unittest2 = callPackage ../development/python-modules/unittest2 { }; + statistics = callPackage ../development/python-modules/statistics { }; - unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; + statsd = callPackage ../development/python-modules/statsd { }; - untangle = callPackage ../development/python-modules/untangle { }; + statsmodels = callPackage ../development/python-modules/statsmodels { }; - traceback2 = callPackage ../development/python-modules/traceback2 { }; + stem = callPackage ../development/python-modules/stem { }; - trackpy = callPackage ../development/python-modules/trackpy { }; + stevedore = callPackage ../development/python-modules/stevedore { }; - linecache2 = callPackage ../development/python-modules/linecache2 { }; + stm32loader = callPackage ../development/python-modules/stm32loader { }; - upass = callPackage ../development/python-modules/upass { }; + stompclient = callPackage ../development/python-modules/stompclient { }; - uptime = callPackage ../development/python-modules/uptime { }; + strategies = callPackage ../development/python-modules/strategies { }; - urwidtrees = callPackage ../development/python-modules/urwidtrees { }; + stravalib = callPackage ../development/python-modules/stravalib { }; - pyuv = callPackage ../development/python-modules/pyuv { }; + streamz = callPackage ../development/python-modules/streamz { }; - virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; + strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; - virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; + strictyaml = callPackage ../development/python-modules/strictyaml { }; - vmprof = callPackage ../development/python-modules/vmprof { }; + stringcase = callPackage ../development/python-modules/stringcase { }; - vultr = callPackage ../development/python-modules/vultr { }; + stripe = callPackage ../development/python-modules/stripe { }; - vulture = callPackage ../development/python-modules/vulture { }; + structlog = callPackage ../development/python-modules/structlog { }; - wadllib = callPackage ../development/python-modules/wadllib { }; + stumpy = callPackage ../development/python-modules/stumpy { }; - waitress = callPackage ../development/python-modules/waitress { }; + stups-cli-support = callPackage ../development/python-modules/stups-cli-support { }; - waitress-django = callPackage ../development/python-modules/waitress-django { }; + stups-fullstop = callPackage ../development/python-modules/stups-fullstop { }; - web = callPackage ../development/python-modules/web { }; + stups-pierone = callPackage ../development/python-modules/stups-pierone { }; - webob = callPackage ../development/python-modules/webob { }; + stups-tokens = callPackage ../development/python-modules/stups-tokens { }; - websockify = callPackage ../development/python-modules/websockify { }; + stups-zign = callPackage ../development/python-modules/stups-zign { }; - webtest = callPackage ../development/python-modules/webtest { }; + stytra = callPackage ../development/python-modules/stytra { }; - wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; + subdownloader = callPackage ../development/python-modules/subdownloader { }; - wsgitools = callPackage ../development/python-modules/wsgitools { }; + subliminal = callPackage ../development/python-modules/subliminal { }; - wurlitzer = callPackage ../development/python-modules/wurlitzer { }; + subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - xcaplib = callPackage ../development/python-modules/xcaplib { }; + subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit pkg-config cppunit check; }; - xlib = callPackage ../development/python-modules/xlib { }; + suds = callPackage ../development/python-modules/suds { }; - yappi = callPackage ../development/python-modules/yappi { }; + suds-jurko = callPackage ../development/python-modules/suds-jurko { }; - zbase32 = callPackage ../development/python-modules/zbase32 { }; + sumo = callPackage ../development/python-modules/sumo { }; - zdaemon = callPackage ../development/python-modules/zdaemon { }; + sunpy = callPackage ../development/python-modules/sunpy { }; - zfec = callPackage ../development/python-modules/zfec { }; + supervise_api = callPackage ../development/python-modules/supervise_api { }; - zha-quirks = callPackage ../development/python-modules/zha-quirks { }; + supervisor = callPackage ../development/python-modules/supervisor { }; - zipp = if pythonOlder "3.6" then - callPackage ../development/python-modules/zipp/1.nix { } - else - callPackage ../development/python-modules/zipp { }; + sure = callPackage ../development/python-modules/sure { }; - zope_broken = callPackage ../development/python-modules/zope_broken { }; + suseapi = callPackage ../development/python-modules/suseapi { }; - zope_component = callPackage ../development/python-modules/zope_component { }; + svg2tikz = callPackage ../development/python-modules/svg2tikz { }; - zope_configuration = callPackage ../development/python-modules/zope_configuration { }; + svglib = callPackage ../development/python-modules/svglib { }; - zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; + svg-path = callPackage ../development/python-modules/svg-path { }; - zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { }; + svgwrite = callPackage ../development/python-modules/svgwrite { }; - zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; + swagger-spec-validator = callPackage ../development/python-modules/swagger-spec-validator { }; - zope_event = callPackage ../development/python-modules/zope_event { }; + swagger-ui-bundle = callPackage ../development/python-modules/swagger-ui-bundle { }; - zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; + sybil = callPackage ../development/python-modules/sybil { }; - zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; + symengine = callPackage ../development/python-modules/symengine { symengine = pkgs.symengine; }; - zope-hookable = callPackage ../development/python-modules/zope-hookable { }; + sympy = if isPy3k then + callPackage ../development/python-modules/sympy { } + else + callPackage ../development/python-modules/sympy/1_5.nix { }; - zope_i18n = callPackage ../development/python-modules/zope_i18n { }; + systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) pkgconfig systemd; }; - zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; + sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; - zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; + tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; - zope_location = callPackage ../development/python-modules/zope_location { }; + tables = if isPy3k then + callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; } + else + callPackage ../development/python-modules/tables/3.5.nix { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; - zope_proxy = callPackage ../development/python-modules/zope_proxy { }; + tablib = callPackage ../development/python-modules/tablib { }; - zope_schema = callPackage ../development/python-modules/zope_schema { }; + tabulate = callPackage ../development/python-modules/tabulate { }; - zope_size = callPackage ../development/python-modules/zope_size { }; + tadasets = callPackage ../development/python-modules/tadasets { }; - zope_testing = callPackage ../development/python-modules/zope_testing { }; + tag-expressions = callPackage ../development/python-modules/tag-expressions { }; - zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; + tarman = callPackage ../development/python-modules/tarman { }; - zope_interface = callPackage ../development/python-modules/zope_interface { }; + tasklib = callPackage ../development/python-modules/tasklib { }; - hgsvn = callPackage ../development/python-modules/hgsvn { }; + taskw = callPackage ../development/python-modules/taskw { }; - cliapp = callPackage ../development/python-modules/cliapp { }; + tatsu = callPackage ../development/python-modules/tatsu { }; - cmdtest = callPackage ../development/python-modules/cmdtest { }; + tblib = callPackage ../development/python-modules/tblib { }; - tornado = if isPy3k then - callPackage ../development/python-modules/tornado { } - else - callPackage ../development/python-modules/tornado/5.nix { }; + tbm-utils = callPackage ../development/python-modules/tbm-utils { }; - tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; + telegram = callPackage ../development/python-modules/telegram { }; - tokenlib = callPackage ../development/python-modules/tokenlib { }; + telethon = callPackage ../development/python-modules/telethon { }; - tunigo = callPackage ../development/python-modules/tunigo { }; + telethon-session-sqlalchemy = callPackage ../development/python-modules/telethon-session-sqlalchemy { }; - tarman = callPackage ../development/python-modules/tarman { }; + tempita = callPackage ../development/python-modules/tempita { }; - libarchive = self.python-libarchive; # The latter is the name upstream uses + tempora = callPackage ../development/python-modules/tempora { }; - python-libarchive = callPackage ../development/python-modules/python-libarchive { }; + tenacity = callPackage ../development/python-modules/tenacity { }; - python-logstash = callPackage ../development/python-modules/python-logstash { }; + tensorboardx = callPackage ../development/python-modules/tensorboardx { }; - libarchive-c = callPackage ../development/python-modules/libarchive-c { - inherit (pkgs) libarchive; + tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; }; - libasyncns = callPackage ../development/python-modules/libasyncns { - inherit (pkgs) libasyncns pkgconfig; + tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/2/bin.nix { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; }; - pybrowserid = callPackage ../development/python-modules/pybrowserid { }; + tensorflow-bin = self.tensorflow-bin_1; - pyzmq = callPackage ../development/python-modules/pyzmq { }; + tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; + nccl = pkgs.nccl_cudatoolkit_10; + openssl = pkgs.openssl_1_1; + inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; + }; - testfixtures = callPackage ../development/python-modules/testfixtures {}; + tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 { + cudaSupport = pkgs.config.cudaSupport or false; + inherit (pkgs.linuxPackages) nvidia_x11; + cudatoolkit = pkgs.cudatoolkit_10; + cudnn = pkgs.cudnn_cudatoolkit_10; + nccl = pkgs.nccl_cudatoolkit_10; + openssl = pkgs.openssl_1_1; + inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; + }; - tissue = callPackage ../development/python-modules/tissue { }; + tensorflow-build = self.tensorflow-build_1; - titlecase = callPackage ../development/python-modules/titlecase { }; + tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; - tracing = callPackage ../development/python-modules/tracing { }; + tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; - traitsui = callPackage ../development/python-modules/traitsui { }; + tensorflow-estimator = self.tensorflow-estimator_1; - translationstring = callPackage ../development/python-modules/translationstring { }; + tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; - ttystatus = callPackage ../development/python-modules/ttystatus { }; + tensorflow = self.tensorflow_1; + tensorflow_1 = self.tensorflow-build_1; + tensorflow_2 = self.tensorflow-build_2; - larch = callPackage ../development/python-modules/larch { }; + tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; - websocket_client = callPackage ../development/python-modules/websocket_client { }; + tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; - webhelpers = callPackage ../development/python-modules/webhelpers { }; + tensorflow-tensorboard = self.tensorflow-tensorboard_1; - whichcraft = callPackage ../development/python-modules/whichcraft { }; + tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; - whisper = callPackage ../development/python-modules/whisper { }; + tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; }; - worldengine = callPackage ../development/python-modules/worldengine { }; + tensorly = callPackage ../development/python-modules/tensorly { }; - carbon = callPackage ../development/python-modules/carbon { }; + termcolor = callPackage ../development/python-modules/termcolor { }; - ujson = callPackage ../development/python-modules/ujson { }; + terminado = callPackage ../development/python-modules/terminado { }; - unidecode = callPackage ../development/python-modules/unidecode {}; + terminaltables = callPackage ../development/python-modules/terminaltables { }; - pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; + termstyle = callPackage ../development/python-modules/termstyle { }; - BlinkStick = callPackage ../development/python-modules/blinkstick { }; + tess = callPackage ../development/python-modules/tess { }; - usbtmc = callPackage ../development/python-modules/usbtmc {}; + tesserocr = callPackage ../development/python-modules/tesserocr { }; - txgithub = callPackage ../development/python-modules/txgithub { }; + testfixtures = callPackage ../development/python-modules/testfixtures { }; - txrequests = callPackage ../development/python-modules/txrequests { }; + testpath = callPackage ../development/python-modules/testpath { }; - txamqp = callPackage ../development/python-modules/txamqp { }; + testrepository = callPackage ../development/python-modules/testrepository { }; - versiontools = callPackage ../development/python-modules/versiontools { }; + testresources = callPackage ../development/python-modules/testresources { }; - veryprettytable = callPackage ../development/python-modules/veryprettytable { }; + testscenarios = callPackage ../development/python-modules/testscenarios { }; - graphite-web = callPackage ../development/python-modules/graphite-web { }; + testtools = callPackage ../development/python-modules/testtools { }; - graphite_api = callPackage ../development/python-modules/graphite-api { }; + test-tube = callPackage ../development/python-modules/test-tube { }; - graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; + textacy = callPackage ../development/python-modules/textacy { }; - graph_nets = callPackage ../development/python-modules/graph_nets { }; + texttable = callPackage ../development/python-modules/texttable { }; - graspy = callPackage ../development/python-modules/graspy { }; + text-unidecode = callPackage ../development/python-modules/text-unidecode { }; - influxgraph = callPackage ../development/python-modules/influxgraph { }; + textwrap3 = callPackage ../development/python-modules/textwrap3 { }; - pyspotify = callPackage ../development/python-modules/pyspotify { }; + tflearn = callPackage ../development/python-modules/tflearn { }; - pykka = callPackage ../development/python-modules/pykka { }; + Theano = callPackage ../development/python-modules/Theano rec { + cudaSupport = pkgs.config.cudaSupport or false; + cudnnSupport = cudaSupport; + inherit (pkgs.linuxPackages) nvidia_x11; + }; - ws4py = callPackage ../development/python-modules/ws4py {}; + TheanoWithCuda = self.Theano.override { + cudaSupport = true; + cudnnSupport = true; + }; - gdata = callPackage ../development/python-modules/gdata { }; + TheanoWithoutCuda = self.Theano.override { + cudaSupport = false; + cudnnSupport = false; + }; - IMAPClient = callPackage ../development/python-modules/imapclient { }; + thespian = callPackage ../development/python-modules/thespian { }; - Logbook = callPackage ../development/python-modules/Logbook { }; + thinc = callPackage ../development/python-modules/thinc { }; - libversion = callPackage ../development/python-modules/libversion { - inherit (pkgs) libversion pkgconfig; - }; + threadpool = callPackage ../development/python-modules/threadpool { }; - libvirt = if isPy3k then (callPackage ../development/python-modules/libvirt { - inherit (pkgs) libvirt pkgconfig; - }) else (callPackage ../development/python-modules/libvirt/5.9.0.nix { - inherit (pkgs) pkgconfig; - libvirt = pkgs.libvirt_5_9_0; - }); + threadpoolctl = callPackage ../development/python-modules/threadpoolctl { }; - rpdb = callPackage ../development/python-modules/rpdb { }; + thrift = callPackage ../development/python-modules/thrift { }; - grequests = callPackage ../development/python-modules/grequests { }; + thumbor = callPackage ../development/python-modules/thumbor { }; - first = callPackage ../development/python-modules/first {}; + thumborPexif = callPackage ../development/python-modules/thumborpexif { }; - flaskbabel = callPackage ../development/python-modules/flaskbabel { }; + tkinter = let + py = python.override{x11Support=true;}; + in callPackage ../development/python-modules/tkinter { py = py; }; - speaklater = callPackage ../development/python-modules/speaklater { }; + tidylib = callPackage ../development/python-modules/pytidylib { }; - speedtest-cli = callPackage ../development/python-modules/speedtest-cli { }; + tifffile = callPackage ../development/python-modules/tifffile { }; - pushbullet = callPackage ../development/python-modules/pushbullet { }; + tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; - power = callPackage ../development/python-modules/power { }; + tilestache = callPackage ../development/python-modules/tilestache { }; - pythonefl = callPackage ../development/python-modules/python-efl { - inherit (pkgs) pkgconfig; - }; + timelib = callPackage ../development/python-modules/timelib { }; - tlsh = callPackage ../development/python-modules/tlsh { }; + timeout-decorator = callPackage ../development/python-modules/timeout-decorator { }; - toposort = callPackage ../development/python-modules/toposort { }; + timezonefinder = callPackage ../development/python-modules/timezonefinder { }; - snakebite = callPackage ../development/python-modules/snakebite { }; + tinycss2 = callPackage ../development/python-modules/tinycss2 { }; - snapperGUI = callPackage ../development/python-modules/snappergui { }; + tinycss = callPackage ../development/python-modules/tinycss { }; - dm-sonnet = callPackage ../development/python-modules/dm-sonnet { }; + tinydb = callPackage ../development/python-modules/tinydb { }; - uncertainties = callPackage ../development/python-modules/uncertainties { }; + tiros = callPackage ../development/python-modules/tiros { }; - funcy = callPackage ../development/python-modules/funcy { }; + tissue = callPackage ../development/python-modules/tissue { }; - vxi11 = callPackage ../development/python-modules/vxi11 { }; + titlecase = callPackage ../development/python-modules/titlecase { }; - svg2tikz = callPackage ../development/python-modules/svg2tikz { }; + tld = callPackage ../development/python-modules/tld { }; - WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; + tldextract = callPackage ../development/python-modules/tldextract { }; - blist = callPackage ../development/python-modules/blist { }; + tlsh = callPackage ../development/python-modules/tlsh { }; - canonicaljson = callPackage ../development/python-modules/canonicaljson { }; + tlslite-ng = callPackage ../development/python-modules/tlslite-ng { }; - daemonize = callPackage ../development/python-modules/daemonize { }; + tls-parser = callPackage ../development/python-modules/tls-parser { }; - pydenticon = callPackage ../development/python-modules/pydenticon { }; + tmdb3 = callPackage ../development/python-modules/tmdb3 { }; - pynac = callPackage ../development/python-modules/pynac { }; + todoist = callPackage ../development/python-modules/todoist { }; - pybindgen = callPackage ../development/python-modules/pybindgen {}; + toggl-cli = callPackage ../development/python-modules/toggl-cli { }; - pygccxml = callPackage ../development/python-modules/pygccxml {}; + tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { })); - pymacaroons = callPackage ../development/python-modules/pymacaroons { }; + tokenlib = callPackage ../development/python-modules/tokenlib { }; - pynacl = callPackage ../development/python-modules/pynacl { }; + tokenserver = callPackage ../development/python-modules/tokenserver { }; - service-identity = callPackage ../development/python-modules/service_identity { }; + toml = callPackage ../development/python-modules/toml { }; - signedjson = callPackage ../development/python-modules/signedjson { }; + tomlkit = callPackage ../development/python-modules/tomlkit { }; - unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; + toolz = callPackage ../development/python-modules/toolz { }; - thumbor = callPackage ../development/python-modules/thumbor { }; + toposort = callPackage ../development/python-modules/toposort { }; - thumborPexif = callPackage ../development/python-modules/thumborpexif { }; + topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 - pync = callPackage ../development/python-modules/pync { }; + torchgpipe = callPackage ../development/python-modules/torchgpipe { }; - weboob = callPackage ../development/python-modules/weboob { }; + torchvision = callPackage ../development/python-modules/torchvision { }; - datadiff = callPackage ../development/python-modules/datadiff { }; + tornado = if isPy3k then + callPackage ../development/python-modules/tornado { } + else + callPackage ../development/python-modules/tornado/5.nix { }; - termcolor = callPackage ../development/python-modules/termcolor { }; + # Used by circus and grab-site, 2020-08-29 + tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - html2text = if isPy3k then callPackage ../development/python-modules/html2text { } - else callPackage ../development/python-modules/html2text/2018.nix { }; + # Used by luigi, 2020-08-29 + tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; - pychart = callPackage ../development/python-modules/pychart {}; + towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; - parsimonious = callPackage ../development/python-modules/parsimonious { }; + tox = callPackage ../development/python-modules/tox { }; - networkx = if isPy3k then callPackage ../development/python-modules/networkx { } - else - callPackage ../development/python-modules/networkx/2.2.nix { }; + tqdm = callPackage ../development/python-modules/tqdm { }; - ofxclient = callPackage ../development/python-modules/ofxclient {}; + traceback2 = callPackage ../development/python-modules/traceback2 { }; - ofxhome = callPackage ../development/python-modules/ofxhome { }; + tracing = callPackage ../development/python-modules/tracing { }; - ofxparse = callPackage ../development/python-modules/ofxparse { }; + trackpy = callPackage ../development/python-modules/trackpy { }; - ofxtools = callPackage ../development/python-modules/ofxtools { }; + traitlets = callPackage ../development/python-modules/traitlets { }; - orm = callPackage ../development/python-modules/orm { }; + traits = callPackage ../development/python-modules/traits { }; - basemap = callPackage ../development/python-modules/basemap { }; + traitsui = callPackage ../development/python-modules/traitsui { }; - dict2xml = callPackage ../development/python-modules/dict2xml { }; + traittypes = callPackage ../development/python-modules/traittypes { }; - dicttoxml = callPackage ../development/python-modules/dicttoxml { }; + transaction = callPackage ../development/python-modules/transaction { }; - markdown2 = callPackage ../development/python-modules/markdown2 { }; + transformers = callPackage ../development/python-modules/transformers { }; - evernote = callPackage ../development/python-modules/evernote { }; + transforms3d = callPackage ../development/python-modules/transforms3d { }; - setproctitle = callPackage ../development/python-modules/setproctitle { }; + transip = callPackage ../development/python-modules/transip { }; - thrift = callPackage ../development/python-modules/thrift { }; + transitions = callPackage ../development/python-modules/transitions { }; - geeknote = callPackage ../development/python-modules/geeknote { }; + translationstring = callPackage ../development/python-modules/translationstring { }; - trollius = callPackage ../development/python-modules/trollius {}; + transmissionrpc = callPackage ../development/python-modules/transmissionrpc { }; - pynvim = callPackage ../development/python-modules/pynvim {}; + treq = callPackage ../development/python-modules/treq { }; - typogrify = callPackage ../development/python-modules/typogrify { }; + trezor_agent = callPackage ../development/python-modules/trezor_agent { }; - smartypants = callPackage ../development/python-modules/smartypants { }; + trezor = callPackage ../development/python-modules/trezor { }; - pypeg2 = callPackage ../development/python-modules/pypeg2 { }; + trimesh = callPackage ../development/python-modules/trimesh { }; - torchvision = callPackage ../development/python-modules/torchvision { }; + trio = callPackage ../development/python-modules/trio { }; - torchgpipe = callPackage ../development/python-modules/torchgpipe { }; + trollius = callPackage ../development/python-modules/trollius { }; - jenkinsapi = callPackage ../development/python-modules/jenkinsapi { }; + trueskill = callPackage ../development/python-modules/trueskill { }; - jenkins-job-builder = callPackage ../development/python-modules/jenkins-job-builder { }; + trustme = callPackage ../development/python-modules/trustme { }; - dot2tex = callPackage ../development/python-modules/dot2tex { - inherit (pkgs) graphviz; - }; + trytond = callPackage ../development/python-modules/trytond { }; - poezio = callPackage ../applications/networking/instant-messengers/poezio { - inherit (pkgs) pkgconfig; - }; + ttystatus = callPackage ../development/python-modules/ttystatus { }; - potr = callPackage ../development/python-modules/potr {}; + tunigo = callPackage ../development/python-modules/tunigo { }; - pyregion = callPackage ../development/python-modules/pyregion {}; + TurboCheetah = callPackage ../development/python-modules/TurboCheetah { }; - python-nomad = callPackage ../development/python-modules/python-nomad { }; + tvdb_api = callPackage ../development/python-modules/tvdb_api { }; - python-u2flib-host = callPackage ../development/python-modules/python-u2flib-host { }; + tvnamer = callPackage ../development/python-modules/tvnamer { }; - python-xmp-toolkit = callPackage ../development/python-modules/python-xmp-toolkit { }; + tweepy = callPackage ../development/python-modules/tweepy { }; - pluggy = callPackage ../development/python-modules/pluggy {}; + twiggy = callPackage ../development/python-modules/twiggy { }; - xcffib = callPackage ../development/python-modules/xcffib {}; + twilio = callPackage ../development/python-modules/twilio { }; - xpybutil = callPackage ../development/python-modules/xpybutil {}; + twill = callPackage ../development/python-modules/twill { }; - pafy = callPackage ../development/python-modules/pafy { }; + twine = callPackage ../development/python-modules/twine { }; - suds = callPackage ../development/python-modules/suds { }; + twisted = callPackage ../development/python-modules/twisted { }; - suds-jurko = callPackage ../development/python-modules/suds-jurko { }; + twitter = callPackage ../development/python-modules/twitter { }; - mailcap-fix = callPackage ../development/python-modules/mailcap-fix { }; + twitter-common-collections = callPackage ../development/python-modules/twitter-common-collections { }; - maildir-deduplicate = callPackage ../development/python-modules/maildir-deduplicate { }; + twitter-common-confluence = callPackage ../development/python-modules/twitter-common-confluence { }; - d2to1 = callPackage ../development/python-modules/d2to1 { }; + twitter-common-dirutil = callPackage ../development/python-modules/twitter-common-dirutil { }; - ovh = callPackage ../development/python-modules/ovh { }; + twitter-common-lang = callPackage ../development/python-modules/twitter-common-lang { }; - willow = callPackage ../development/python-modules/willow { }; + twitter-common-log = callPackage ../development/python-modules/twitter-common-log { }; - importmagic = callPackage ../development/python-modules/importmagic { }; + twitter-common-options = callPackage ../development/python-modules/twitter-common-options { }; - xgboost = callPackage ../development/python-modules/xgboost { - xgboost = pkgs.xgboost; - }; + twofish = callPackage ../development/python-modules/twofish { }; - xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; + txaio = callPackage ../development/python-modules/txaio { }; - xkcdpass = callPackage ../development/python-modules/xkcdpass { }; + txamqp = callPackage ../development/python-modules/txamqp { }; - xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; + txdbus = callPackage ../development/python-modules/txdbus { }; - xmodem = callPackage ../development/python-modules/xmodem {}; + txgithub = callPackage ../development/python-modules/txgithub { }; - xmpppy = callPackage ../development/python-modules/xmpppy {}; + txrequests = callPackage ../development/python-modules/txrequests { }; - xstatic = callPackage ../development/python-modules/xstatic {}; + txtorcon = callPackage ../development/python-modules/txtorcon { }; - xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox {}; + typed-ast = callPackage ../development/python-modules/typed-ast { }; - xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap {}; + typeguard = callPackage ../development/python-modules/typeguard { }; - xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery {}; + typesentry = callPackage ../development/python-modules/typesentry { }; - xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload {}; + typesystem = callPackage ../development/python-modules/typesystem { }; - xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui {}; + typing = callPackage ../development/python-modules/typing { }; - xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments {}; + typing-extensions = callPackage ../development/python-modules/typing-extensions { }; - xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { - inherit (pkgs.xorg) xorgserver; - }; + typing-inspect = callPackage ../development/python-modules/typing-inspect { }; - hidapi = callPackage ../development/python-modules/hidapi { - inherit (pkgs) udev libusb1; - }; + typogrify = callPackage ../development/python-modules/typogrify { }; - ckcc-protocol = callPackage ../development/python-modules/ckcc-protocol { }; + tzlocal = callPackage ../development/python-modules/tzlocal { }; - mnemonic = callPackage ../development/python-modules/mnemonic { }; + uamqp = + callPackage ../development/python-modules/uamqp { inherit (pkgs.darwin.apple_sdk.frameworks) CFNetwork Security; }; - keepkey = callPackage ../development/python-modules/keepkey { }; + ua-parser = callPackage ../development/python-modules/ua-parser { }; - keepkey_agent = callPackage ../development/python-modules/keepkey_agent { }; + uarray = callPackage ../development/python-modules/uarray { }; - libagent = callPackage ../development/python-modules/libagent { }; + ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; }; - ledger_agent = callPackage ../development/python-modules/ledger_agent { }; + ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; - ledgerblue = callPackage ../development/python-modules/ledgerblue { }; + ufoprocessor = callPackage ../development/python-modules/ufoprocessor { }; - ecpy = callPackage ../development/python-modules/ecpy { }; + ujson = if isPy27 then + callPackage ../development/python-modules/ujson/2.nix { } + else + callPackage ../development/python-modules/ujson { }; - semver = callPackage ../development/python-modules/semver { }; + ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; - ed25519 = callPackage ../development/python-modules/ed25519 { }; + umalqurra = callPackage ../development/python-modules/umalqurra { }; - trezor = callPackage ../development/python-modules/trezor { }; + umap-learn = callPackage ../development/python-modules/umap-learn { }; - trezor_agent = callPackage ../development/python-modules/trezor_agent { }; + umemcache = callPackage ../development/python-modules/umemcache { }; - x11_hash = callPackage ../development/python-modules/x11_hash { }; + u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { }; - termstyle = callPackage ../development/python-modules/termstyle { }; + uncertainties = callPackage ../development/python-modules/uncertainties { }; - green = callPackage ../development/python-modules/green { }; + uncompyle6 = callPackage ../development/python-modules/uncompyle6 { }; - topydo = throw "python3Packages.topydo was moved to topydo"; # 2017-09-22 + unicodecsv = callPackage ../development/python-modules/unicodecsv { }; - w3lib = callPackage ../development/python-modules/w3lib { }; + unicodedata2 = callPackage ../development/python-modules/unicodedata2 { }; - queuelib = callPackage ../development/python-modules/queuelib { }; + unicode-slugify = callPackage ../development/python-modules/unicode-slugify { }; - scrapy = callPackage ../development/python-modules/scrapy { }; + unicorn = callPackage ../development/python-modules/unicorn { }; - scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { }; + unidecode = callPackage ../development/python-modules/unidecode { }; - scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { }; + unidiff = callPackage ../development/python-modules/unidiff { }; - scrapy-splash = callPackage ../development/python-modules/scrapy-splash { }; + unifi = callPackage ../development/python-modules/unifi { }; - pandocfilters = callPackage ../development/python-modules/pandocfilters { }; + units = callPackage ../development/python-modules/units { }; - pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; + unittest2 = callPackage ../development/python-modules/unittest2 { }; - htmltreediff = callPackage ../development/python-modules/htmltreediff { }; + unittest-data-provider = callPackage ../development/python-modules/unittest-data-provider { }; - repeated_test = callPackage ../development/python-modules/repeated_test { }; + unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { }; - Keras = callPackage ../development/python-modules/keras { }; + unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; - keras-applications = callPackage ../development/python-modules/keras-applications { }; + unrpa = callPackage ../development/python-modules/unrpa { }; - keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; + untangle = callPackage ../development/python-modules/untangle { }; - Lasagne = callPackage ../development/python-modules/lasagne { }; + upass = callPackage ../development/python-modules/upass { }; - send2trash = callPackage ../development/python-modules/send2trash { }; + update_checker = callPackage ../development/python-modules/update_checker { }; - sigtools = callPackage ../development/python-modules/sigtools { }; + update-copyright = callPackage ../development/python-modules/update-copyright { }; - annoy = callPackage ../development/python-modules/annoy { }; + update-dotdee = callPackage ../development/python-modules/update-dotdee { }; - clize = callPackage ../development/python-modules/clize { }; + uproot = callPackage ../development/python-modules/uproot { }; - rl-coach = callPackage ../development/python-modules/rl-coach { }; + uproot-methods = callPackage ../development/python-modules/uproot-methods { }; - zerobin = callPackage ../development/python-modules/zerobin { }; + uptime = callPackage ../development/python-modules/uptime { }; - tensorflow-estimator = self.tensorflow-estimator_1; + uranium = callPackage ../development/python-modules/uranium { }; - tensorflow-estimator_1 = callPackage ../development/python-modules/tensorflow-estimator/1 { }; + uritemplate = callPackage ../development/python-modules/uritemplate { }; - tensorflow-estimator_2 = callPackage ../development/python-modules/tensorflow-estimator/2 { }; + uritools = callPackage ../development/python-modules/uritools { }; - tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { }; + urlgrabber = callPackage ../development/python-modules/urlgrabber { }; - tensorflow-tensorboard = self.tensorflow-tensorboard_1; + urllib3 = callPackage ../development/python-modules/urllib3 { }; - tensorflow-tensorboard_1 = callPackage ../development/python-modules/tensorflow-tensorboard/1 { }; + urwid = callPackage ../development/python-modules/urwid { }; - tensorflow-tensorboard_2 = callPackage ../development/python-modules/tensorflow-tensorboard/2 { }; + urwidtrees = callPackage ../development/python-modules/urwidtrees { }; - tensorflow-bin = self.tensorflow-bin_1; + usbtmc = callPackage ../development/python-modules/usbtmc { }; - tensorflow-bin_1 = callPackage ../development/python-modules/tensorflow/1/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; - }; + us = callPackage ../development/python-modules/us { }; - tensorflow-bin_2 = callPackage ../development/python-modules/tensorflow/2/bin.nix { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; - }; + user-agents = callPackage ../development/python-modules/user-agents { }; - tensorflow-build = self.tensorflow-build_1; + userpath = callPackage ../development/python-modules/userpath { }; - tensorflow-build_1 = callPackage ../development/python-modules/tensorflow/1 { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; - nccl = pkgs.nccl_cudatoolkit_10; - openssl = pkgs.openssl_1_1; - inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; - }; + uuid = callPackage ../development/python-modules/uuid { }; - tensorflow-build_2 = callPackage ../development/python-modules/tensorflow/2 { - cudaSupport = pkgs.config.cudaSupport or false; - inherit (pkgs.linuxPackages) nvidia_x11; - cudatoolkit = pkgs.cudatoolkit_10; - cudnn = pkgs.cudnn_cudatoolkit_10; - nccl = pkgs.nccl_cudatoolkit_10; - openssl = pkgs.openssl_1_1; - inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security; - }; + uvcclient = callPackage ../development/python-modules/uvcclient { }; - tensorflow = self.tensorflow_1; - tensorflow_1 = self.tensorflow-build_1; - tensorflow_2 = self.tensorflow-build_2; + uvicorn = callPackage ../development/python-modules/uvicorn { }; - tensorflowWithoutCuda = self.tensorflow.override { - cudaSupport = false; + uvloop = callPackage ../development/python-modules/uvloop { + inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices CoreServices; }; - tensorflowWithCuda = self.tensorflow.override { - cudaSupport = true; - }; + validate-email = callPackage ../development/python-modules/validate-email { }; - tensorly = callPackage ../development/python-modules/tensorly { }; + validators = callPackage ../development/python-modules/validators { }; - tflearn = callPackage ../development/python-modules/tflearn { }; + validictory = callPackage ../development/python-modules/validictory { }; - simpleai = callPackage ../development/python-modules/simpleai { }; + variants = callPackage ../development/python-modules/variants { }; - word2vec = callPackage ../development/python-modules/word2vec { }; + varint = callPackage ../development/python-modules/varint { }; - tvdb_api = callPackage ../development/python-modules/tvdb_api { }; + vcrpy = callPackage ../development/python-modules/vcrpy { }; - sdnotify = callPackage ../development/python-modules/sdnotify { }; + vcver = callPackage ../development/python-modules/vcver { }; - tvnamer = callPackage ../development/python-modules/tvnamer { }; + vcversioner = callPackage ../development/python-modules/vcversioner { }; - threadpool = callPackage ../development/python-modules/threadpool { }; + vdf = callPackage ../development/python-modules/vdf { }; - threadpoolctl = callPackage ../development/python-modules/threadpoolctl { }; + vdirsyncer = callPackage ../development/python-modules/vdirsyncer { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices Security; + inherit (pkgs) pkg-config openssl rustPlatform; + }; - rocket-errbot = callPackage ../development/python-modules/rocket-errbot { }; + vdirsyncerStable = callPackage ../development/python-modules/vdirsyncer/stable.nix { }; - Yapsy = callPackage ../development/python-modules/yapsy { }; + vega = callPackage ../development/python-modules/vega { }; - ansi = callPackage ../development/python-modules/ansi { }; + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; - pygments-better-html = callPackage ../development/python-modules/pygments-better-html { }; + venusian = callPackage ../development/python-modules/venusian { }; - pygments-markdown-lexer = callPackage ../development/python-modules/pygments-markdown-lexer { }; + verboselogs = callPackage ../development/python-modules/verboselogs { }; - telegram = callPackage ../development/python-modules/telegram { }; + versioneer = callPackage ../development/python-modules/versioneer { }; - python-telegram-bot = callPackage ../development/python-modules/python-telegram-bot { }; + versiontools = callPackage ../development/python-modules/versiontools { }; - irc = callPackage ../development/python-modules/irc { }; + vertica-python = callPackage ../development/python-modules/vertica-python { }; - jaraco_logging = callPackage ../development/python-modules/jaraco_logging { }; + veryprettytable = callPackage ../development/python-modules/veryprettytable { }; - jaraco_text = callPackage ../development/python-modules/jaraco_text { }; + vidstab = callPackage ../development/python-modules/vidstab { }; - jaraco_collections = callPackage ../development/python-modules/jaraco_collections { }; + viewstate = callPackage ../development/python-modules/viewstate { }; - jaraco_itertools = callPackage ../development/python-modules/jaraco_itertools { }; + vine = callPackage ../development/python-modules/vine { }; - inflect = callPackage ../development/python-modules/inflect { }; + virtkey = callPackage ../development/python-modules/virtkey { inherit (pkgs) pkgconfig; }; - more-itertools = if isPy27 then - callPackage ../development/python-modules/more-itertools/2.7.nix { } - else callPackage ../development/python-modules/more-itertools { }; + virtual-display = callPackage ../development/python-modules/virtual-display { }; - morphys = callPackage ../development/python-modules/morphys { }; + virtualenv = callPackage ../development/python-modules/virtualenv { }; - jaraco_functools = if pythonOlder "3.6" then - callPackage ../development/python-modules/jaraco_functools/2.nix { } - else - callPackage ../development/python-modules/jaraco_functools { }; + virtualenv-clone = callPackage ../development/python-modules/virtualenv-clone { }; - jaraco_classes = callPackage ../development/python-modules/jaraco_classes { }; + virtualenvwrapper = callPackage ../development/python-modules/virtualenvwrapper { }; - jaraco_stream = if pythonOlder "3.6" - then callPackage ../development/python-modules/jaraco_stream/2.nix { } - else - callPackage ../development/python-modules/jaraco_stream { }; + visitor = callPackage ../development/python-modules/visitor { }; - javaobj-py3 = callPackage ../development/python-modules/javaobj-py3 { }; + vispy = callPackage ../development/python-modules/vispy { }; - javaproperties = callPackage ../development/python-modules/javaproperties { }; + vmprof = callPackage ../development/python-modules/vmprof { }; - tempora= callPackage ../development/python-modules/tempora { }; + vobject = callPackage ../development/python-modules/vobject { }; - hypchat = callPackage ../development/python-modules/hypchat { }; + voluptuous = callPackage ../development/python-modules/voluptuous { }; - pivy = callPackage ../development/python-modules/pivy { }; + voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; - smugpy = callPackage ../development/python-modules/smugpy { }; + vowpalwabbit = callPackage ../development/python-modules/vowpalwabbit { }; - smugline = callPackage ../development/python-modules/smugline { }; + vsts = callPackage ../development/python-modules/vsts { }; - txaio = callPackage ../development/python-modules/txaio { }; + vsts-cd-manager = callPackage ../development/python-modules/vsts-cd-manager { }; - ramlfications = callPackage ../development/python-modules/ramlfications { }; + vtk = toPythonModule (pkgs.vtk_7.override { + inherit (self) python; + enablePython = true; + }); - yapf = callPackage ../development/python-modules/yapf { }; + vultr = callPackage ../development/python-modules/vultr { }; - black = callPackage ../development/python-modules/black { }; + vulture = callPackage ../development/python-modules/vulture { }; - bjoern = callPackage ../development/python-modules/bjoern { }; + vxi11 = callPackage ../development/python-modules/vxi11 { }; - autobahn = callPackage ../development/python-modules/autobahn { }; + w3lib = callPackage ../development/python-modules/w3lib { }; - jsonref = callPackage ../development/python-modules/jsonref { }; + wadllib = callPackage ../development/python-modules/wadllib { }; - whoosh = callPackage ../development/python-modules/whoosh { }; + waitress = callPackage ../development/python-modules/waitress { }; - packet-python = callPackage ../development/python-modules/packet-python { }; + waitress-django = callPackage ../development/python-modules/waitress-django { }; - pwntools = callPackage ../development/python-modules/pwntools { }; + wakeonlan = callPackage ../development/python-modules/wakeonlan { }; - ROPGadget = callPackage ../development/python-modules/ROPGadget { }; + Wand = callPackage ../development/python-modules/Wand { }; - # We need "normal" libxml2 and not the python package by the same name. - pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + warlock = callPackage ../development/python-modules/warlock { }; - unicorn = callPackage ../development/python-modules/unicorn { }; + warrant = callPackage ../development/python-modules/warrant { }; - intervaltree = callPackage ../development/python-modules/intervaltree { }; + wasabi = callPackage ../development/python-modules/wasabi { }; - packaging = callPackage ../development/python-modules/packaging { }; + watchdog = callPackage ../development/python-modules/watchdog { }; - preggy = callPackage ../development/python-modules/preggy { }; + WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { }; - prison = callPackage ../development/python-modules/prison { }; + wcwidth = callPackage ../development/python-modules/wcwidth { }; - pytoml = callPackage ../development/python-modules/pytoml { }; + weasyprint = callPackage ../development/python-modules/weasyprint { }; - pypamtest = pkgs.libpam-wrapper.override { - enablePython = true; - inherit python; - }; + webapp2 = callPackage ../development/python-modules/webapp2 { }; - pypandoc = callPackage ../development/python-modules/pypandoc { }; + webassets = callPackage ../development/python-modules/webassets { }; - yamllint = callPackage ../development/python-modules/yamllint { }; + web = callPackage ../development/python-modules/web { }; - yanc = callPackage ../development/python-modules/yanc { }; + webcolors = callPackage ../development/python-modules/webcolors { }; - yarl = callPackage ../development/python-modules/yarl { }; + webdavclient3 = callPackage ../development/python-modules/webdavclient3 { }; - solo-python = disabledIf (! pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { }); + webencodings = callPackage ../development/python-modules/webencodings { }; - suseapi = callPackage ../development/python-modules/suseapi { }; + webhelpers = callPackage ../development/python-modules/webhelpers { }; - tensorboardx = callPackage ../development/python-modules/tensorboardx { }; + webob = callPackage ../development/python-modules/webob { }; - typed-ast = callPackage ../development/python-modules/typed-ast { }; + weboob = callPackage ../development/python-modules/weboob { }; - stripe = callPackage ../development/python-modules/stripe { }; + webrtcvad = callPackage ../development/python-modules/webrtcvad { }; - strict-rfc3339 = callPackage ../development/python-modules/strict-rfc3339 { }; + websocket_client = callPackage ../development/python-modules/websocket_client { }; - strictyaml = callPackage ../development/python-modules/strictyaml { }; + websockets = callPackage ../development/python-modules/websockets { }; - twilio = callPackage ../development/python-modules/twilio { }; + websockify = callPackage ../development/python-modules/websockify { }; - twofish = callPackage ../development/python-modules/twofish { }; + webtest = callPackage ../development/python-modules/webtest { }; - uranium = callPackage ../development/python-modules/uranium { }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; - uuid = callPackage ../development/python-modules/uuid { }; + west = callPackage ../development/python-modules/west { }; - versioneer = callPackage ../development/python-modules/versioneer { }; + wfuzz = callPackage ../development/python-modules/wfuzz { }; - viewstate = callPackage ../development/python-modules/viewstate { }; + wget = callPackage ../development/python-modules/wget { }; - vine = callPackage ../development/python-modules/vine { }; + wheel = callPackage ../development/python-modules/wheel { }; - visitor = callPackage ../development/python-modules/visitor { }; + whichcraft = callPackage ../development/python-modules/whichcraft { }; - vtk = toPythonModule (pkgs.vtk_7.override { - inherit (self) python; - enablePython = true; - }); + whisper = callPackage ../development/python-modules/whisper { }; whitenoise = callPackage ../development/python-modules/whitenoise { }; - XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; - - yowsup = callPackage ../development/python-modules/yowsup { }; - - yubico-client = callPackage ../development/python-modules/yubico-client { }; - - wptserve = callPackage ../development/python-modules/wptserve { }; + whoosh = callPackage ../development/python-modules/whoosh { }; - yenc = callPackage ../development/python-modules/yenc { }; + widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { }; - zeep = callPackage ../development/python-modules/zeep { }; + willow = callPackage ../development/python-modules/willow { }; - zeitgeist = disabledIf isPy3k - (toPythonModule (pkgs.zeitgeist.override{python2Packages=self;})).py; + word2vec = callPackage ../development/python-modules/word2vec { }; - zeroconf = callPackage ../development/python-modules/zeroconf { }; + wordcloud = callPackage ../development/python-modules/wordcloud { }; - zipfile36 = callPackage ../development/python-modules/zipfile36 { }; + wordfreq = callPackage ../development/python-modules/wordfreq { }; - todoist = callPackage ../development/python-modules/todoist { }; + worldengine = callPackage ../development/python-modules/worldengine { }; - zstd = callPackage ../development/python-modules/zstd { - inherit (pkgs) zstd pkgconfig; - }; + wptserve = callPackage ../development/python-modules/wptserve { }; - zstandard = callPackage ../development/python-modules/zstandard { }; + wrapt = callPackage ../development/python-modules/wrapt { }; - zxcvbn = callPackage ../development/python-modules/zxcvbn { }; + wrf-python = callPackage ../development/python-modules/wrf-python { }; - incremental = callPackage ../development/python-modules/incremental { }; + ws4py = callPackage ../development/python-modules/ws4py { }; - treq = callPackage ../development/python-modules/treq { }; + wsgiproxy2 = callPackage ../development/python-modules/wsgiproxy2 { }; - snakeviz = callPackage ../development/python-modules/snakeviz { }; + WSGIProxy = callPackage ../development/python-modules/wsgiproxy { }; - nitpick = callPackage ../applications/version-management/nitpick { }; + wsgitools = callPackage ../development/python-modules/wsgitools { }; - pluginbase = callPackage ../development/python-modules/pluginbase { }; + WSME = callPackage ../development/python-modules/WSME { }; - node-semver = callPackage ../development/python-modules/node-semver { }; + wsproto = if (pythonAtLeast "3.6") then + callPackage ../development/python-modules/wsproto { } + else + callPackage ../development/python-modules/wsproto/0.14.nix { }; - diskcache = callPackage ../development/python-modules/diskcache { }; + wtforms = callPackage ../development/python-modules/wtforms { }; - dissononce = callPackage ../development/python-modules/dissononce { }; + wtf-peewee = callPackage ../development/python-modules/wtf-peewee { }; - distro = callPackage ../development/python-modules/distro { }; + wurlitzer = callPackage ../development/python-modules/wurlitzer { }; - bz2file = callPackage ../development/python-modules/bz2file { }; + wxPython30 = callPackage ../development/python-modules/wxPython/3.0.nix { + wxGTK = pkgs.wxGTK30; + inherit (pkgs) pkgconfig; + }; - smart_open = callPackage ../development/python-modules/smart_open { }; + wxPython_4_0 = callPackage ../development/python-modules/wxPython/4.0.nix { + inherit (pkgs) pkgconfig; + wxGTK = pkgs.wxGTK30.override { + withGtk2 = false; + withWebKit = true; + }; + }; - gensim = callPackage ../development/python-modules/gensim { }; + wxPython = self.wxPython30; - genpy = callPackage ../development/python-modules/genpy { }; + x11_hash = callPackage ../development/python-modules/x11_hash { }; - cymem = callPackage ../development/python-modules/cymem { }; + x256 = callPackage ../development/python-modules/x256 { }; - ftfy = callPackage ../development/python-modules/ftfy { }; + xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; - murmurhash = callPackage ../development/python-modules/murmurhash { }; + xapp = callPackage ../development/python-modules/xapp { + inherit (pkgs) gtk3 gobject-introspection polkit; + inherit (pkgs.cinnamon) xapps; + }; - pkuseg = callPackage ../development/python-modules/pkuseg { }; + xarray = callPackage ../development/python-modules/xarray { }; - plac = callPackage ../development/python-modules/plac { }; + xattr = callPackage ../development/python-modules/xattr { }; - preshed = callPackage ../development/python-modules/preshed { }; + xcaplib = callPackage ../development/python-modules/xcaplib { }; - backports_weakref = callPackage ../development/python-modules/backports_weakref { }; + xcffib = callPackage ../development/python-modules/xcffib { }; - blis = callPackage ../development/python-modules/blis { }; + xdg = callPackage ../development/python-modules/xdg { }; - srsly = callPackage ../development/python-modules/srsly { }; + xdis = callPackage ../development/python-modules/xdis { }; - thinc = callPackage ../development/python-modules/thinc { }; + xdot = callPackage ../development/python-modules/xdot { }; - wasabi = callPackage ../development/python-modules/wasabi { }; + xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); - yahooweather = callPackage ../development/python-modules/yahooweather { }; + xgboost = callPackage ../development/python-modules/xgboost { xgboost = pkgs.xgboost; }; - somajo = callPackage ../development/python-modules/somajo { }; + xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; - spacy = callPackage ../development/python-modules/spacy { }; + xkcdpass = callPackage ../development/python-modules/xkcdpass { }; - spacy_models = callPackage ../development/python-modules/spacy/models.nix { }; + xlib = callPackage ../development/python-modules/xlib { }; - pyspark = callPackage ../development/python-modules/pyspark { }; + xlrd = callPackage ../development/python-modules/xlrd { }; - pysensors = callPackage ../development/python-modules/pysensors { }; + xlsx2csv = callPackage ../development/python-modules/xlsx2csv { }; - python-toolbox = callPackage ../development/python-modules/python-toolbox { }; + XlsxWriter = callPackage ../development/python-modules/XlsxWriter { }; - pysnooper = callPackage ../development/python-modules/pysnooper { }; + xlwt = callPackage ../development/python-modules/xlwt { }; - sseclient = callPackage ../development/python-modules/sseclient { }; + xml2rfc = callPackage ../development/python-modules/xml2rfc { }; - warrant = callPackage ../development/python-modules/warrant { }; + xmlschema = callPackage ../development/python-modules/xmlschema { }; - textacy = callPackage ../development/python-modules/textacy { }; + xmltodict = callPackage ../development/python-modules/xmltodict { }; - tld = callPackage ../development/python-modules/tld { }; + xmodem = callPackage ../development/python-modules/xmodem { }; - tldextract = callPackage ../development/python-modules/tldextract { }; + xmpppy = callPackage ../development/python-modules/xmpppy { }; - transip = callPackage ../development/python-modules/transip { }; + xnd = callPackage ../development/python-modules/xnd { }; - pyemd = callPackage ../development/python-modules/pyemd { }; + xpybutil = callPackage ../development/python-modules/xpybutil { }; - openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { }); + xstatic-bootbox = callPackage ../development/python-modules/xstatic-bootbox { }; - pulp = callPackage ../development/python-modules/pulp { }; + xstatic-bootstrap = callPackage ../development/python-modules/xstatic-bootstrap { }; - pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { }; + xstatic = callPackage ../development/python-modules/xstatic { }; - cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { }; + xstatic-jquery = callPackage ../development/python-modules/xstatic-jquery { }; - behave = callPackage ../development/python-modules/behave { }; + xstatic-jquery-file-upload = callPackage ../development/python-modules/xstatic-jquery-file-upload { }; - bellows = callPackage ../development/python-modules/bellows { }; + xstatic-jquery-ui = callPackage ../development/python-modules/xstatic-jquery-ui { }; - pyhamcrest = if isPy3k then - callPackage ../development/python-modules/pyhamcrest { } - else - callPackage ../development/python-modules/pyhamcrest/1.nix { }; + xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments { }; - pyhaversion = callPackage ../development/python-modules/pyhaversion { }; + xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { inherit (pkgs.xorg) xorgserver; }; - parse = callPackage ../development/python-modules/parse { }; + xxhash = callPackage ../development/python-modules/xxhash { }; - parse-type = callPackage ../development/python-modules/parse-type { }; + yahooweather = callPackage ../development/python-modules/yahooweather { }; - ephem = callPackage ../development/python-modules/ephem { }; + yamllint = callPackage ../development/python-modules/yamllint { }; - voluptuous = callPackage ../development/python-modules/voluptuous { }; + yanc = callPackage ../development/python-modules/yanc { }; - voluptuous-serialize = callPackage ../development/python-modules/voluptuous-serialize { }; + yapf = callPackage ../development/python-modules/yapf { }; - pysigset = callPackage ../development/python-modules/pysigset { }; + yappi = callPackage ../development/python-modules/yappi { }; - us = callPackage ../development/python-modules/us { }; + Yapsy = callPackage ../development/python-modules/yapsy { }; - wsproto = if (pythonAtLeast "3.6") then - callPackage ../development/python-modules/wsproto { } - else - callPackage ../development/python-modules/wsproto/0.14.nix { }; + yarg = callPackage ../development/python-modules/yarg { }; - h11 = callPackage ../development/python-modules/h11 { }; + yarl = callPackage ../development/python-modules/yarl { }; - python-docx = callPackage ../development/python-modules/python-docx { }; + yattag = callPackage ../development/python-modules/yattag { }; - python-doi = callPackage ../development/python-modules/python-doi { }; + ydiff = callPackage ../development/python-modules/ydiff { }; - aiohue = callPackage ../development/python-modules/aiohue { }; + yenc = callPackage ../development/python-modules/yenc { }; - PyMVGLive = callPackage ../development/python-modules/pymvglive { }; + yfinance = callPackage ../development/python-modules/yfinance { }; - coinmarketcap = callPackage ../development/python-modules/coinmarketcap { }; + yoda = toPythonModule (pkgs.yoda.override { inherit python; }); - pyowm = callPackage ../development/python-modules/pyowm { }; + youtube-dl = callPackage ../tools/misc/youtube-dl { }; - prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + youtube-dl-light = callPackage ../tools/misc/youtube-dl { + ffmpegSupport = false; + phantomjsSupport = false; + }; - pysdl2 = callPackage ../development/python-modules/pysdl2 { }; + yowsup = callPackage ../development/python-modules/yowsup { }; - pyogg = callPackage ../development/python-modules/pyogg { }; + yt = callPackage ../development/python-modules/yt { }; - rubymarshal = callPackage ../development/python-modules/rubymarshal { }; + yubico-client = callPackage ../development/python-modules/yubico-client { }; - radio_beam = callPackage ../development/python-modules/radio_beam { }; + z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; - spectral-cube = callPackage ../development/python-modules/spectral-cube { }; + z3 = (toPythonModule (pkgs.z3.override { inherit python; })).python; - astunparse = callPackage ../development/python-modules/astunparse { }; + zake = callPackage ../development/python-modules/zake { }; - gast = callPackage ../development/python-modules/gast { }; + zarr = callPackage ../development/python-modules/zarr { }; - ibis = callPackage ../development/python-modules/ibis { }; + zbase32 = callPackage ../development/python-modules/zbase32 { }; - ibis-framework = callPackage ../development/python-modules/ibis-framework { }; + zc_buildout221 = callPackage ../development/python-modules/buildout { }; - qiskit = callPackage ../development/python-modules/qiskit { }; + zc_buildout = self.zc_buildout221; # A patched version of buildout, useful for buildout based development on Nix - qiskit-aer = callPackage ../development/python-modules/qiskit-aer { }; + zc_buildout_nix = callPackage ../development/python-modules/buildout-nix { }; - qiskit-aqua = callPackage ../development/python-modules/qiskit-aqua { }; + zc_lockfile = callPackage ../development/python-modules/zc_lockfile { }; - qiskit-ibmq-provider = callPackage ../development/python-modules/qiskit-ibmq-provider { }; + zconfig = callPackage ../development/python-modules/zconfig { }; - qiskit-ignis = callPackage ../development/python-modules/qiskit-ignis { }; + zdaemon = callPackage ../development/python-modules/zdaemon { }; - qiskit-terra = callPackage ../development/python-modules/qiskit-terra { }; + zeep = callPackage ../development/python-modules/zeep { }; - qasm2image = callPackage ../development/python-modules/qasm2image { }; + zeitgeist = disabledIf isPy3k (toPythonModule (pkgs.zeitgeist.override { python2Packages = self; })).py; - simpy = callPackage ../development/python-modules/simpy { }; + zerobin = callPackage ../development/python-modules/zerobin { }; - x256 = callPackage ../development/python-modules/x256 { }; + zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; - yattag = callPackage ../development/python-modules/yattag { }; + zeroconf = callPackage ../development/python-modules/zeroconf { }; - xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); + zerorpc = callPackage ../development/python-modules/zerorpc { }; - z3 = (toPythonModule (pkgs.z3.override { - inherit python; - })).python; + zetup = callPackage ../development/python-modules/zetup { }; - zeroc-ice = callPackage ../development/python-modules/zeroc-ice { }; + zfec = callPackage ../development/python-modules/zfec { }; - zm-py = callPackage ../development/python-modules/zm-py { }; + zha-quirks = callPackage ../development/python-modules/zha-quirks { }; - rfc7464 = callPackage ../development/python-modules/rfc7464 { }; + zict = callPackage ../development/python-modules/zict { }; - foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; }; - foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; }; - foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; }; - foundationdb61 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb61; }; + zigpy = callPackage ../development/python-modules/zigpy { }; - libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override { - inherit python; - })).python; + zigpy-cc = callPackage ../development/python-modules/zigpy-cc { }; - libiio = (toPythonModule (pkgs.libiio.override { - inherit python; - })).python; + zigpy-deconz = callPackage ../development/python-modules/zigpy-deconz { }; - localzone = callPackage ../development/python-modules/localzone { }; + zigpy-xbee = callPackage ../development/python-modules/zigpy-xbee { }; - scour = callPackage ../development/python-modules/scour { }; + zigpy-zigate = callPackage ../development/python-modules/zigpy-zigate { }; - pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + zimports = callPackage ../development/python-modules/zimports { }; - nanoleaf = callPackage ../development/python-modules/nanoleaf { }; + zipfile36 = callPackage ../development/python-modules/zipfile36 { }; - nanotime = callPackage ../development/python-modules/nanotime { }; + zipp = if pythonOlder "3.6" then + callPackage ../development/python-modules/zipp/1.nix { } + else + callPackage ../development/python-modules/zipp { }; - importlib-metadata = callPackage ../development/python-modules/importlib-metadata {}; + zipstream = callPackage ../development/python-modules/zipstream { }; - importlib-resources = callPackage ../development/python-modules/importlib-resources {}; + zm-py = callPackage ../development/python-modules/zm-py { }; - srptools = callPackage ../development/python-modules/srptools { }; + zodb = callPackage ../development/python-modules/zodb { }; - srp = callPackage ../development/python-modules/srp { }; + zodbpickle = callPackage ../development/python-modules/zodbpickle { }; - curve25519-donna = callPackage ../development/python-modules/curve25519-donna { }; + zope_broken = callPackage ../development/python-modules/zope_broken { }; - pyatv = callPackage ../development/python-modules/pyatv { }; + zope_component = callPackage ../development/python-modules/zope_component { }; - pybotvac = callPackage ../development/python-modules/pybotvac { }; + zope_configuration = callPackage ../development/python-modules/zope_configuration { }; - pymetno = callPackage ../development/python-modules/pymetno { }; + zope_contenttype = callPackage ../development/python-modules/zope_contenttype { }; - pytado = callPackage ../development/python-modules/pytado { }; + zope_copy = callPackage ../development/python-modules/zope_copy { }; - casttube = callPackage ../development/python-modules/casttube { }; + zope-deferredimport = callPackage ../development/python-modules/zope-deferredimport { }; - lzstring = callPackage ../development/python-modules/lzstring { }; + zope_deprecation = callPackage ../development/python-modules/zope_deprecation { }; - flickrapi = callPackage ../development/python-modules/flickrapi { }; + zope_dottedname = callPackage ../development/python-modules/zope_dottedname { }; - aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; + zope_event = callPackage ../development/python-modules/zope_event { }; - mwparserfromhell = callPackage ../development/python-modules/mwparserfromhell { }; + zope_exceptions = callPackage ../development/python-modules/zope_exceptions { }; - starlette = callPackage ../development/python-modules/starlette { }; + zope_filerepresentation = callPackage ../development/python-modules/zope_filerepresentation { }; - uvicorn = callPackage ../development/python-modules/uvicorn { }; + zope-hookable = callPackage ../development/python-modules/zope-hookable { }; - pydantic = callPackage ../development/python-modules/pydantic { }; + zope_i18n = callPackage ../development/python-modules/zope_i18n { }; - fastapi = callPackage ../development/python-modules/fastapi { }; + zope_i18nmessageid = callPackage ../development/python-modules/zope_i18nmessageid { }; - stringcase = callPackage ../development/python-modules/stringcase { }; + zope_interface = callPackage ../development/python-modules/zope_interface { }; - webrtcvad = callPackage ../development/python-modules/webrtcvad { }; + zope_lifecycleevent = callPackage ../development/python-modules/zope_lifecycleevent { }; - pykwalify = callPackage ../development/python-modules/pykwalify { }; + zope_location = callPackage ../development/python-modules/zope_location { }; - west = callPackage ../development/python-modules/west { }; + zope_proxy = callPackage ../development/python-modules/zope_proxy { }; - wfuzz = callPackage ../development/python-modules/wfuzz { }; + zope_schema = callPackage ../development/python-modules/zope_schema { }; - wget = callPackage ../development/python-modules/wget { }; + zope_size = callPackage ../development/python-modules/zope_size { }; - runway-python = callPackage ../development/python-modules/runway-python { }; + zope_testing = callPackage ../development/python-modules/zope_testing { }; - pyprof2calltree = callPackage ../development/python-modules/pyprof2calltree { }; + zope_testrunner = callPackage ../development/python-modules/zope_testrunner { }; - hcloud = callPackage ../development/python-modules/hcloud { }; + zopfli = callPackage ../development/python-modules/zopfli { }; - managesieve = callPackage ../development/python-modules/managesieve { }; + zstandard = callPackage ../development/python-modules/zstandard { }; - pony = callPackage ../development/python-modules/pony { }; + zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd pkgconfig; }; - rxv = callPackage ../development/python-modules/rxv { }; + zxcvbn = callPackage ../development/python-modules/zxcvbn { }; }); diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 9e07d2bf061..58b0300cc79 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -215,6 +215,7 @@ let crossOverlays = [ (import ./static.nix) ]; } // lib.optionalAttrs stdenv.hostPlatform.isLinux { crossSystem = { + isStatic = true; parsed = stdenv.hostPlatform.parsed // { abi = { gnu = lib.systems.parse.abis.musl; |